#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()) {
-	// if created_at.Add(time.Duration(8 * time.Hour)).Before(time.Now()) {
+		return nil
-	// 	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)
+		user := verifySessionAndReturnUser(db, r)
-		// var userId = token.UID
+		if user == nil {
-		var userId = ""
+			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 workout workout.Workout
-			var date string
-			var workoutType string
-			var sets int
-			var reps int
 
-			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)
 	}
 }
 

template/app.templ

@@ -1,65 +0,0 @@
-package template
-
-templ App() {
-	<main class="mx-2">
-		<form
-			class="max-w-xl mx-auto flex flex-col gap-4 justify-center mt-10"
-		>
-			<h2 class="text-4xl mb-8">Track your workout</h2>
-			<input
-				id="date"
-				type="date"
-				class="input input-bordered"
-				value=""
-				name="date"
-			/>
-			<select class="select select-bordered w-full" name="type">
-				<option>Push Ups</option>
-				<option>Pull Ups</option>
-			</select>
-			<input
-				type="number"
-				class="input input-bordered"
-				placeholder="Sets"
-				name="sets"
-			/>
-			<input
-				type="number"
-				class="input input-bordered"
-				placeholder="Reps"
-				name="reps"
-			/>
-			<button class="btn btn-primary self-end">Save</button>
-		</form>
-		<!-- 	<div class="overflow-x-auto mx-auto max-w-screen-lg"> -->
-		<!-- 		<h2 class="text-4xl mt-14 mb-8">Workout history</h2> -->
-		<!-- 		<table class="table table-auto max-w-full"> -->
-		<!-- 			<thead> -->
-		<!-- 				<tr> -->
-		<!-- 					<th>Date</th> -->
-		<!-- 					<th>Type</th> -->
-		<!-- 					<th>Sets</th> -->
-		<!-- 					<th>Reps</th> -->
-		<!-- 					<th></th> -->
-		<!-- 				</tr> -->
-		<!-- 			</thead> -->
-		<!--  -->
-		<!-- 			<tbody> -->
-		<!-- 					<tr> -->
-		<!-- 						<th>{workout.date}</th> -->
-		<!-- 						<th>{workout.type}</th> -->
-		<!-- 						<th>{workout.sets}</th> -->
-		<!-- 						<th>{workout.reps}</th> -->
-		<!-- 						<th> -->
-		<!-- 							<div class="tooltip" data-tip="Delete Entry"> -->
-		<!-- 								<button on:click={() => deleteWorkout(workout.id)}> -->
-		<!-- 									<MdiDelete class="text-gray-400 text-lg"></MdiDelete> -->
-		<!-- 								</button> -->
-		<!-- 							</div> -->
-		<!-- 						</th> -->
-		<!-- 					</tr> -->
-		<!-- 			</tbody> -->
-		<!-- 	</table> -->
-		<!-- </div> -->
-	</main>
-}

template/auth/sign_in_or_up.templ

@@ -3,11 +3,11 @@ package auth
 templ SignInOrUp(isSignIn bool) {
 	<form
 		class="max-w-xl px-2 mx-auto flex flex-col gap-4 h-full justify-center"
-		method="POST"
+		hx-target="#sign-in-or-up-error"
 		if isSignIn {
-			action="/api/auth/signin"
+			hx-post="/api/auth/signin"
 		} else {
-			action="/api/auth/signup"
+			hx-post="/api/auth/signup"
 		}
 	>
 		<h2 class="text-6xl mb-10">
@@ -61,5 +61,12 @@ templ SignInOrUp(isSignIn bool) {
 				</button>
 			}
 		</div>
+		@Error("")
 	</form>
 }
+
+templ Error(message string) {
+	<p class="text-error text-right" id="sign-in-or-up-error">
+		{ message }
+	</p>
+}

template/auth/user.templ

@@ -1,11 +1,10 @@
 package auth
 
 templ UserComp(user string) {
-	<div id="user-info" class="flex gap-5">
+	<div id="user-info" class="flex gap-5 items-center">
 		if user != "" {
 			<a hx-get="/api/auth/signout" hx-target="#user-info" class="btn btn-sm">Sign Out</a>
-			<!-- <a href="/api/auth/signout" class="btn btn-sm">Sign Out</a> -->
+			<p>{ user }</p>
-			{ user }
 		} else {
 			<a href="/auth/signup" class="btn btn-sm">Sign Up</a>
 			<a href="/auth/signin" class="btn btn-sm">Sign In</a>

template/workout/workout.templ

@@ -1,9 +1,10 @@
 package workout
 
-templ Workout() {
+templ WorkoutComp() {
 	<main class="mx-2">
 		<form
 			class="max-w-xl mx-auto flex flex-col gap-4 justify-center mt-10"
+			hx-post="/api/workout"
 		>
 			<h2 class="text-4xl mb-8">Track your workout</h2>
 			<input
@@ -31,35 +32,48 @@ templ Workout() {
 			/>
 			<button class="btn btn-primary self-end">Save</button>
 		</form>
-		<!-- 	<div class="overflow-x-auto mx-auto max-w-screen-lg"> -->
+		<div hx-get="/api/workout" hx-trigger="load"></div>
-		<!-- 		<h2 class="text-4xl mt-14 mb-8">Workout history</h2> -->
-		<!-- 		<table class="table table-auto max-w-full"> -->
-		<!-- 			<thead> -->
-		<!-- 				<tr> -->
-		<!-- 					<th>Date</th> -->
-		<!-- 					<th>Type</th> -->
-		<!-- 					<th>Sets</th> -->
-		<!-- 					<th>Reps</th> -->
-		<!-- 					<th></th> -->
-		<!-- 				</tr> -->
-		<!-- 			</thead> -->
-		<!--  -->
-		<!-- 			<tbody> -->
-		<!-- 					<tr> -->
-		<!-- 						<th>{workout.date}</th> -->
-		<!-- 						<th>{workout.type}</th> -->
-		<!-- 						<th>{workout.sets}</th> -->
-		<!-- 						<th>{workout.reps}</th> -->
-		<!-- 						<th> -->
-		<!-- 							<div class="tooltip" data-tip="Delete Entry"> -->
-		<!-- 								<button on:click={() => deleteWorkout(workout.id)}> -->
-		<!-- 									<MdiDelete class="text-gray-400 text-lg"></MdiDelete> -->
-		<!-- 								</button> -->
-		<!-- 							</div> -->
-		<!-- 						</th> -->
-		<!-- 					</tr> -->
-		<!-- 			</tbody> -->
-		<!-- 	</table> -->
-		<!-- </div> -->
 	</main>
 }
+
+type Workout struct {
+	Id   string
+	Date string
+	Type string
+	Sets string
+	Reps string
+}
+
+templ WorkoutListComp(workouts []Workout) {
+	<div class="overflow-x-auto mx-auto max-w-screen-lg">
+		<h2 class="text-4xl mt-14 mb-8">Workout history</h2>
+		<table class="table table-auto max-w-full">
+			<thead>
+				<tr>
+					<th>Date</th>
+					<th>Type</th>
+					<th>Sets</th>
+					<th>Reps</th>
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+				for _,w := range workouts {
+					<tr>
+						<th>{ w.Date }</th>
+						<th>{ w.Type }</th>
+						<th>{ w.Sets }</th>
+						<th>{ w.Reps }</th>
+						<th>
+							<div class="tooltip" data-tip="Delete Entry">
+								<button hx-delete="api/workout/{w.id}">
+									Delete
+								</button>
+							</div>
+						</th>
+					</tr>
+				}
+			</tbody>
+		</table>
+	</div>
+}