From 4f553f6022fb7b44f5467ff22919f4cab1d6dacd Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 19 Oct 2016 20:37:01 +0200
Subject: [PATCH] Merge files into main.go

---
 home.go   | 11 -----------
 home.html |  2 +-
 main.go   | 16 +++++++++++++++-
 vote.go   | 20 --------------------
 4 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 home.go
 delete mode 100644 vote.go

diff --git a/home.go b/home.go
deleted file mode 100644
index 7656056..0000000
--- a/home.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main
-
-import (
-	"log"
-	"net/http"
-)
-
-func Home(w http.ResponseWriter, r *http.Request) {
-	log.Printf("Serve home page to %s: %s [%s]\n", r.Header.Get("X-Forwarded-For"), r.URL.Path, r.UserAgent())
-	http.ServeFile(w, r, "home.html")
-}
diff --git a/home.html b/home.html
index 906ff95..de23ef7 100644
--- a/home.html
+++ b/home.html
@@ -12,7 +12,7 @@
       Aidez-moi à améliorer ce cours en donnant votre avis.
     </p>
 
-    <form method="post" action="/vote">
+    <form method="post" action="vote">
 
       <div class="form-group">
         <h3>Quel est le cours/TP que vous avez préféré ?</h3>
diff --git a/main.go b/main.go
index b120530..86083ef 100644
--- a/main.go
+++ b/main.go
@@ -7,13 +7,27 @@ import (
 	"net/http"
 )
 
+func Home(w http.ResponseWriter, r *http.Request) {
+	if r.Method == "POST" {
+		r.ParseForm()
+		log.Printf("Handling new vote from %s: %s [%s]\n", r.Header.Get("X-Forwarded-For"), r.URL.Path, r.UserAgent())
+		for k, v := range r.PostForm {
+			log.Println(k + ":", v)
+		}
+
+		http.ServeFile(w, r, "thanks.html")
+	} else {
+		log.Printf("Serve home page to %s: %s [%s]\n", r.Header.Get("X-Forwarded-For"), r.URL.Path, r.UserAgent())
+		http.ServeFile(w, r, "home.html")
+	}
+}
+
 func main() {
 	var bind = flag.String("bind", "0.0.0.0:8081", "Bind port/socket")
 	flag.Parse()
 
 	log.Println("Registering handlers...")
 	http.HandleFunc("/", Home)
-	http.HandleFunc("/vote", Vote)
 	log.Println(fmt.Sprintf("Ready, listening on %s", *bind))
 	if err := http.ListenAndServe(*bind, nil); err != nil {
 		log.Fatal("Unable to listen and serve: ", err)
diff --git a/vote.go b/vote.go
deleted file mode 100644
index 1cdfc8a..0000000
--- a/vote.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package main
-
-import (
-	"log"
-	"net/http"
-)
-
-func Vote(w http.ResponseWriter, r *http.Request) {
-	if r.Method == "POST" {
-		r.ParseForm()
-		log.Printf("Handling new vote from %s: %s [%s]\n", r.Header.Get("X-Forwarded-For"), r.URL.Path, r.UserAgent())
-		for k, v := range r.PostForm {
-			log.Println(k + ":", v)
-		}
-
-		http.ServeFile(w, r, "thanks.html")
-	} else {
-		http.NotFound(w, r)
-	}
-}