Changeset 4f85b41 for frontend

Timestamp:

04/30/26 12:05:34 (2 months ago)

Author:

Andrej <asumanovski@…>

Branches:

master

Children:

e9a0543

Parents:

8449b9c

Message:

Daily discipline feature done

Location:

frontend/src

Files:

• App.jsx (modified) (2 diffs)
• api/dailyCompletion.js (added)
• api/discipline.js (added)
• pages/Dashboard/pages/Discipline/Discipline.jsx (modified) (1 diff)
• pages/Dashboard/pages/Discipline/DisciplineTracking.jsx (added)
• pages/Dashboard/pages/Discipline/components/.gitkeep (added)
• pages/Dashboard/pages/Discipline/components/DisciplineCenteredCard.jsx (added)
• pages/Dashboard/pages/Discipline/components/DisciplineStartCtaCard.jsx (added)
• pages/Dashboard/pages/Discipline/components/TaskList.jsx (added)

frontend/src/App.jsx

@@ -19 +19 @@
 import NewInvestment from "./pages/Dashboard/pages/Investing/NewInvestment.jsx";
 import Discipline from "./pages/Dashboard/pages/Discipline/Discipline.jsx";
+import DisciplineTracking from "./pages/Dashboard/pages/Discipline/DisciplineTracking.jsx";
 
 function RequireAuth({ children }) {
@@ -59 +60 @@
           <Route path="investing/assets/new" element={<NewInvestment />} />
           <Route path="discipline" element={<Discipline />} />
+           <Route path="discipline/tracking" element={<DisciplineTracking />} />
         </Route>
         <Route path="*" element={<Navigate to="/" replace />} />

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

@@ -1 @@
-import React from "react";
+import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 
-const Discipline = () => {
+import {
+  getDisciplineStatus,
+  startDisciplineTracking,
+} from "../../../../api/discipline";
+
+import DisciplineCenteredCard from "./components/DisciplineCenteredCard.jsx";
+import DisciplineStartCtaCard from "./components/DisciplineStartCtaCard.jsx";
+
+export default function Discipline() {
+  const navigate = useNavigate();
+
+  const [isLoading, setIsLoading] = useState(true);
+  const [isTracking, setIsTracking] = useState(false);
+  const [error, setError] = useState("");
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  useEffect(() => {
+    let isMounted = true;
+    const run = async () => {
+      setIsLoading(true);
+      setError("");
+      try {
+        const tracking = await getDisciplineStatus();
+        if (!isMounted) return;
+        setIsTracking(tracking);
+        if (tracking) {
+          navigate("/dashboard/discipline/tracking", { replace: true });
+        }
+      } catch (err) {
+        if (!isMounted) return;
+        const message =
+          err?.response?.data?.message || "Failed to load discipline status";
+        setError(message);
+      } finally {
+        if (isMounted) setIsLoading(false);
+      }
+    };
+
+    run();
+    return () => {
+      isMounted = false;
+    };
+  }, [navigate]);
+
+  const onStart = async () => {
+    setError("");
+    setIsSubmitting(true);
+    try {
+      await startDisciplineTracking();
+      setIsTracking(true);
+      navigate("/dashboard/discipline/tracking", { replace: true });
+    } catch (err) {
+      const message =
+        err?.response?.data?.message ||
+        Object.values(err?.response?.data?.errors ?? {})[0] ||
+        "Failed to start tracking";
+      setError(message);
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  if (isLoading) {
+    return <DisciplineCenteredCard title="Discipline" message="Loading…" />;
+  }
+
+  if (isTracking) {
+    return <DisciplineCenteredCard title="Discipline" message="Redirecting…" />;
+  }
+
   return (
-    <div className="space-y-4">
-      <h1 className="text-2xl font-bold">Discipline</h1>
-      <div className="card bg-base-200 border border-base-300">
-        <div className="card-body">
-          <p className="opacity-80">Discipline dashboard content goes here.</p>
-        </div>
+    <div className="min-h-[70vh] w-full flex items-center justify-center">
+      <div className="w-full max-w-3xl">
+        <DisciplineStartCtaCard
+          error={error}
+          onStart={onStart}
+          isSubmitting={isSubmitting}
+        />
       </div>
     </div>
   );
-};
-
-export default Discipline;
+}