Login für eingeladene Prüflinge implementiert

go.mod

@@ -4,7 +4,6 @@ go 1.21.1
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
-	github.com/google/uuid v1.3.1
 	golang.org/x/term v0.13.0
 )
 

go.sum

@@ -1,7 +1,5 @@
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=

main.go

@@ -1,29 +1,45 @@
 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 := db.Open("sicherheitsunterweisung")
+	db, err := data.OpenDB("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("/", server.DisplayTable(db))
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		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/", server.SubmitForm(db, &i, &j))
+	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/db.go

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

packages/data/questionaires.go

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

packages/server/server.go

@@ -1,34 +1,31 @@
 package server
 
 import (
+	"crypto/rand"
+	"encoding/hex"
 	"fmt"
-	"github.com/google/uuid"
 	"html/template"
-	"io"
 	"log"
 	"net/http"
-	"os"
+	"streifling.com/jason/sicherheitsunterweisung/packages/data"
-	"streifling.com/jason/sicherheitsunterweisung/packages/db"
 	"streifling.com/jason/sicherheitsunterweisung/packages/types"
 )
 
-func DisplayTable(db *db.DB) http.HandlerFunc {
+func DisplayTable(db *data.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.ReadAll()
 		if err != nil {
 			_ = fmt.Errorf("DisplayTable: %v\n", err)
-			return
 		}
 		template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
 	}
 }
 
-func DisplayResults(db *db.DB) http.HandlerFunc {
+func DisplayResults(db *data.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bs, err := db.ReadByName(r.PostFormValue("search"))
 		if err != nil {
 			_ = fmt.Errorf("DisplayResults: db.ReadByName(r.PostFormValue()): %v\n", err)
-			return
 		}
 		template.Must(template.ParseFiles("templates/table.html")).ExecuteTemplate(w, "rows", bs)
 	}
@@ -47,7 +44,7 @@ func AddParticipant(i *int64) http.HandlerFunc {
 	}
 }
 
-func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
+func SubmitForm(db *data.DB, i, j *int64) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		b := new(types.Briefing)
 
@@ -74,33 +71,44 @@ func SubmitForm(db *db.DB, i, j *int64) http.HandlerFunc {
 		bs, err := db.ReadAll()
 		if err != nil {
 			_ = fmt.Errorf("SubmitForm: db.ReadAll(): %v\n", err)
-			return
 		}
-		template.Must(template.ParseFiles("templates/index.html", "templates/table.html")).Execute(w, bs)
+
+		template.Must(template.ParseFiles("templates/table.html")).Execute(w, bs)
 	}
 }
 
-func Upload(fn, ln, d, t string) http.HandlerFunc {
+func GenerateUUID(ch chan<- string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		r.ParseMultipartForm(10 << 20) // 10 MiB
+		bs := make([]byte, 4)
 
-		tmpFile, _, err := r.FormFile("questionaire")
+		_, err := rand.Read(bs)
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
+			_ = fmt.Errorf("GenerateUUID: rand.Read(bs): %v\n", err)
-			return
 		}
-		defer tmpFile.Close()
 
-		file, err := os.Create(ln + fn + d + t + uuid.New().String() + ".png")
+		uuid := hex.EncodeToString(bs)
-		if err != nil {
+		ch <- uuid
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		defer file.Close()
 
-		if _, err := io.Copy(file, tmpFile); err != nil {
+		template.Must(template.ParseFiles("templates/form.html")).ExecuteTemplate(w, "uuid", uuid)
-			http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
-			return
+}
+
+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

@@ -1,7 +1,5 @@
 package types
 
-import "os"
-
 type Person struct {
 	FirstName string
 	LastName  string
@@ -9,11 +7,28 @@ 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
+	Company          string
-	Questionaire string
+	QuestionaireUUID string
 }
 
 type Briefing struct {

templates/form.html

@@ -1,3 +1,7 @@
+{{ define "uuid" }}
+<span>{{ . }}</span>
+{{ end }}
+
 {{ define "participant" }}
 <div id="participant-{{ . }}">
   <label for="participant-first-input-{{ . }}">Vorname</label>
@@ -9,7 +13,9 @@
   <label for="participant-company-input-{{ . }}">Firma</label>
   <input type="text" name="participant-company-{{ . }}" id="participant-company-input-{{ . }}" />
 
-  <button type="button" hx-post="/upload/">Fragebogen hochladen</button>
+  <button type="button" hx-post="/generate-uuid/" hx-target="this" hx-swap="outerHTML">
+    Einladen
+  </button>
 </div>
 {{ end }}
 
@@ -45,13 +51,13 @@
 
   <div id="participants">
     <button type="button" hx-post="/add-participant/" hx-target="#participants" hx-swap="beforeend" hx-trigger="click">
-      +
+      Neuer Teilnehmer
     </button>
 
     {{ template "participant" . }}
   </div>
 
-  <button type="submit" hx-post="/submit/" hx-target="#content" hx-swap="innerHTML">
+  <button type="submit" hx-post="/submit-form/" hx-target="#content" hx-swap="innerHTML">
     Senden
   </button>
 </form>

templates/login.html

@@ -0,0 +1,16 @@
+{{ 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

@@ -0,0 +1,15 @@
+{{ define "answers" }}
+{{ range .Answers }}
+<label for="answer-{{ .ID }}">{{ .Text }}</label>
+<input type="radio" name="answer-{{ .ID }}" id="answer-{{ .ID }}" />
+{{ end }}
+{{ end }}
+
+{{ define "content" }}
+<h2>Frage {{ .Question.ID }}</h2>
+<p>{{ .Question.Text }}</p>
+
+{{ template "answers" . }}
+
+<button type="submit" hx-post="/submit-{{ .UUID }}-{{ .Question.ID }}/" hx-target="#content" hx-swap="innerHTML">
+  {{ end }}