Add error page and favicon

Webserver/Index.go

@@ -1,6 +1,7 @@
 package Webserver
 
 import (
+	"log"
 	"net/http"
 
 	"PersonalWebsite/Database"
@@ -15,9 +16,31 @@ func ViewIndex(w http.ResponseWriter, r *http.Request) {
 	v["PageView"] = "index-intro.gohtml"
 	v["Posts"], e = Database.GetPostsList(5, 0)
 	if e != nil {
-		// TODO: Handle this
-		http.Error(w, "Error", http.StatusInternalServerError)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
 	}
 
 	ServeTemplate(w, r, "html/index.gohtml", v)
 }
+
+func ViewLinks(w http.ResponseWriter, r *http.Request) {
+	var (
+		v = make(map[string]interface{})
+	)
+
+	v["PageView"] = "index-links.gohtml"
+
+	ServeTemplate(w, r, "html/index.gohtml", v)
+
+}
+
+func ViewError(w http.ResponseWriter, r *http.Request) {
+	var (
+		v = make(map[string]interface{})
+	)
+
+	v["PageView"] = "error.gohtml"
+
+	ServeTemplate(w, r, "html/index.gohtml", v)
+
+}

Webserver/Post.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"PersonalWebsite/Database"
+	"PersonalWebsite/Helper"
 
 	"github.com/gorilla/mux"
 )
