Changeset 447c39f

Timestamp:

06/22/26 16:56:41 (3 months ago)

Author:

Andrej <asumanovski@…>

Branches:

master

Children:

194c016

Parents:

42da64d

Message:

Improved UI and small fixes

Files:

• AGENTS.md (added)
• backend/src/main/java/com/trekr/backend/dto/discipline/UpdateTaskStatusRequest.java (added)
• backend/src/main/java/com/trekr/backend/dto/training/CreateTrainingSessionRequest.java (modified) (3 diffs)
• backend/src/main/java/com/trekr/backend/entity/discipline/TaskStatus.java (added)
• backend/src/main/java/com/trekr/backend/service/TrainingService.java (modified) (1 diff)
• db-scripts/migrations/V001__expand_tasks_table.sql (added)
• db-scripts/tunnel_scripta.sh (modified) (2 diffs)
• frontend/index.html (modified) (1 diff)
• frontend/public/favicon.png (added)
• frontend/src/pages/Dashboard/pages/CustomCategory/components/TaskFormModal.jsx (added)
• frontend/src/pages/Dashboard/pages/Discipline/DisciplineTracking.jsx (modified) (1 diff)
• frontend/src/pages/Dashboard/pages/Finance/components/NewIncomeForm.jsx (modified) (1 diff)
• frontend/src/pages/Dashboard/pages/Training/NewTrainingSession.jsx (modified) (5 diffs)

backend/src/main/java/com/trekr/backend/dto/training/CreateTrainingSessionRequest.java

@@ -4 +4 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PastOrPresent;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 public class CreateTrainingSessionRequest {
@@ -21 +23 @@
     @DecimalMin(value = "0", inclusive = true)
     private BigDecimal calories;
+
+    @PastOrPresent
+    private LocalDate date;
 
     public CreateTrainingSessionRequest() {
@@ -56 +61 @@
         this.calories = calories;
     }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(LocalDate date) {
+        this.date = date;
+    }
 }

backend/src/main/java/com/trekr/backend/service/TrainingService.java

@@ -177 +177 @@
         session.setDuration(durationMinutes);
         session.setCalories(calories);
-        session.setDate(LocalDate.now());
+        // Allow client to supply a date (past or present). If not provided, use today.
+        java.time.LocalDate suppliedDate = request.getDate();
+        if (suppliedDate == null) {
+            suppliedDate = LocalDate.now();
+        }
+        if (suppliedDate.isAfter(LocalDate.now())) {
+            throw new RuntimeException("Date cannot be in the future");
+        }
+        session.setDate(suppliedDate);
 
         TrainingSession saved = trainingSessionRepository.save(session);

db-scripts/tunnel_scripta.sh

@@ -5 +5 @@
 echo "AKO SAKATE DA SLUSHA NA DRUGA PORTA, SMENETE JA SKRIPTATA SOODVETNO"
 echo "AKO SAKATE DA STOPIRATE (CTRL+C)"
-read -p "Press any key to continue ..."
 
-ssh -v -2 -C -N -L 9999:localhost:5432 t_trekr@194.149.135.130
+
+sshpass -p '459499b8' ssh -v -2 -C -N -L 9999:localhost:5432 t_trekr@194.149.135.130
 
 echo "VRSKATA TREBA DA STOI OTVORENA SE DODEKA IMATE PRISTAP DO SERVEROT"
@@ -13 +13 @@
 echo "AKO TOA SE SLUCHILO SAMO OD SEBE, IMATE PROBLEM SO VOSPOSTAVUVANJE"
 echo "NA VRSKATA DO SERVEROT (BLOKADA) ILI VI SE POGRESHNI PARAMETRITE"
-read -p "Press any key to continue ..."

frontend/index.html

@@ -3 +3 @@
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>frontend</title>
+    <title>Trekr</title>
   </head>
   <body>

frontend/src/pages/Dashboard/pages/Discipline/DisciplineTracking.jsx

@@ -293 +293 @@
 
   const isTodayClosed = useMemo(() => {
+    console.log('todayIso:', todayIso);
     return (dailyCompletions ?? []).some((dc) => dc?.date === todayIso);
   }, [dailyCompletions, todayIso]);

frontend/src/pages/Dashboard/pages/Finance/components/NewIncomeForm.jsx

@@ -4 +4 @@
   const [date, setDate] = useState(() => {
     const d = new Date();
+    console.log('Date:', d);
     return d.toISOString().slice(0, 10);
   });

frontend/src/pages/Dashboard/pages/Training/NewTrainingSession.jsx

@@ -18 +18 @@
   const [autoCalculateCalories, setAutoCalculateCalories] = useState(true);
   const [calories, setCalories] = useState("");
+  const [date, setDate] = useState(() => new Date().toISOString().slice(0, 10));
 
   const [error, setError] = useState("");
@@ -95 +96 @@
     }
 
+    // Date must not be in the future (allow past or today)
+    const todayStr = new Date().toISOString().slice(0, 10);
+    if (!date || date > todayStr) {
+      setError("Date cannot be in the future.");
+      return;
+    }
+
     const caloriesNum = calories === "" ? NaN : Number(calories);
     if (!autoCalculateCalories) {
@@ -108 +116 @@
         type,
         durationMinutes: durationNum,
+        date,
         autoCalculateCalories,
         calories: autoCalculateCalories ? null : caloriesNum,
@@ -145 +154 @@
           ) : null}
 
-          <div className="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2">
+          <div className="mt-4 grid grid-cols-1 gap-4 md:grid-cols-3">
             <WorkoutTypeSelect
               workoutTypes={workoutTypes}
@@ -165 +174 @@
                 disabled={isLoading}
               />
+            </div>
+
+            <div>
+              <label className="label">Date</label>
+              <input
+                type="date"
+                className="input input-bordered w-full"
+                value={date}
+                onChange={(e) => setDate(e.target.value)}
+                max={new Date().toISOString().slice(0, 10)}
+                required
+                disabled={isLoading}
+              />
+              <p className="text-xs opacity-70 mt-1">Choose a past date or today (no future dates).</p>
             </div>
           </div>