9 years ago · 9aa59cba83
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 
				 .idea
			
 
				 *.iml
			
 
				-ex1-hello/ex1-hello
			
 
				-ex2-hello/ex2-hello
			
 
				+ex1/ex1
			
 
				+ex2/ex2
			
 
				+ex3/ex3
			
 
				+ex4/ex4
			
 
				+ex5/ex5
			
 
				+ex6/ex6
			
 
				+ex7/ex7
			
--- a/ex1-hello/main.go
+++ b/ex1-hello/main.go
--- a/ex2-hello/main.go
+++ b/ex2-hello/main.go
--- a/ex3-hello/ex3-hello
+++ b/ex3-hello/ex3-hello
--- a/ex3-hello/main.go
+++ b/ex3-hello/main.go
--- a/ex4-hello/main.go
+++ b/ex4-hello/main.go
--- a/ex4-hello/templates/hello.tpl
+++ b/ex4-hello/templates/hello.tpl
--- a/ex5-hello/main.go
+++ b/ex5-hello/main.go
--- a/ex5-hello/templates/hello.tpl
+++ b/ex5-hello/templates/hello.tpl
--- a/ex6-hello/ex6-hello
+++ b/ex6-hello/ex6-hello
--- a/ex6-hello/resource/main.css
+++ b/ex6-hello/resource/main.css
@@ -1,3 +0,0 @@
 
				-body {
			
 
				-    background-color: #EEEEEE
			
 
				-}
			
--- a/ex6-hello/templates/main.html
+++ b/ex6-hello/templates/main.html
@@ -1,8 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<head>
			
 
				-    <title>Hello {{.}}</title>
			
 
				-    <link rel="stylesheet" type="text/css" href="resource/main.css"/>
			
 
				-</head>
			
 
				-<body>
			
 
				-<h1>Hello {{.}}</h1>
			
 
				-</body>
			
--- a/ex6-hello/certs/localhost.cert
+++ b/ex6-hello/certs/localhost.cert
--- a/ex6-hello/certs/localhost.key
+++ b/ex6-hello/certs/localhost.key
--- a/ex6-hello/main.go
+++ b/ex6-hello/main.go
@@ -14,19 +14,21 @@ func main() {
 
				 	t := template.Must(template.ParseFiles("templates/main.html"))
			
 
				 	s := server{template: t}
			
 
				 	http.HandleFunc("/", s.handleRoot)
			
 
				-	http.Handle("/resource/", http.FileServer(http.Dir(".")))
			
 
				-	log.Fatal(http.ListenAndServeTLS(":8443", "certs/localhost.cert", "certs/localhost.key", nil))
			
 
				+	http.Handle("/resources/", http.FileServer(http.Dir(".")))
			
 
				+	log.Println("Listening on https://localhost:8443")
			
 
				+	err := http.ListenAndServeTLS(":8443", "certs/localhost.cert", "certs/localhost.key", nil)
			
 
				+	log.Fatal(err)
			
 
				 }
			
 
				 
			
 
				 func (s *server) handleRoot(w http.ResponseWriter, r *http.Request) {
			
 
				+	w.Header().Set("Content-Type", "text/html")
			
 
				 
			
 
				 	if r.RequestURI != "/" {
			
 
				 		http.NotFound(w, r)
			
 
				 		return
			
 
				 	}
			
 
				 
			
 
				-	w.Header().Set("Content-Type", "text/html")
			
 
				-	err := s.template.Execute(w, "Devoxx")
			
 
				+	err := s.template.Execute(w, "Vrolijk pasen!")
			
 
				 
			
 
				 	if err != nil {
			
 
				 		log.Println(err)
			
--- a/ex6/resources/img/eggs-in-grass.svg
+++ b/ex6/resources/img/eggs-in-grass.svg
--- a/resources/Rabbit-002-Face-Cartoon-Easter-w-Baby.svg
+++ b/resources/Rabbit-002-Face-Cartoon-Easter-w-Baby.svg
--- a/ex6/resources/main.css
+++ b/ex6/resources/main.css
@@ -0,0 +1,15 @@
 
				+body {
			
 
				+    background-color: #92CD00
			
 
				+}
			
 
				+
			
 
				+header img {
			
 
				+    display: inline;
			
 
				+    vertical-align: middle;
			
 
				+    width: 150px;
			
 
				+}
			
 
				+
			
 
				+header h1 {
			
 
				+    display: inline;
			
 
				+    vertical-align: middle;
			
 
				+    color: #2C6700
			
 
				+}
			
--- a/ex6/templates/main.html
+++ b/ex6/templates/main.html
@@ -0,0 +1,11 @@
 
				+<!DOCTYPE html>
			
 
				+<head>
			
 
				+    <title>{{.}}</title>
			
 
				+    <link rel="stylesheet" type="text/css" href="resources/main.css"/>
			
 
				+</head>
			
 
				+<body>
			
 
				+<header>
			
 
				+    <img src="resources/img/rabbit.svg"/>
			
 
				+    <h1>{{.}}</h1>
			
 
				+</header>
			
 
				+</body>
			
--- a/ex7/main.go
+++ b/ex7/main.go
@@ -0,0 +1,3 @@
 
				+package main
			
 
				+
			
 
				+