Merge remote-tracking branch 'origin/master'

Conflicts:
	main.go

Author: zainhoda

main.go

@@ -1,12 +1,15 @@
 package main
 
 import (
+	"fmt"
 	"html/template"
 	"log"
 	"net/http"
+
+	"github.com/julienschmidt/httprouter"
 )
 
-func LoginPage(w http.ResponseWriter, req *http.Request) {
+func LoginPage(w http.ResponseWriter, req *http.Request, _ httprouter.Params) {
 	baseT := template.Must(template.New("base").Parse(base))
 	baseT = template.Must(baseT.Parse(login))
 
@@ -15,40 +18,55 @@ func LoginPage(w http.ResponseWriter, req *http.Request) {
 	})
 }
 
-func SignupPage(w http.ResponseWriter, req *http.Request) {
+func MainPage(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	baseT := template.Must(template.New("base").Parse(base))
-	baseT = template.Must(baseT.Parse(signup))
+	baseT = template.Must(baseT.Parse(mainPage))
 
 	baseT.ExecuteTemplate(w, "base", map[string]string{
-		"PageName": "signup",
+		"PageName": "main",
 	})
 }
 
-func AdminPage(w http.ResponseWriter, req *http.Request) {
+func SignupPage(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	username := ps.ByName("username")
+	password := ps.ByName("password")
+
 	baseT := template.Must(template.New("base").Parse(base))
-	baseT = template.Must(baseT.Parse(admin))
+	baseT = template.Must(baseT.Parse(signup))
 
 	baseT.ExecuteTemplate(w, "base", map[string]string{
-		"PageName": "admin",
+		"PageName": "signup",
 	})
+
+	// create new user
+	if len(username)+len(password) < 11 {
+		fmt.Fprintf(w, "New user"+username+" with pass:"+password+"has signed up")
+	} else {
+		fmt.Fprintf(w, "Invalid arguments!")
+	}
 }
 
-func MainPage(w http.ResponseWriter, req *http.Request) {
+func AdminPage(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	// authenticate username and password
+	blogname := ps.ByName("blogname")
+
+	if len(blogname) < 20 {
+		// create new blog
+	}
+
 	baseT := template.Must(template.New("base").Parse(base))
-	baseT = template.Must(baseT.Parse(mainPage))
+	baseT = template.Must(baseT.Parse(admin))
 
 	baseT.ExecuteTemplate(w, "base", map[string]string{
-		"PageName": "main",
+		"PageName": "admin",
 	})
 }
 
 func main() {
-	http.HandleFunc("/login", LoginPage)
-	http.HandleFunc("/admin", AdminPage)
-	http.HandleFunc("/signup", SignupPage)
-	http.HandleFunc("/", MainPage)
-	err := http.ListenAndServe(":1337", nil)
-	if err != nil {
-		log.Fatal("ListenAndServe: ", err)
-	}
+	router := httprouter.New()
+	router.GET("/", MainPage)
+	router.GET("/login/", LoginPage)
+	router.GET("/signup/", SignupPage)
+	router.GET("/admin/", AdminPage)
+	log.Fatal(http.ListenAndServe(":1337", router))
 }