Handle missing avatar and letterhead in PDF

components/app.vue

@@ -113,7 +113,7 @@ function getUser() {
 	    const validTypes = ['image/jpeg', 'image/png']
     
         if (!b || !validTypes.includes(b.type) || b.size <= 1) {
-            return fetch("/assets/image/empty-avatar.jpg").
+            return fetch("/assets/image/default-avatar.jpg").
             then(r => r.blob()).then( a => this.user.avatar = a )
         }
         
@@ -121,12 +121,6 @@ function getUser() {
         return getLetterhead(token)
 	}).then(b => {
 	    const validTypes = ['image/jpeg', 'image/png']
-    
-        if (!validTypes.includes(b.type) || b.size <= 1) {
-            return fetch("/assets/image/empty-letterhead.jpg").
-            then(r => r.blob()).then( a => this.user.letterhead = a )
-        }
-        
         this.user.letterhead = b
 	})
 

skouter.go

@@ -2340,10 +2340,17 @@ func getPdf(w http.ResponseWriter, db *sql.DB, r *http.Request) {
 	}
 	avatar, err := fetchAvatar(db, info.User.Id)
 	letterhead, err := fetchLetterhead(db, info.User.Id)
-	info.Avatar =
-	base64.StdEncoding.EncodeToString(avatar)
-	info.Letterhead =
-	base64.StdEncoding.EncodeToString(letterhead)
+	
+	
+	if len(avatar) > 1 {
+		info.Avatar =
+		base64.StdEncoding.EncodeToString(avatar)
+	}
+	
+	if len(letterhead) > 1 {
+		info.Letterhead =
+		base64.StdEncoding.EncodeToString(letterhead)
+	}
 	
 	
 	err = pages["report"].tpl.ExecuteTemplate(stdin, "master.tpl", info)

views/report/summary.tpl

@@ -6,5 +6,3 @@ hello
 </div>
 </section>
 {{end}}
-
-