#73 move workout to new mehtod

service/auth.go

@@ -71,8 +71,8 @@ func HandleSignUp(db *sql.DB) http.HandlerFunc {
 
 		user_uuid, err := uuid.NewRandom()
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
 			log.Printf("Could not generate UUID: %v", err)
+			auth.Error("Internal Server Error").Render(r.Context(), w)
 			return
 		}
 
@@ -84,11 +84,11 @@ func HandleSignUp(db *sql.DB) http.HandlerFunc {
 		_, err = db.Exec("INSERT INTO user (user_uuid, email, email_verified, is_admin, password, salt, created_at) VALUES (?, ?, FALSE, FALSE, ?, ?, datetime())", user_uuid, email, hash, salt)
 		if err != nil {
 			if strings.Contains(err.Error(), "email") {
-				http.Error(w, "Bad Request", http.StatusBadRequest)
+				auth.Error("Bad Request").Render(r.Context(), w)
 				return
 			}
 
-			http.Error(w, err.Error(), http.StatusInternalServerError)
+			auth.Error("Internal Server Error").Render(r.Context(), w)
 			log.Printf("Could not insert user: %v", err)
 			return
 		}
@@ -98,7 +98,8 @@ func HandleSignUp(db *sql.DB) http.HandlerFunc {
 			return
 		}
 
-		http.Redirect(w, r, "/", http.StatusSeeOther)
+		w.Header().Add("HX-Redirect", "/")
+		w.WriteHeader(http.StatusOK)
 	}
 }
 
@@ -142,9 +143,10 @@ func HandleSignIn(db *sql.DB) http.HandlerFunc {
 		time.Sleep(time.Duration(time_to_wait) * time.Millisecond)
 
 		if result {
-			http.Redirect(w, r, "/", http.StatusSeeOther)
+			w.Header().Add("HX-Redirect", "/")
+			w.WriteHeader(http.StatusOK)
 		} else {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			auth.Error("Invalid email or password").Render(r.Context(), w)
 		}
 	}
 }
@@ -259,10 +261,9 @@ func verifySessionAndReturnUser(db *sql.DB, r *http.Request) *User {
 		return nil
 	}
 
-	// TODO: Test
-	// if created_at.Add(time.Duration(8 * time.Hour)).Before(time.Now()) {
-	// 	return nil
-	// }
+	if created_at.Add(time.Duration(8 * time.Hour)).Before(time.Now()) {
+		return nil
+	}
 
 	return &user
 }

service/workout.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"me-fit/template"
-	"me-fit/utils"
+	"me-fit/template/workout"
 
 	"database/sql"
 	"net/http"
@@ -25,7 +25,7 @@ var (
 
 func HandleWorkoutPage(db *sql.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		inner := template.App()
+		inner := workout.WorkoutComp()
 		user_comp := UserInfoComp(verifySessionAndReturnUser(db, r))
 		layout := template.Layout(inner, user_comp)
 		layout.Render(r.Context(), w)
@@ -80,41 +80,32 @@ func HandleGetWorkouts(db *sql.DB) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		metrics.WithLabelValues("get").Inc()
 
-		// token := r.Context().Value(middleware.TOKEN_KEY).(*auth.Token)
-		// var userId = token.UID
-		var userId = ""
+		user := verifySessionAndReturnUser(db, r)
+		if user == nil {
+			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			return
+		}
 
-		rows, err := db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ?", userId)
+		rows, err := db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ?", user.user_uuid)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 
-		var workouts = make([]map[string]interface{}, 0)
+		var workouts = make([]workout.Workout, 0)
 		for rows.Next() {
-			var id int
-			var date string
-			var workoutType string
-			var sets int
-			var reps int
+			var workout workout.Workout
 
-			err = rows.Scan(&id, &date, &workoutType, &sets, &reps)
+			err = rows.Scan(&workout.Id, &workout.Date, &workout.Type, &workout.Sets, &workout.Reps)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
 
-			workout := map[string]interface{}{
-				"id":   id,
-				"date": date,
-				"type": workoutType,
-				"sets": sets,
-				"reps": reps,
-			}
 			workouts = append(workouts, workout)
 		}
 
-		utils.WriteJSON(w, workouts)
+		workout.WorkoutListComp(workouts).Render(r.Context(), w)
 	}
 }