diff --git a/admin.go b/admin.go
index 6ca535d..f18d777 100644
--- a/admin.go
+++ b/admin.go
@@ -7,6 +7,11 @@ import (
"regexp"
)
+type difficultyLevel struct {
+ ID int
+ LevelName string
+}
+
func adminLoginHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method {
case http.MethodGet:
@@ -68,13 +73,11 @@ func isAdmin(w http.ResponseWriter, r *http.Request) bool {
if err != sql.ErrNoRows && err == nil {
return true
}
- http.Redirect(w, r, "/admin/login", http.StatusSeeOther)
return false
}
func adminHandler(w http.ResponseWriter, r *http.Request) {
if !isAdmin(w, r) {
- http.Error(w, "Unauthorized", http.StatusUnauthorized)
return
}
http.ServeFile(w, r, "templates/adminPanel.html")
@@ -82,10 +85,9 @@ func adminHandler(w http.ResponseWriter, r *http.Request) {
func adminTeamsHandler(w http.ResponseWriter, r *http.Request) {
if !isAdmin(w, r) {
- http.Error(w, "Unauthorized", http.StatusUnauthorized)
return
}
- rows, err := db.Query("SELECT name, difficulty_levels.level_name, last_cipher, penalty FROM teams JOIN difficulty_levels ON teams.difficulty_level = difficulty_levels.id ORDER BY name")
+ rows, err := db.Query("SELECT name, difficulty_levels.level_name, last_cipher, penalty FROM teams JOIN difficulty_levels ON teams.difficulty_level = difficulty_levels.id ORDER BY teams.difficulty_level, teams.name")
if err != nil {
http.Error(w, "Database error", http.StatusInternalServerError)
return
@@ -112,7 +114,6 @@ func adminTeamsHandler(w http.ResponseWriter, r *http.Request) {
func AdminStartHandler(w http.ResponseWriter, r *http.Request) {
if !isAdmin(w, r) {
- http.Error(w, "Unauthorized", http.StatusUnauthorized)
return
}
_, err := db.Exec("UPDATE teams SET last_cipher = 1, penalty = 0")
@@ -127,3 +128,55 @@ func AdminStartHandler(w http.ResponseWriter, r *http.Request) {
}
http.Redirect(w, r, "/admin/", http.StatusSeeOther)
}
+
+func AdminRouteHandler(w http.ResponseWriter, r *http.Request) {
+ if !isAdmin(w, r) {
+ http.Error(w, "Unauthorized", http.StatusUnauthorized)
+ return
+ }
+ // Fetch all difficulty levels
+ rows, err := db.Query("SELECT id, level_name FROM difficulty_levels ORDER BY id")
+ if err != nil {
+ http.Error(w, "Database error", http.StatusInternalServerError)
+ return
+ }
+ defer rows.Close()
+ var difficultyLevels []difficultyLevel
+ for rows.Next() {
+ var level difficultyLevel
+ if err := rows.Scan(&level.ID, &level.LevelName); err != nil {
+ http.Error(w, "Database error", http.StatusInternalServerError)
+ return
+ }
+ difficultyLevels = append(difficultyLevels, level)
+ }
+ // For each difficulty level, fetch the corresponding tasks and their details
+ var routes []AdminRoutesTemplateS
+ for _, level := range difficultyLevels {
+ var route AdminRoutesTemplateS
+ rows, err := db.Query("SELECT tasks.order_num, CIPHERS.assignment, CIPHERS.clue, tasks.end_clue, POSITIONS.gps, POSITIONS.clue, CIPHERS.solution FROM TASKS JOIN CIPHERS ON TASKS.cipher_id = ciphers.id JOIN POSITIONS on TASKS.position_id = POSITIONS.id WHERE TASKS.difficulty_level=? ORDER BY TASKS.order_num;", level.ID)
+ if err != nil {
+ http.Error(w, "Database error", http.StatusInternalServerError)
+ return
+ }
+ defer rows.Close()
+ route.Name = level.LevelName
+ for rows.Next() {
+ var cipher CipherTemplateS
+ if err := rows.Scan(&cipher.Order, &cipher.Assignment, &cipher.HelpText, &cipher.FinalClue, &cipher.Coordinates, &cipher.PositionHint, &cipher.Solution); err != nil {
+ http.Error(w, "Database error", http.StatusInternalServerError)
+ return
+ }
+ route.Ciphers = append(route.Ciphers, cipher)
+ }
+ if err := rows.Err(); err != nil {
+ http.Error(w, "Database error", http.StatusInternalServerError)
+ return
+ }
+ routes = append(routes, route)
+ }
+ if err := AdminRoutesTemplate.Execute(w, routes); err != nil {
+ http.Error(w, "Template error", http.StatusInternalServerError)
+ return
+ }
+}
diff --git a/klice.go b/klice.go
index effb206..8aabe0e 100644
--- a/klice.go
+++ b/klice.go
@@ -338,6 +338,7 @@ func main() {
http.HandleFunc("/admin/", adminHandler)
http.HandleFunc("/admin/teams", adminTeamsHandler)
http.HandleFunc("/admin/start", AdminStartHandler)
+ http.HandleFunc("/admin/routes", AdminRouteHandler)
fmt.Println("Server started at :8080")
http.ListenAndServe(":8080", nil)
diff --git a/templates.go b/templates.go
index 1a57343..32515df 100644
--- a/templates.go
+++ b/templates.go
@@ -5,14 +5,15 @@ import (
)
type CipherTemplateS struct {
- Order uint
- Assignment template.HTML
- HelpText string
- FinalClue string
- Coordinates string
- Solution string
- Help int
- Wrong bool
+ Order uint
+ Assignment template.HTML
+ HelpText string
+ FinalClue string
+ Coordinates string
+ PositionHint string
+ Solution string
+ Help int
+ Wrong bool
}
type TeamTemplateS struct {
@@ -22,6 +23,12 @@ type TeamTemplateS struct {
Penalties int
}
+type AdminRoutesTemplateS struct {
+ Name string
+ Ciphers []CipherTemplateS
+}
+
var CipherTemplate = template.Must(template.ParseFiles("templates/assignment.html"))
var TeamTemplate = template.Must(template.ParseFiles("templates/team.html"))
var AdminTeamsTemplate = template.Must(template.ParseFiles("templates/adminTeams.html"))
+var AdminRoutesTemplate = template.Must(template.ParseFiles("templates/adminRoutes.html"))
diff --git a/templates/adminRoutes.html b/templates/adminRoutes.html
new file mode 100644
index 0000000..7d8912e
--- /dev/null
+++ b/templates/adminRoutes.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+ Trasy
+
+
+
+ Trasy
+ {{range .}}
+ {{.Name}}
+
+
+ | Pořadí |
+ Souřadnice |
+ Nápověda pozice |
+ Zadání |
+ Nápověda |
+ Řešení |
+ Cílová indicie |
+
+ {{range .Ciphers}}
+
+ | {{.Order}} |
+ {{.Coordinates}} |
+ {{.PositionHint}} |
+ {{.Assignment}} |
+ {{.HelpText}} |
+ {{.Solution}} |
+ {{.FinalClue}} |
+
+ {{end}}
+
+
+ {{end}}
+
+
+
\ No newline at end of file