main.go

@@ -1,45 +1,29 @@
 package main
 
 import (
-	"html/template"
 	"log"
 	"net/http"
-	"streifling.com/jason/sicherheitsunterweisung/packages/data"
+
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/server"
 )
 
-func addUUIDs(uc *chan string, uuids *[]string) {
-	for uuid := range *uc {
-		(*uuids) = append(*uuids, uuid)
-	}
-}
-
 func main() {
 	var i, j int64
-	uuids := make([]string, 0)
 	i, j = 1, 1
 	mux := http.NewServeMux()
 
-	db, err := data.OpenDB("sicherheitsunterweisung")
+	db, err := db.Open("sicherheitsunterweisung")
 	if err != nil {
 		log.Fatalln(err)
 	}
 
-	uuidChan := make(chan string)
-	defer close(uuidChan)
-	go addUUIDs(&uuidChan, &uuids)
-
 	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static/"))))
-	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/", server.DisplayTable(db))
-		template.Must(template.ParseFiles("templates/index.html", "templates/login.html")).Execute(w, nil)
-	})
 	mux.HandleFunc("/search/", server.DisplayResults(db))
 	mux.HandleFunc("/new-briefing/", server.DisplayForm(&i))
 	mux.HandleFunc("/add-participant/", server.AddParticipant(&i))
 	mux.HandleFunc("/submit-form/", server.SubmitForm(db, &i, &j))
-	mux.HandleFunc("/generate-uuid/", server.GenerateUUID(uuidChan))
-	mux.HandleFunc("/internal-login/", server.DisplayTable(db))
-	mux.HandleFunc("/external-login/", server.DisplayQuestionsIfOK(&uuids))
 
 	log.Fatalln(http.ListenAndServe(":8080", mux))
 }

packages/data/questionaires.go

@@ -1 +0,0 @@
-package data

packages/db/db.go

@@ -1,4 +1,4 @@
-package data
+package db
 
 import (
 	"bufio"
@@ -43,7 +43,7 @@ func reverseOrder(bs *[]types.Briefing) {
 	}
 }
 