@@ -22,9 +23,15 @@ func ViewPost(w http.ResponseWriter, r *http.Request) {
 
 	post, e = Database.GetPostById(urlParams["id"])
 	if e != nil {
-		// TODO: Forward 404
-		log.Println("Could not get post")
-		http.Error(w, "Error", http.StatusInternalServerError)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
+		return
+	}
+
+	post.Body, e = Helper.GetFileContents(post.HtmlPath)
+	if e != nil {
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
 		return
 	}
 
@@ -58,8 +65,8 @@ func ViewPostList(w http.ResponseWriter, r *http.Request, subject string) {
 	} else {
 		page, e = strconv.Atoi(keys[0])
 		if e != nil {
-			// TODO: Handle this
-			http.Error(w, "Error", http.StatusInternalServerError)
+			log.Println(e)
+			http.Redirect(w, r, "/error", 302)
 			return
 		}
 	}
@@ -68,15 +75,15 @@ func ViewPostList(w http.ResponseWriter, r *http.Request, subject string) {
 
 	posts, e = Database.GetPostsListBySubject(limit, offset, subject)
 	if e != nil {
-		// TODO: Handle this
-		http.Error(w, "Error", http.StatusInternalServerError)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
 		return
 	}
 
 	postsCount, e = Database.GetPostCountBySubject(subject)
 	if e != nil {
-		// TODO: Handle this
-		http.Error(w, "Error", http.StatusInternalServerError)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
 		return
 	}
 

Webserver/ServeFile.go

@@ -1,6 +1,7 @@
 package Webserver
 
 import (
+	"log"
 	"net/http"
 	"path"
 	"text/template"
@@ -18,9 +19,11 @@ var (
 		"html/header.gohtml",
 		"html/sidebar.gohtml",
 		"html/index-intro.gohtml",
+		"html/index-links.gohtml",
 		"html/index-post-list.gohtml",
 		"html/post-list.gohtml",
 		"html/post.gohtml",
+		"html/error.gohtml",
 	}
 )
 
@@ -42,8 +45,9 @@ func ServeTemplate(w http.ResponseWriter, r *http.Request, mainFile string, v ma
 
 	v["SidebarLinks"], e = Database.GetAllSidebarLinks()
 	if e != nil {
-		// TODO: Handle
-		panic(e)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
+		return
 	}
 
 	files = []string{webRootJoin(mainFile)}
@@ -64,14 +68,15 @@ func ServeTemplate(w http.ResponseWriter, r *http.Request, mainFile string, v ma
 		},
 	).ParseFiles(files...)
 	if e != nil {
-		// TODO: Handle this
-		panic(e)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
 	}
 
 	w.Header().Set("Content-type", "text/html")
 	e = tpl.Execute(w, v)
 	if e != nil {
-		// TODO: Handle this
-		panic(e)
+		log.Println(e)
+		http.Redirect(w, r, "/error", 302)
+		return
 	}
 }

Webserver/Webserver.go

@@ -58,9 +58,11 @@ func Start() error {
 
 	// Interface endpoints
 	r.HandleFunc("/", ViewIndex)
+	r.HandleFunc("/links", ViewLinks)
 	r.HandleFunc("/programming", ViewPostListProgramming)
 	r.HandleFunc("/pentesting", ViewPostListPentesting)
 	r.HandleFunc("/post/{id}", ViewPost)
+	r.HandleFunc("/error", ViewError)
 
 	// Administration
 	r.HandleFunc("/admin", AdminView)

web/css/main.css

@@ -243,7 +243,9 @@ pre::-webkit-scrollbar-color {
 }
 
 .post-icon {
-	max-width: 200px !important;
+	max-width: 50% !important;
+	max-height: 20em !important;
+  padding-bottom: 2em;
 }
 
 .icon-div {

web/html/error.gohtml

@@ -0,0 +1,3 @@
+<h2>Whoops! It looks like you've run into an error!</h2>
+
+<p>Please click <a href="/">here</a> to go back to the home screen</p>

web/html/header.gohtml

@@ -7,7 +7,7 @@
 		<ul>
 			<a href="/pentesting?page=0"><li class="{{ if eq .Subject "Pentesting" }}active{{ end }}">Pentesting</li></a>
 			<a href="/programming?page=0"><li class="{{ if eq .Subject "Programming" }}active{{ end }}">Programming</li></a>
-			<a href="/links.html"><li>Links</li></a>
+			<a href="/links"><li>Links</li></a>
 		</ul>
 	</div>
 	<ul class="pc-links">

web/html/index-links.gohtml

@@ -0,0 +1,8 @@
+<h2>Links</h2>
+<div class="main-links">
+  <ul>
+    {{ range $link := .SidebarLinks }}
+		  <a href="{{ $link.Link }}"><li>{{ $link.Name }}</li></a>
+    {{ end }}
+  </ul>
+</div>

web/html/index.gohtml

@@ -1,8 +1,11 @@
 <!DOCTYPE html>
 <html>
 	<head>
+    <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
+    <meta content="utf-8" http-equiv="encoding">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<title>Tovi Jaeschke's Homepage</title>
+    <link rel="icon" type="image/x-icon" href="/static/favicon.ico"/>
 		<link rel="stylesheet" type="text/css" href="/css/main.css">
 		<link href='https://fonts.googleapis.com/css?family=Average|Montserrat' rel='stylesheet' type='text/css'>
 		<link rel="stylesheet" href="/css/prism.css">
@@ -21,6 +24,10 @@
           {{ template "post-list.gohtml" . }}
         {{ else if eq .PageView "post.gohtml" }}
           {{ template "post.gohtml" . }}
+        {{ else if eq .PageView "index-links.gohtml" }}
+          {{ template "index-links.gohtml" . }}
+        {{ else if eq .PageView "error.gohtml" }}
+          {{ template "error.gohtml" . }}
         {{ end }}
 			</div>
 		</div>

web/html/post.gohtml

@@ -1,8 +1,13 @@
 <h3 class='post-title'>{{ .Post.Title }}</h2>
 {{ if .Post.MainImage }}
   <div class='icon-div'>
-    <img class='post-icon' src='{{ .Post.MainImage }}' />
+    <img class='post-icon' src='/static/{{ .Post.MainImage }}' />
   </div>
 {{ end }}
+<div>
 {{ .Post.Intro }}
+</div>
+<br/>
+<div>
 {{ .Post.Body }}
+</div>