From d7ae8febf3c2290c72b198d97189c37fc4a82f73 Mon Sep 17 00:00:00 2001
From: thewhitetulip <sapatil@live.com>
Date: Sat, 21 Nov 2015 19:42:44 +0530
Subject: [PATCH] refined search template

---
 public/templates/search.html |  2 +-
 types/types.go               |  1 +
 views/views.go               | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/public/templates/search.html b/public/templates/search.html
index 76fed92..9031d11 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -1,6 +1,6 @@
 {{template "_head.html" .}}
   <div class="timeline">
-    {{ if .}} {{range .}}
+    {{ if .Tasks}} {{range .Tasks}}
     <div class="note">
       <p class="noteHeading">{{.Title}}</p>
       <hr>
diff --git a/types/types.go b/types/types.go
index 52c03b2..d14094c 100644
--- a/types/types.go
+++ b/types/types.go
@@ -12,4 +12,5 @@ type Task struct {
 type Context struct {
 	Tasks      []Task
 	Navigation string
+	Search     string
 }
diff --git a/views/views.go b/views/views.go
index 9a28006..b4500a0 100644
--- a/views/views.go
+++ b/views/views.go
@@ -42,6 +42,7 @@ func PopulateTemplates() {
 	templates, err = template.ParseFiles(allFiles...)
 	if err != nil {
 		fmt.Println(err)
+		os.Exit(1)
 	}
 	homeTemplate = templates.Lookup("home.html")
 	deletedTemplate = templates.Lookup("deleted.html")
@@ -84,15 +85,15 @@ func SearchTaskFunc(w http.ResponseWriter, r *http.Request) {
 
 //AddTaskFunc is used to handle the addition of new task, "/add" URL
 func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "POST" {
+	if r.Method == "POST" { // Will work only for GET requests, will redirect to home
 		r.ParseForm()
 		title := r.Form.Get("title")
 		content := r.Form.Get("content")
 		truth := db.AddTask(title, content)
 		if truth != nil {
-			http.Redirect(w, r, "/", http.StatusFound)
-		} else {
 			fmt.Println(err)
+		} else {
+			http.Redirect(w, r, "/", http.StatusFound)
 		}
 	} else {
 		http.Redirect(w, r, "/", http.StatusFound)
@@ -135,7 +136,6 @@ func CompleteTaskFunc(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				fmt.Println(err)
 			}
-			fmt.Println("redirecting to home")
 			http.Redirect(w, r, "/", http.StatusFound)
 		}
 	} else {
@@ -155,7 +155,10 @@ func DeleteTaskFunc(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				fmt.Println(err)
 			} else {
-				db.DeleteTask(id)
+				err = db.DeleteTask(id)
+				if err != nil {
+					fmt.Println(err)
+				}
 				http.Redirect(w, r, "/deleted/", http.StatusFound)
 			}
 		}
@@ -171,7 +174,10 @@ func TrashTaskFunc(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			fmt.Println(err)
 		} else {
-			db.TrashTask(id)
+			err = db.TrashTask(id)
+			if err != nil {
+				fmt.Println(err)
+			}
 			http.Redirect(w, r, "/", http.StatusFound)
 		}
 	} else {
@@ -204,7 +210,10 @@ func UpdateTaskFunc(w http.ResponseWriter, r *http.Request) {
 		}
 		title := r.Form.Get("title")
 		content := r.Form.Get("content")
-		db.UpdateTask(id, title, content)
+		err = db.UpdateTask(id, title, content)
+		if err != nil {
+			fmt.Println(err)
+		}
 		http.Redirect(w, r, "/", http.StatusFound)
 	} else {
 		http.Redirect(w, r, "/", http.StatusFound)