-func OpenDB(dbName string) (*DB, error) {
+func Open(dbName string) (*DB, error) {
 	var err error
 	db := new(DB)
 

packages/server/server.go

@@ -1,17 +1,16 @@
 package server
 
 import (
-	"crypto/rand"
-	"encoding/hex"
 	"fmt"
 	"html/template"
 	"log"
 	"net/http"
-	"streifling.com/jason/sicherheitsunterweisung/packages/data"
+
+	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-func DisplayTable(db *data.DB) http.HandlerFunc {
+func DisplayTable(db *db.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.ReadAll()
 		if err != nil {
@@ -21,7 +20,7 @@ func DisplayTable(db *data.DB) http.HandlerFunc {
 	}
 }
 
-func DisplayResults(db *data.DB) http.HandlerFunc {
+func DisplayResults(db *db.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.ReadByName(r.PostFormValue("search"))
 		if err != nil {
@@ -44,7 +43,7 @@ func AddParticipant(i *int64) http.HandlerFunc {
 	}
 }
 
-func SubmitForm(db *data.DB, i, j *int64) http.HandlerFunc {
+func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		b := new(types.Briefing)
 
@@ -72,43 +71,6 @@ func SubmitForm(db *data.DB, i, j *int64) http.HandlerFunc {
 		if err != nil {
 			_ = fmt.Errorf("SubmitForm: db.ReadAll(): %v\n", err)
 		}
-
+		template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
-		template.Must(template.ParseFiles("templates/table.html")).Execute(w, bs)
 	}
 }
-
-func GenerateUUID(ch chan<- string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		bs := make([]byte, 4)
-
-		_, err := rand.Read(bs)
-		if err != nil {
-			_ = fmt.Errorf("GenerateUUID: rand.Read(bs): %v\n", err)
-		}
-
-		uuid := hex.EncodeToString(bs)
-		ch <- uuid
-
-		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "uuid", uuid)
-	}
-}
-
-func DisplayQuestionsIfOK(uuids *[]string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if uuidIsOK(r.PostFormValue("login"), uuids) {
-			template.Must(template.ParseFiles("templates/question.html")).ExecuteTemplate(w, "content", nil)
-		} else {
-			template.Must(template.ParseFiles("templates/login.html")).ExecuteTemplate(w, "content", nil)
-		}
-	}
-}
-
-// TODO: Delete uuid from uuids
-func uuidIsOK(uuid string, uuids *[]string) bool {
-	for _, u := range *uuids {
-		if uuid == u {
-			return true
-		}
-	}
-	return false
-}

packages/types/types.go

@@ -7,28 +7,10 @@ type Person struct {
 
 type Instructor Person
 
-type QAElement struct {
-	ID   int
-	Text string
-}
-
-type Answer QAElement
-
-type Question struct {
-	QAElement
-	Answers []Answer
-}
-
-type Questionaire struct {
-	UUID      string
-	Questions []Question
-}
-
 type Participant struct {
 	ID int64
 	Person
 	Company string
-	QuestionaireUUID string
 }
 
 type Briefing struct {

templates/form.html

@@ -1,7 +1,3 @@
-{{ define "uuid" }}
-<span>{{ . }}</span>
-{{ end }}
-
 {{ define "participant" }}
 <div id="participant-{{ . }}">
   <label for="participant-first-input-{{ . }}">Vorname</label>
@@ -12,10 +8,6 @@
 
   <label for="participant-company-input-{{ . }}">Firma</label>
   <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
-
-  <button type="button" hx-post="/generate-uuid/" hx-target="this" hx-swap="outerHTML">
-    Einladen
-  </button>
 </div>
 {{ end }}
 
@@ -51,7 +43,7 @@
 
   <div id="participants">
     <button type="button" hx-post="/add-participant/" hx-target="#participants" hx-swap="beforeend" hx-trigger="click">
-      Neuer Teilnehmer
+      +
     </button>
 
     {{ template "participant" . }}

templates/login.html

@@ -1,16 +0,0 @@
-{{ define "content" }}
-<form>
-  <h2>Login</h2>
-
-  <label for="login-input">Code</label>
-  <input type="text" name="login" id="login-input" />
-
-  <button type="submit" hx-post="/external-login/" hx-target="#content">
-    Anmelden
-  </button>
-
-  <button type="submit" hx-post="/internal-login/" hx-target="#content">
-    Intern
-  </button>
-</form>
-{{ end }}

templates/question.html

@@ -1,15 +1,14 @@
-{{ define "answers" }}
+{{ define "question" }}
-{{ range .Answers }}
+<div id="question-{{ .QuestionNumber }}">
-<label for="answer-{{ .ID }}">{{ .Text }}</label>
+  <h2>Frage {{ .QuestionNumber }}
-<input type="radio" name="answer-{{ .ID }}" id="answer-{{ .ID }}" />
+    <p>{{ .Question }}</p
-{{ end }}
+  <label for="participant-first-input-{{ . }}">Vorname</label>
-{{ end }}
+  <input type="text" name="participant-first-{{ . }}" id="participant-first-input-{{ . }}" />
 
-{{ define "content" }}
+  <label for="participant-last-input-{{ . }}">Nachname</label>
-<h2>Frage {{ .Question.ID }}</h2>
+  <input type="text" name="participant-last-{{ . }}" id="participant-last-input-{{ . }}" />
-<p>{{ .Question.Text }}</p>
 
-{{ template "answers" . }}
+  <label for="participant-company-input-{{ . }}">Firma</label>
-
+  <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
-<button type="submit" hx-post="/submit-{{ .UUID }}-{{ .Question.ID }}/" hx-target="#content" hx-swap="innerHTML">
+</div>
 {{ end }}