Critical Stability & Performance fixes. Excessive Log Set button gone on QIuck Log screen

2025-12-06 08:58:44 +02:00
parent 27afacee3f
commit 1c3e15516c
35 changed files with 48 additions and 26 deletions
--- a/index.html
+++ b/index.html
@@ -93,10 +93,10 @@
  }
 }
 </script>
-<link rel="stylesheet" href="/index.css">
+<link rel="stylesheet" href="/src/index.css">
 </head>
  <body class="bg-surface text-on-surface h-screen overflow-hidden selection:bg-primary-container selection:text-on-primary-container">
    <div id="root"></div>
-  <script type="module" src="/index.tsx"></script>
+  <script type="module" src="/src/index.tsx"></script>
 </body>
 </html>
--- a/server/package.json
+++ b/server/package.json
@@ -13,12 +13,12 @@
        "@prisma/adapter-better-sqlite3": "^7.1.0",
        "@prisma/client": "^6.19.0",
        "@types/better-sqlite3": "^7.6.13",
-        "bcryptjs": "*",
+        "bcryptjs": "3.0.3",
        "better-sqlite3": "^12.5.0",
-        "cors": "*",
-        "dotenv": "*",
-        "express": "*",
-        "jsonwebtoken": "*",
+        "cors": "2.8.5",
+        "dotenv": "17.2.3",
+        "express": "5.1.0",
+        "jsonwebtoken": "9.0.2",
        "ts-node-dev": "^2.0.0"
    },
    "devDependencies": {
@@ -32,4 +32,4 @@
        "ts-node": "*",
        "typescript": "*"
    }
-}
+}
--- a/server/prisma/dev.db
+++ b/server/prisma/dev.db
--- a/server/src/routes/exercises.ts
+++ b/server/src/routes/exercises.ts
@@ -41,6 +41,32 @@ router.get('/', async (req: any, res) => {
    }
 });

+// Get last set for specific exercise
+router.get('/:id/last-set', async (req: any, res) => {
+    try {
+        const userId = req.user.userId;
+        const exerciseId = req.params.id;
+
+        const lastSet = await prisma.workoutSet.findFirst({
+            where: {
+                exerciseId,
+                session: { userId } // Ensure optimization by filtering sessions of the user
+            },
+            include: {
+                session: true
+            },
+            orderBy: {
+                timestamp: 'desc'
+            }
+        });
+
+        res.json({ success: true, set: lastSet });
+    } catch (error) {
+        console.error(error);
+        res.status(500).json({ error: 'Server error' });
+    }
+});
+
 // Create/Update exercise
 router.post('/', async (req: any, res) => {
    try {
--- a/src/App.tsx
+++ b/src/App.tsx
--- a/src/components/AICoach.tsx
+++ b/src/components/AICoach.tsx
--- a/src/components/ExerciseModal.tsx
+++ b/src/components/ExerciseModal.tsx
--- a/src/components/FilledInput.tsx
+++ b/src/components/FilledInput.tsx
--- a/src/components/History.tsx
+++ b/src/components/History.tsx
--- a/src/components/Login.tsx
+++ b/src/components/Login.tsx
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
--- a/src/components/Plans.tsx
+++ b/src/components/Plans.tsx
--- a/src/components/Profile.tsx
+++ b/src/components/Profile.tsx
--- a/src/components/Snackbar.tsx
+++ b/src/components/Snackbar.tsx
--- a/src/components/Stats.tsx
+++ b/src/components/Stats.tsx
--- a/src/components/Tracker/ActiveSessionView.tsx
+++ b/src/components/Tracker/ActiveSessionView.tsx
--- a/src/components/Tracker/IdleView.tsx
+++ b/src/components/Tracker/IdleView.tsx
--- a/src/components/Tracker/SetLogger.tsx
+++ b/src/components/Tracker/SetLogger.tsx
--- a/src/components/Tracker/SporadicView.tsx
+++ b/src/components/Tracker/SporadicView.tsx
--- a/src/components/Tracker/index.tsx
+++ b/src/components/Tracker/index.tsx
--- a/src/components/Tracker/useTracker.ts
+++ b/src/components/Tracker/useTracker.ts
--- a/src/index.css
+++ b/src/index.css
--- a/src/index.tsx
+++ b/src/index.tsx
--- a/src/services/api.ts
+++ b/src/services/api.ts
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
--- a/src/services/geminiService.ts
+++ b/src/services/geminiService.ts
--- a/src/services/i18n.ts
+++ b/src/services/i18n.ts
--- a/src/services/sporadicSets.ts
+++ b/src/services/sporadicSets.ts
--- a/src/services/storage.ts
+++ b/src/services/storage.ts
@@ -52,12 +52,12 @@ export const updateActiveSession = async (userId: string, session: WorkoutSessio
 };

 export const deleteSetFromActiveSession = async (userId: string, setId: string): Promise<void> => {
-    await api.delete(`/sessions/active/set/${setId}`);
+  await api.delete(`/sessions/active/set/${setId}`);
 };

 export const updateSetInActiveSession = async (userId: string, setId: string, setData: Partial<WorkoutSet>): Promise<WorkoutSet> => {
-    const response = await api.put(`/sessions/active/set/${setId}`, setData);
-    return response.updatedSet;
+  const response = await api.put(`/sessions/active/set/${setId}`, setData);
+  return response.updatedSet;
 };

 export const deleteActiveSession = async (userId: string): Promise<void> => {
@@ -85,21 +85,17 @@ export const saveExercise = async (userId: string, exercise: ExerciseDef): Promi
 };

 export const getLastSetForExercise = async (userId: string, exerciseId: string): Promise<WorkoutSet | undefined> => {
-  // This requires fetching sessions or a specific endpoint.
-  // For performance, we should probably have an endpoint for this.
-  // For now, let's fetch sessions and find it client side, or implement endpoint later.
-  // Given the async nature, we need to change the signature to Promise.
-  // The caller needs to await this.
-  const sessions = await getSessions(userId);
-  for (const session of sessions) {
-    for (let i = session.sets.length - 1; i >= 0; i--) {
-      if (session.sets[i].exerciseId === exerciseId) {
-        return session.sets[i];
-      }
+  try {
+    const response = await api.get(`/exercises/${exerciseId}/last-set`);
+    if (response.success && response.set) {
+      return response.set;
    }
+    return undefined;
+  } catch (error) {
+    console.error("Failed to fetch last set:", error);
+    return undefined;
  }
-  return undefined;
-}
+};

 export const getPlans = async (userId: string): Promise<WorkoutPlan[]> => {
  try {
--- a/src/services/weight.ts
+++ b/src/services/weight.ts
--- a/src/types.ts
+++ b/src/types.ts
--- a/src/utils/text.ts
+++ b/src/utils/text.ts
--- a/src/utils/uuid.ts
+++ b/src/utils/uuid.ts
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,7 @@
    "jsx": "react-jsx",
    "paths": {
      "@/*": [
-        "./*"
+        "./src/*"
      ]
    },
    "allowImportingTsExtensions": true,
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,7 +23,7 @@ export default defineConfig(({ mode }) => {
    },
    resolve: {
      alias: {
-        '@': path.resolve(__dirname, '.'),
+        '@': path.resolve(__dirname, './src'),
      }
    }
  };