Index: frontend/src/App.css
===================================================================
--- frontend/src/App.css (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ frontend/src/App.css (revision 72053b5fc3ff291757af1cdd64e8fdfcb9e9b17d)
@@ -1,5 +1,42 @@
+#root {
+ max-width: 1280px;
+ margin: 0 auto;
+ padding: 2rem;
+ text-align: center;
+}
-@import "tailwindcss";
-@plugin "daisyui" {
- themes: light --default;
+.logo {
+ height: 6em;
+ padding: 1.5em;
+ will-change: filter;
+ transition: filter 300ms;
}
+.logo:hover {
+ filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+ filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+ a:nth-of-type(2) .logo {
+ animation: logo-spin infinite 20s linear;
+ }
+}
+
+.card {
+ padding: 2em;
+}
+
+.read-the-docs {
+ color: #888;
+}
Index: frontend/src/App.jsx
===================================================================
--- frontend/src/App.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ frontend/src/App.jsx (revision 72053b5fc3ff291757af1cdd64e8fdfcb9e9b17d)
@@ -1,77 +1,35 @@
-import { Navigate, Route, Routes } from "react-router-dom";
-import { clearAuthSession, getAuthToken, isTokenExpired } from "./utils/authSession";
+import { useState } from 'react'
+import reactLogo from './assets/react.svg'
+import viteLogo from '/vite.svg'
+import './App.css'
-import LandingPage from "./pages/LandingPage/LandingPage.jsx";
-import Login from "./pages/Login/Login.jsx";
-import Register from "./pages/Register/Register.jsx";
-import DashboardLayout from "./pages/Dashboard/DashboardLayout.jsx";
-import ControlCenter from "./pages/Dashboard/pages/ControlCenter/ControlCenter.jsx";
-import Training from "./pages/Dashboard/pages/Training/Training.jsx";
-import TrainingTracking from "./pages/Dashboard/pages/Training/TrainingTracking.jsx";
-import NewTrainingSession from "./pages/Dashboard/pages/Training/NewTrainingSession.jsx";
-import Weight from "./pages/Dashboard/pages/Weight/Weight.jsx";
-import WeightTracking from "./pages/Dashboard/pages/Weight/WeightTracking.jsx";
-import NewWeightIntake from "./pages/Dashboard/pages/Weight/NewWeightIntake.jsx";
-import Finance from "./pages/Dashboard/pages/Finance/Finance.jsx";
-import FinanceTracking from "./pages/Dashboard/pages/Finance/FinanceTracking.jsx";
-import NewIncome from "./pages/Dashboard/pages/Finance/NewIncome.jsx";
-import Investing from "./pages/Dashboard/pages/Investing/Investing.jsx";
-import InvestingTracking from "./pages/Dashboard/pages/Investing/InvestingTracking.jsx";
-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";
-import CustomCategoryKanban from "./pages/Dashboard/pages/CustomCategory/CustomCategoryKanban.jsx";
+function App() {
+ const [count, setCount] = useState(0)
-function RequireAuth({ children }) {
- const token = getAuthToken();
- if (token && isTokenExpired(token)) {
- clearAuthSession();
- return Vite + React
+
+
setCount((count) => count + 1)}>
+ count is {count}
+
+
+ Edit src/App.jsx and save to test HMR
+
+
+ Click on the Vite and React logos to learn more
+
+
+ )
}
-function App() {
- return (
-
-
-
-
-
-
- );
-}
-
-export default App;
+export default App
Index: frontend/src/api/axios.js
===================================================================
--- frontend/src/api/axios.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ frontend/src/api/axios.js (revision 72053b5fc3ff291757af1cdd64e8fdfcb9e9b17d)
@@ -1,32 +1,6 @@
import axios from "axios";
-import { getAuthToken, isTokenExpired, logoutAndRedirect } from "../utils/authSession";
-const api = axios.create({
- baseURL: import.meta.env.VITE_API_BASE_URL ?? "http://localhost:8080/api",
+export default axios.create({
+ baseURL: "http://localhost:8080/api",
+ withCredentials: true, // important if using cookies
});
-
-api.interceptors.request.use((config) => {
- const token = getAuthToken();
- if (token) {
- if (isTokenExpired(token)) {
- logoutAndRedirect("/dashboard");
- return Promise.reject(new Error("Authentication session expired"));
- }
- config.headers = config.headers ?? {};
- config.headers.Authorization = `Bearer ${token}`;
- }
- return config;
-});
-
-api.interceptors.response.use(
- (response) => response,
- (error) => {
- const status = error?.response?.status;
- if (status === 401 || status === 403) {
- logoutAndRedirect("/dashboard");
- }
- return Promise.reject(error);
- },
-);
-
-export default api;
Index: frontend/src/api/dailyCompletion.js
===================================================================
--- frontend/src/api/dailyCompletion.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,16 +1,0 @@
-import api from "./axios";
-
-export async function computeDailyCompletion(date /* yyyy-mm-dd or undefined */) {
- const res = await api.post("/discipline/daily-completions/compute", null, {
- params: date ? { date } : {},
- });
- return res?.data;
-}
-
-export async function getDailyCompletions({ page = 0, size = 14 } = {}) {
- const res = await api.get("/discipline/daily-completions", {
- params: { page, size },
- });
- return res?.data;
-}
-
Index: frontend/src/api/discipline.js
===================================================================
--- frontend/src/api/discipline.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,96 +1,0 @@
-import api from "./axios";
-
-export async function getDisciplineStatus() {
- const res = await api.get("/discipline/status");
- return Boolean(res?.data?.tracking);
-}
-
-export async function startDisciplineTracking() {
- return api.post("/discipline/start", {});
-}
-
-export async function getTasks({ page = 0, size = 50 } = {}) {
- const res = await api.get("/discipline/tasks", { params: { page, size } });
- return res?.data;
-}
-
-export async function createTask(payload) {
- const res = await api.post("/discipline/tasks", payload);
- return res?.data;
-}
-
-export async function updateTask(taskId, payload) {
- const res = await api.put(`/discipline/tasks/${taskId}`, payload);
- return res?.data;
-}
-
-export async function updateTaskFinished(taskId, isFinished) {
- const res = await api.patch(`/discipline/tasks/${taskId}/finished`, {
- isFinished,
- });
- return res?.data;
-}
-
-export async function deleteTask(taskId) {
- return api.delete(`/discipline/tasks/${taskId}`);
-}
-
-export async function getCustomTrackingCategories() {
- const res = await api.get("/discipline/custom-tracking-categories");
- return res?.data;
-}
-
-export async function createCustomTrackingCategory(payload) {
- const res = await api.post("/discipline/custom-tracking-categories", payload);
- return res?.data;
-}
-
-export async function getCustomCategoryTasks(customTrackingId) {
- const res = await api.get(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks`
- );
- return res?.data;
-}
-
-export async function createCustomCategoryTask(customTrackingId, payload) {
- const res = await api.post(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks`,
- payload
- );
- return res?.data;
-}
-
-export async function updateCustomCategoryTask(customTrackingId, taskId, payload) {
- const res = await api.put(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks/${taskId}`,
- payload
- );
- return res?.data;
-}
-
-export async function updateCustomCategoryTaskFinished(
- customTrackingId,
- taskId,
- isFinished
-) {
- const res = await api.patch(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks/${taskId}/finished`,
- { isFinished }
- );
- return res?.data;
-}
-
-export async function updateCustomCategoryTaskStatus(customTrackingId, taskId, status) {
- const res = await api.patch(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks/${taskId}/status`,
- { status }
- );
- return res?.data;
-}
-
-export async function deleteCustomCategoryTask(customTrackingId, taskId) {
- return api.delete(
- `/discipline/custom-tracking-categories/${customTrackingId}/tasks/${taskId}`
- );
-}
-
Index: frontend/src/api/finance.js
===================================================================
--- frontend/src/api/finance.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,26 +1,0 @@
-import api from "./axios";
-
-export async function getFinanceStatus() {
- const res = await api.get("/finance/status");
- return Boolean(res?.data?.tracking);
-}
-
-export async function startFinanceTracking(payload) {
- return api.post("/finance/start", payload);
-}
-
-export async function getFinanceProfile() {
- const res = await api.get("/finance/profile");
- return res?.data;
-}
-
-export async function getIncomes({ page = 0, size = 5 } = {}) {
- const res = await api.get("/finance/incomes", { params: { page, size } });
- return res?.data;
-}
-
-export async function createIncome(payload) {
- const res = await api.post("/finance/incomes", payload);
- return res?.data;
-}
-
Index: frontend/src/api/twelveData.js
===================================================================
--- frontend/src/api/twelveData.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,284 +1,0 @@
-const BASE_URL =
- import.meta.env.VITE_TWELVE_DATA_BASE_URL ?? "https://api.twelvedata.com";
-
-const API_KEY = import.meta.env.VITE_TWELVE_DATA_API_KEY ?? "";
-
-const CACHE_TTL_MS = 5 * 60_000;
-const MAX_SYMBOLS_PER_REQUEST = 20;
-
-// Cache by Twelve Data symbol (normalized)
-const priceCache = new Map();
-const inFlight = new Map();
-
-function getCachedPrice(twelveSymbol) {
- const item = priceCache.get(twelveSymbol);
- if (!item) return null;
- if (Date.now() - item.ts > CACHE_TTL_MS) return null;
- return item.price;
-}
-
-function setCachedPrice(twelveSymbol, price) {
- if (!twelveSymbol || typeof price !== "number" || !Number.isFinite(price)) return;
- priceCache.set(twelveSymbol, { price, ts: Date.now() });
-}
-
-function parsePriceJson(json, requestedSymbols) {
- const out = {};
- if (!json || typeof json !== "object" || Array.isArray(json)) return out;
-
- // Single symbol response
- if (json.price !== undefined && requestedSymbols.length === 1) {
- const n = Number(json.price);
- if (Number.isFinite(n)) out[requestedSymbols[0]] = n;
- return out;
- }
-
- // Multi symbol response: object keyed by symbol
- for (const sym of requestedSymbols) {
- const n = Number(json?.[sym]?.price);
- if (Number.isFinite(n)) out[sym] = n;
- }
-
- return out;
-}
-
-async function fetchBatchPrices(twelveSymbols) {
- const params = new URLSearchParams();
- params.set("symbol", twelveSymbols.join(","));
- params.set("apikey", API_KEY);
-
- const url = `${BASE_URL}/price?${params.toString()}`;
- const resp = await fetch(url, { method: "GET" });
-
- if (!resp.ok) {
- const text = await resp.text().catch(() => "");
- throw new Error(`Twelve Data request failed (HTTP ${resp.status}) ${text}`);
- }
-
- const json = await resp.json();
- if (json?.status === "error") {
- throw new Error(String(json?.message ?? "Twelve Data error"));
- }
-
- return parsePriceJson(json, twelveSymbols);
-}
-
-async function fetchSinglePrice(twelveSymbol) {
- const cached = getCachedPrice(twelveSymbol);
- if (typeof cached === "number") return cached;
-
- if (inFlight.has(twelveSymbol)) return inFlight.get(twelveSymbol);
-
- const p = (async () => {
- const params = new URLSearchParams();
- params.set("symbol", twelveSymbol);
- params.set("apikey", API_KEY);
- const url = `${BASE_URL}/price?${params.toString()}`;
- const resp = await fetch(url, { method: "GET" });
- if (!resp.ok) {
- const text = await resp.text().catch(() => "");
- throw new Error(`Twelve Data request failed (HTTP ${resp.status}) ${text}`);
- }
- const json = await resp.json();
- if (json?.status === "error") {
- throw new Error(String(json?.message ?? "Twelve Data error"));
- }
- const n = Number(json?.price);
- if (!Number.isFinite(n)) throw new Error("Twelve Data returned no price");
- setCachedPrice(twelveSymbol, n);
- return n;
- })();
-
- inFlight.set(twelveSymbol, p);
- try {
- return await p;
- } finally {
- inFlight.delete(twelveSymbol);
- }
-}
-
-async function fetchSingleExchangeRate(pairSymbol) {
- const cached = getCachedPrice(pairSymbol);
- if (typeof cached === "number") return cached;
-
- if (inFlight.has(pairSymbol)) return inFlight.get(pairSymbol);
-
- const p = (async () => {
- const params = new URLSearchParams();
- params.set("symbol", pairSymbol);
- params.set("apikey", API_KEY);
- const url = `${BASE_URL}/exchange_rate?${params.toString()}`;
- const resp = await fetch(url, { method: "GET" });
- if (!resp.ok) {
- const text = await resp.text().catch(() => "");
- throw new Error(`Twelve Data request failed (HTTP ${resp.status}) ${text}`);
- }
- const json = await resp.json();
- if (json?.status === "error") {
- throw new Error(String(json?.message ?? "Twelve Data error"));
- }
-
- const n = Number(json?.rate);
- if (!Number.isFinite(n)) throw new Error("Twelve Data returned no rate");
- setCachedPrice(pairSymbol, n);
- return n;
- })();
-
- inFlight.set(pairSymbol, p);
- try {
- return await p;
- } finally {
- inFlight.delete(pairSymbol);
- }
-}
-
-export function toTwelveSymbol(symbol) {
- if (!symbol) return "";
- const s = String(symbol).trim().toUpperCase();
- if (!s) return "";
-
- // Already Twelve format (common for FX/crypto)
- if (s.includes("/")) return s;
-
- // Common Yahoo-style crypto tickers
- const cryptoMap = {
- "BTC-USD": "BTC/USD",
- "ETH-USD": "ETH/USD",
- "SOL-USD": "SOL/USD",
- "BNB-USD": "BNB/USD",
- "XRP-USD": "XRP/USD",
- "ADA-USD": "ADA/USD",
- "DOGE-USD": "DOGE/USD",
- "AVAX-USD": "AVAX/USD",
- "DOT-USD": "DOT/USD",
- "LINK-USD": "LINK/USD",
- "MATIC-USD": "MATIC/USD",
- "LTC-USD": "LTC/USD",
- };
-
- if (cryptoMap[s]) return cryptoMap[s];
-
- // Default: assume it's a stock/ETF symbol (AAPL, SPY, BRK-B, ...)
- return s;
-}
-
-/**
- * Fetch current prices for one or more symbols.
- * Returns an object keyed by *original input symbols* (uppercased), with numeric prices.
- */
-export async function fetchCurrentPricesBySymbol(symbols) {
- const input = Array.isArray(symbols) ? symbols : [];
- const uniqueOriginal = Array.from(
- new Set(input.map((s) => String(s ?? "").trim()).filter(Boolean)),
- );
-
- if (uniqueOriginal.length === 0) return {};
-
- if (!API_KEY) {
- throw new Error(
- "Missing Twelve Data API key (set VITE_TWELVE_DATA_API_KEY in frontend/.env.local)",
- );
- }
-
- // Map original -> twelve
- const originalToTwelve = new Map();
- for (const orig of uniqueOriginal) {
- originalToTwelve.set(orig, toTwelveSymbol(orig));
- }
-
- const allTwelveSymbols = Array.from(
- new Set(Array.from(originalToTwelve.values()).filter(Boolean)),
- );
-
- const pairSymbols = allTwelveSymbols.filter((s) => String(s).includes("/"));
- const priceSymbols = allTwelveSymbols.filter((s) => !String(s).includes("/"));
-
- // Gather prices with cache + resilient fetch (batch first, fall back to per-symbol)
- const twelvePrices = {};
- const missing = [];
- let hadAnyError = false;
- let lastErrorMessage = "";
-
- for (const sym of allTwelveSymbols) {
- const cached = getCachedPrice(sym);
- if (typeof cached === "number") {
- twelvePrices[sym] = cached;
- } else {
- missing.push(sym);
- }
- }
-
- // Fetch pair symbols via exchange_rate (generally the most reliable for FX/crypto pairs)
- for (const sym of pairSymbols) {
- if (twelvePrices[sym] !== undefined) continue;
- try {
- const n = await fetchSingleExchangeRate(sym);
- if (Number.isFinite(n)) twelvePrices[sym] = n;
- } catch (e) {
- hadAnyError = true;
- lastErrorMessage = e?.message || lastErrorMessage;
- }
- }
-
- // Chunk batch requests to avoid overly long URLs; if a batch fails, we continue
- // with per-symbol fetches so one invalid symbol doesn't break everything.
- const missingPrices = missing.filter((s) => priceSymbols.includes(s));
-
- for (let i = 0; i < missingPrices.length; i += MAX_SYMBOLS_PER_REQUEST) {
- const chunk = missingPrices.slice(i, i + MAX_SYMBOLS_PER_REQUEST);
- try {
- const got = await fetchBatchPrices(chunk);
- for (const [sym, price] of Object.entries(got)) {
- const n = Number(price);
- if (Number.isFinite(n)) {
- twelvePrices[sym] = n;
- setCachedPrice(sym, n);
- }
- }
-
- // Some symbols might not come back in a multi-symbol response; fetch them individually.
- for (const sym of chunk) {
- if (twelvePrices[sym] !== undefined) continue;
- try {
- const n = await fetchSinglePrice(sym);
- if (Number.isFinite(n)) twelvePrices[sym] = n;
- } catch (e) {
- // ignore single-symbol failures
- hadAnyError = true;
- lastErrorMessage = e?.message || lastErrorMessage;
- }
- }
- } catch (e) {
- // Fall back to per-symbol if the whole batch failed.
- hadAnyError = true;
- lastErrorMessage = e?.message || lastErrorMessage;
- await Promise.all(
- chunk.map(async (sym) => {
- try {
- const n = await fetchSinglePrice(sym);
- if (Number.isFinite(n)) twelvePrices[sym] = n;
- } catch (e2) {
- // ignore
- hadAnyError = true;
- lastErrorMessage = e2?.message || lastErrorMessage;
- }
- }),
- );
- }
- }
-
- // Convert back to original symbols
- const out = {};
- for (const [orig, twelve] of originalToTwelve.entries()) {
- const p = twelvePrices[twelve];
- if (typeof p === "number") {
- out[String(orig).toUpperCase()] = p;
- }
- }
-
- if (Object.keys(out).length === 0 && hadAnyError) {
- throw new Error(lastErrorMessage || "Could not fetch any current prices");
- }
-
- return out;
-}
Index: frontend/src/api/yahooFinance.js
===================================================================
--- frontend/src/api/yahooFinance.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,148 +1,0 @@
-import { LOCAL_TICKER_SYMBOLS } from "../data/tickers";
-
-const tickerSearchCache = new Map();
-const TICKER_CACHE_TTL_MS = 15 * 60 * 1000;
-
-const quoteCache = new Map();
-const QUOTE_CACHE_TTL_MS = 5 * 60 * 1000;
-let quoteBackoffUntilMs = 0;
-
-async function tryFetchJson(url) {
- // Note: We intentionally do NOT set custom headers here.
- // Custom headers usually trigger a CORS preflight which Yahoo won't allow.
- const resp = await fetch(url, { method: "GET" });
- if (!resp.ok) {
- throw new Error(`Yahoo Finance HTTP ${resp.status}`);
- }
- return resp.json();
-}
-
-function toTickerOption(raw) {
- const symbol = raw?.symbol ? String(raw.symbol) : "";
- if (!symbol) return null;
-
- const name = raw?.shortname || raw?.longname || raw?.name || "";
- const exchange = raw?.exchDisp || raw?.exchange || "";
-
- return {
- symbol,
- name: name ? String(name) : "",
- exchange: exchange ? String(exchange) : "",
- quoteType: raw?.quoteType ? String(raw.quoteType) : "",
- };
-}
-
-/**
- * Direct Yahoo Finance search (yfinance data source).
- * Falls back to backend proxy if the browser blocks CORS.
- */
-export async function searchTickers(query, limit = 20) {
- const q = String(query ?? "").trim();
- if (!q) return [];
- const safeLimit = Math.max(1, Math.min(Number(limit) || 20, 25));
-
- const cacheKey = `${q.toUpperCase()}:${safeLimit}`;
- const cached = tickerSearchCache.get(cacheKey);
- const now = Date.now();
- if (cached && cached.expiresAt > now) {
- return cached.value;
- }
-
- // Offline/local ticker search: avoids Yahoo 429s and keeps the dropdown reliable.
- const upperQ = q.toUpperCase();
- const symbols = Array.isArray(LOCAL_TICKER_SYMBOLS) ? LOCAL_TICKER_SYMBOLS : [];
- const out = symbols
- .map((s) => String(s ?? "").trim())
- .filter(Boolean)
- .filter((s) => s.toUpperCase().includes(upperQ))
- .slice(0, safeLimit)
- .map((symbol) => ({ symbol, name: "", exchange: "" }));
-
- tickerSearchCache.set(cacheKey, {
- value: out,
- expiresAt: now + TICKER_CACHE_TTL_MS,
- });
- return out;
-}
-
-/**
- * Direct Yahoo Finance quotes (yfinance data source).
- * Returns a map { SYMBOL: priceNumber }.
- * Falls back to backend proxy if the browser blocks CORS.
- */
-export async function getQuotesBySymbol(symbols) {
- const list = Array.isArray(symbols) ? symbols : [];
- const unique = Array.from(
- new Set(
- list
- .map((s) => String(s ?? "").trim())
- .filter(Boolean)
- .map((s) => s.toUpperCase()),
- ),
- );
-
- if (unique.length === 0) return {};
-
- const parseYahoo = (json) => {
- const results = Array.isArray(json?.quoteResponse?.result)
- ? json.quoteResponse.result
- : [];
- const map = {};
- for (const r of results) {
- const sym = r?.symbol ? String(r.symbol).toUpperCase() : "";
- const price = r?.regularMarketPrice;
- if (!sym) continue;
- if (typeof price !== "number") continue;
- map[sym] = price;
- }
- return map;
- };
-
- const now = Date.now();
- const out = {};
-
- // Serve cache first.
- const toFetch = [];
- for (const sym of unique) {
- const cached = quoteCache.get(sym);
- if (cached && cached.expiresAt > now && typeof cached.price === "number") {
- out[sym] = cached.price;
- } else {
- toFetch.push(sym);
- }
- }
-
- // Production builds: browser CORS blocks Yahoo, so quotes are unavailable without a proxy.
- if (!import.meta.env.DEV) {
- return out;
- }
-
- // Backoff after 429s.
- if (now < quoteBackoffUntilMs) {
- return out;
- }
-
- if (toFetch.length === 0) {
- return out;
- }
-
- const yahooUrl = `/yahoo/v7/finance/quote?symbols=${encodeURIComponent(
- toFetch.join(","),
- )}`;
-
- try {
- const json = await tryFetchJson(yahooUrl);
- const fresh = parseYahoo(json);
- for (const [sym, price] of Object.entries(fresh)) {
- quoteCache.set(sym, { price, expiresAt: Date.now() + QUOTE_CACHE_TTL_MS });
- out[sym] = price;
- }
- return out;
- } catch (e) {
- const msg = String(e?.message ?? "");
- if (msg.includes("HTTP 429")) {
- quoteBackoffUntilMs = Date.now() + 60_000;
- }
- return out;
- }
-}
Index: frontend/src/assets/graph-placeholder.svg
===================================================================
--- frontend/src/assets/graph-placeholder.svg (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,52 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Graph placeholder
-
-
Index: frontend/src/components/graphs/MultiPercentChangeAreaChart.jsx
===================================================================
--- frontend/src/components/graphs/MultiPercentChangeAreaChart.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,104 +1,0 @@
-import React, { Suspense, lazy, useMemo } from "react";
-
-import { formatBucketLabel } from "../../utils/timeSeries.js";
-
-// Lazy-load ApexCharts (same as PercentChangeAreaChart)
-const ApexChart = lazy(() => import("react-apexcharts"));
-
-/**
- * Multi-series % change area chart.
- *
- * seriesList: [{ name: string, points: [{ts, value}], color: string }]
- * granularity: daily | weekly | monthly | yearly
- */
-export default function MultiPercentChangeAreaChart({
- seriesList,
- granularity,
- height = 320,
-}) {
- const series = useMemo(() => {
- return (seriesList ?? []).map((s) => ({
- name: s.name,
- data: (s.points ?? []).map((p) => ({ x: p.ts, y: Number(p.value ?? 0) })),
- }));
- }, [seriesList]);
-
- const colors = useMemo(() => (seriesList ?? []).map((s) => s.color), [seriesList]);
-
- const options = useMemo(() => {
- return {
- chart: {
- type: "area",
- stacked: false,
- toolbar: { show: false },
- zoom: { enabled: false },
- animations: { enabled: true, easing: "easeinout", speed: 450 },
- fontFamily: "inherit",
- foreColor: "rgba(255,255,255,0.72)",
- },
- stroke: { curve: "smooth", width: 2 },
- fill: {
- type: "gradient",
- gradient: {
- shadeIntensity: 0.18,
- opacityFrom: 0.22,
- opacityTo: 0.03,
- stops: [0, 90, 100],
- },
- },
- dataLabels: { enabled: false },
- grid: {
- borderColor: "rgba(255,255,255,0.08)",
- strokeDashArray: 4,
- },
- legend: {
- show: false, // we render our own legend outside for better layout
- },
- xaxis: {
- type: "datetime",
- labels: {
- datetimeUTC: false,
- formatter: (value, timestamp) => formatBucketLabel(timestamp, granularity),
- },
- axisBorder: { color: "rgba(255,255,255,0.10)" },
- axisTicks: { color: "rgba(255,255,255,0.10)" },
- },
- yaxis: {
- labels: {
- formatter: (v) => `${Math.round(v)}%`,
- },
- },
- tooltip: {
- theme: "dark",
- y: {
- formatter: (v) => `${Number(v ?? 0).toFixed(1)}%`,
- },
- },
- colors,
- annotations: {
- yaxis: [
- {
- y: 0,
- borderColor: "rgba(255,255,255,0.25)",
- strokeDashArray: 4,
- },
- ],
- },
- };
- }, [colors, granularity]);
-
- return (
-
- }
- >
-
- {TIME_RANGES.map((r) => (
- onChange?.(r.key)}
- >
- {r.label}
-
- ))}
-
- );
-}
-
-
Index: frontend/src/data/tickers.js
===================================================================
--- frontend/src/data/tickers.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,173 +1,0 @@
-// A pragmatic, hardcoded list to keep ticker selection reliable.
-// Add/remove symbols as needed.
-// Symbols use Yahoo Finance format (e.g., BTC-USD, BRK-B).
-
-export const LOCAL_TICKER_SYMBOLS = [
- // Crypto (USD pairs)
- "BTC/USD",
- "ETH/USD",
- "SOL/USD",
- "BNB/USD",
- "XRP/USD",
- "ADA/USD",
- "DOGE/USD",
- "AVAX/USD",
- "DOT/USD",
- "LINK/USD",
- "MATIC/USD",
- "LTC/USD",
-
- // Major ETFs / indices proxies
- "SPY",
- "VOO",
- "IVV",
- "QQQ",
- "VTI",
- "IWM",
- "DIA",
- "VEA",
- "VWO",
- "EFA",
- "EEM",
- "SCHD",
- "VIG",
- "VNQ",
- "TLT",
- "IEF",
- "SHY",
- "HYG",
- "LQD",
- "GLD",
- "SLV",
- "USO",
-
- // Mega-cap / large-cap US
- "AAPL",
- "MSFT",
- "NVDA",
- "AMZN",
- "GOOGL",
- "GOOG",
- "META",
- "TSLA",
- "BRK-B",
- "JPM",
- "V",
- "MA",
- "LLY",
- "AVGO",
- "UNH",
- "XOM",
- "COST",
- "HD",
- "PG",
- "JNJ",
- "ORCL",
- "KO",
- "PEP",
- "BAC",
- "WMT",
- "ABBV",
- "MRK",
- "CVX",
- "CRM",
- "ADBE",
- "NFLX",
- "AMD",
- "INTC",
- "CSCO",
- "QCOM",
- "TXN",
- "IBM",
- "INTU",
- "AMAT",
- "NOW",
- "ISRG",
- "GE",
- "CAT",
- "BA",
- "DE",
- "MMM",
- "HON",
- "LOW",
- "SBUX",
- "NKE",
- "MCD",
- "DIS",
- "CMCSA",
- "T",
- "VZ",
- "PFE",
- "TMO",
- "ABT",
- "DHR",
- "LIN",
- "NEE",
- "DUK",
- "SO",
- "PLD",
- "AMT",
- "CCI",
-
- // Popular growth / tech
- "SHOP",
- "SNOW",
- "PLTR",
- "UBER",
- "ABNB",
- "RBLX",
- "SQ",
- "PYPL",
- "ROKU",
- "ZM",
- "DOCU",
- "CRWD",
- "PANW",
- "ZS",
- "NET",
- "DDOG",
- "MDB",
-
- // Finance
- "GS",
- "MS",
- "C",
- "WFC",
- "AXP",
- "BLK",
-
- // Energy
- "COP",
- "SLB",
- "OXY",
-
- // Consumer / retail
- "TGT",
- "TJX",
- "C",
- "CROX",
- "LULU",
- "COST",
- "WMT",
- "AMZN",
-
- // Autos
- "F",
- "GM",
-
- // Semis
- "ASML",
- "TSM",
- "MU",
- "LRCX",
- "KLAC",
-
- // Misc
- "SPOT",
- "BABA",
- "JD",
- "PDD",
- "NVO",
- "TM",
- "SONY",
-];
Index: frontend/src/index.css
===================================================================
--- frontend/src/index.css (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ frontend/src/index.css (revision 72053b5fc3ff291757af1cdd64e8fdfcb9e9b17d)
@@ -1,8 +1,68 @@
-@source "../node_modules/@relume_io/relume-ui/dist/**/*.mjs";
-@source "../node_modules/@relume_io/relume-ui/dist/**/*.js";
+:root {
+ font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
+ line-height: 1.5;
+ font-weight: 400;
-@import "tailwindcss";
+ color-scheme: light dark;
+ color: rgba(255, 255, 255, 0.87);
+ background-color: #242424;
-@plugin "daisyui" {
- themes: forest --default;
+ font-synthesis: none;
+ text-rendering: optimizeLegibility;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
}
+
+a {
+ font-weight: 500;
+ color: #646cff;
+ text-decoration: inherit;
+}
+a:hover {
+ color: #535bf2;
+}
+
+body {
+ margin: 0;
+ display: flex;
+ place-items: center;
+ min-width: 320px;
+ min-height: 100vh;
+}
+
+h1 {
+ font-size: 3.2em;
+ line-height: 1.1;
+}
+
+button {
+ border-radius: 8px;
+ border: 1px solid transparent;
+ padding: 0.6em 1.2em;
+ font-size: 1em;
+ font-weight: 500;
+ font-family: inherit;
+ background-color: #1a1a1a;
+ cursor: pointer;
+ transition: border-color 0.25s;
+}
+button:hover {
+ border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+ outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+ :root {
+ color: #213547;
+ background-color: #ffffff;
+ }
+ a:hover {
+ color: #747bff;
+ }
+ button {
+ background-color: #f9f9f9;
+ }
+}
Index: frontend/src/main.jsx
===================================================================
--- frontend/src/main.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ frontend/src/main.jsx (revision 72053b5fc3ff291757af1cdd64e8fdfcb9e9b17d)
@@ -1,14 +1,10 @@
-import { StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-import { BrowserRouter } from "react-router-dom";
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import './index.css'
+import App from './App.jsx'
-import "./index.css";
-import App from "./App.jsx";
-
-createRoot(document.getElementById("root")).render(
+createRoot(document.getElementById('root')).render(
-
-
+ ,
-);
+)
Index: frontend/src/pages/Dashboard.jsx
===================================================================
--- frontend/src/pages/Dashboard.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,61 +1,0 @@
-import React, { useMemo } from "react";
-import { Link, useNavigate } from "react-router-dom";
-
-const Dashboard = () => {
- const navigate = useNavigate();
-
- const user = useMemo(() => {
- try {
- const raw = localStorage.getItem("authUser");
- return raw ? JSON.parse(raw) : null;
- } catch {
- return null;
- }
- }, []);
-
- const onLogout = () => {
- localStorage.removeItem("authToken");
- localStorage.removeItem("authUser");
- navigate("/", { replace: true });
- };
-
- return (
-
-
-
-
Dashboard
-
-
- Logout
-
-
-
-
-
-
-
Account
-
-
- Username: {" "}
- {user?.username ?? "—"}
-
-
- Email: {" "}
- {user?.email ?? "—"}
-
-
- User ID: {" "}
- {user?.userId ?? "—"}
-
-
-
-
-
-
- {/* App shell background */}
-
-
-
-
-
- );
-};
-
-export default DashboardLayout;
Index: frontend/src/pages/Dashboard/components/AddCustomCategoryModal.jsx
===================================================================
--- frontend/src/pages/Dashboard/components/AddCustomCategoryModal.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,101 +1,0 @@
-import React, { useEffect, useMemo, useState } from "react";
-import { createPortal } from "react-dom";
-
-export default function AddCustomCategoryModal({ open, onClose, onSubmit }) {
- const [name, setName] = useState("");
- const [submitting, setSubmitting] = useState(false);
- const [error, setError] = useState(null);
-
- // Reset the form whenever the modal is opened.
- // NOTE: Hooks must be called in the same order on every render; do not early-return before hooks.
- useEffect(() => {
- if (!open) return;
- setName("");
- setError(null);
- setSubmitting(false);
- }, [open]);
-
- const canSubmit = useMemo(() => {
- return name.trim().length > 0 && name.trim().length <= 100 && !submitting;
- }, [name, submitting]);
-
- async function handleSubmit(e) {
- e.preventDefault();
- if (!canSubmit) return;
-
- setSubmitting(true);
- setError(null);
- try {
- await onSubmit({ name: name.trim() });
- onClose?.();
- } catch (err) {
- setError(
- err?.response?.data?.message ||
- err?.message ||
- "Failed to create custom category"
- );
- setSubmitting(false);
- }
- }
-
- if (!open) return null;
-
- return createPortal(
-
-
-
-
-
-
Add Custom Category
-
- Close
-
-
-
-
-
-
-
-
-
-
-
-
-
- {navItems.map((item) => (
-
- {(() => {
- const isActive =
- location.pathname === item.to ||
- location.pathname.startsWith(`${item.to}/`);
-
- return (
-
-
-
- {item.title}
-
-
-
- );
- })()}
-
- ))}
-
- {customNavItems.length > 0 ? (
-
- ) : null}
-
- {customNavItems.map((item) => (
-
- {(() => {
- const isActive =
- location.pathname === item.to ||
- location.pathname.startsWith(`${item.to}/`);
-
- return (
-
-
-
- {item.title}
-
-
-
- );
- })()}
-
- ))}
-
-
-
- setCustomOpen(true)}
- >
- Add Custom
-
-
-
- setCustomOpen(false)}
- onSubmit={async (payload) => {
- const created = await createCustomTrackingCategory(payload);
- setCustomCategories((prev) => [created, ...(prev ?? [])]);
- }}
- />
-
-
- );
-};
-
-export default DashboardSidebar;
Index: frontend/src/pages/Dashboard/components/DashboardTopbar.jsx
===================================================================
--- frontend/src/pages/Dashboard/components/DashboardTopbar.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,59 +1,0 @@
-import React from "react";
-import { Link } from "react-router-dom";
-
-import { MdLogout } from "react-icons/md";
-
-import logo from "../../../assets/logo.png";
-
-const DashboardTopbar = ({ username, onLogout }) => {
- return (
- <>
- {/* Desktop */}
-
-
-
-
-
- {username || "—"}
-
-
-
-
-
-
-
-
-
-
-
- {username || "—"}
-
-
-
-
-
-
- Show all
-
-
- Hide all
-
-
-
-
- {items.map((it) => {
- const enabled = enabledKeys?.has(it.key);
- return (
- onToggle?.(it.key)}
- className={
- "flex items-center gap-2 rounded-full border px-2.5 py-1 transition " +
- (enabled
- ? "border-base-300 bg-base-100 hover:bg-base-100/70"
- : "border-transparent bg-base-300/30 opacity-60 hover:opacity-80")
- }
- title={enabled ? "Click to hide" : "Click to show"}
- >
- {it.label}
-
- );
- })}
-
-
-
Control Center
-
- {error}
-
-
-
Control Center
-
-
-
- Start tracking at least one area (Weight / Training / Finance / Discipline / Investing) to see your dashboard.
-
-
-
-
-
-
-
Control Center
-
- Correlate your progress across everything you track.
-
-
-
-
-
-
-
-
-
-
Correlation
-
- Toggle lines to isolate signals. All metrics are % change per {range} bucket.
-
-
-
-
-
-
- {filteredCombinedSeriesList.length === 0 ? (
-
- Toggle at least one line in the legend to display the chart.
-
- ) : filteredCombinedSeriesList.every((s) => (s.points?.length ?? 0) < 2) ? (
-
- Add more history to see correlations.
-
- ) : (
-
- )}
-
-
-
- Each line uses the same time bucket toggle, but has its own base metric (calories, income totals, completion average, etc.).
-
-
-
-
-
- {tracking.training ? (
-
-
-
Training
-
- % change
-
-
-
-
- ) : null}
-
- {tracking.weight ? (
-
-
-
Weight
-
- % change
-
-
-
-
- ) : null}
-
- {tracking.finance ? (
-
-
-
Finance
-
- % change
-
-
-
-
- ) : null}
-
- {tracking.discipline ? (
-
-
-
Discipline
-
- % change
-
-
-
-
- ) : null}
-
- {tracking.investing ? (
-
-
-
Investing
-
- % change
-
-
-
-
- ) : null}
-
-
-
-
-
{categoryName}
-
- Drag tickets between columns or use the edit form to update status.
-
-
-
-
- {error ? (
-
- {error}
-
- ) : null}
-
-
-
-
-
-
- Not started: {(notStarted ?? []).length}
-
-
- In progress: {(inProgress ?? []).length}
-
-
- Finished: {(finished ?? []).length}
-
- / {total} total
-
-
-
-
- Sort:
- setSortBy(e.target.value)}
- className="bg-transparent text-xs text-white/80 outline-none cursor-pointer"
- >
- Default
- Due date
- Priority
-
-
-
-
{ setEditingTask(null); setModalOpen(true); }}
- className="flex items-center gap-1.5 rounded-lg bg-green-400 px-3 py-1.5 text-sm font-medium text-black hover:bg-green-300"
- >
-
-
-
-
-
-
- {LANES.map((lane) => {
- const tasks = tasksByLane[lane.id] ?? [];
- return (
-
- String(t.taskId))}
- strategy={rectSortingStrategy}
- >
-
- {loading ? (
-
Loading...
- ) : tasks.length === 0 ? (
-
No tickets.
- ) : (
- tasks.map((t) => (
-
{ setEditingTask(t); setModalOpen(true); }}
- onDelete={() => onDeleteTask(t.taskId)}
- />
- ))
- )}
-
-
- );
- })}
-
-
-
{ setModalOpen(false); setEditingTask(null); }}
- onSubmit={handleModalSubmit}
- task={editingTask}
- isLoading={modalLoading}
- />
-
-
-
-
-
{title}
-
-
- {count}
-
-
-
-
-
- {children}
-
-
-
- {/* Header */}
-
-
- {isEditing ? "Edit Task" : "Create New Task"}
-
-
-
-
-
- {/* Form */}
-
-
-
- {/* Header row */}
-
-
-
- {task.name}
-
-
- {task.description ? (
-
{task.description}
- ) : null}
-
-
-
-
-
-
-
-
-
-
-
-
- {/* Footer row: priority + due date */}
-
- #{task.taskId}
-
- {task.priority ? (
-
- {task.priority.charAt(0) + task.priority.slice(1).toLowerCase()}
-
- ) : null}
-
- {task.dueDate ? (
-
-
- ) : null}
-
-
-
-
Discipline
-
- {isTodayClosed ? "Day closed" : isComputing ? "Computing…" : "Close day"}
-
-
-
- {completionInfo ? (
-
-
-
Daily completion saved
-
- Date: {completionInfo.date} — Completion: {completionInfo.procent}%
-
-
-
- ) : null}
-
- {isLoading ? (
-
- ) : (
- <>
-
-
- {error ?
{error}
: null}
-
- {hasMore ? (
-
- {isLoadingMore ? "Loading…" : "Load more"}
-
- ) : null}
-
-
-
-
-
-
Daily completion
-
- Previous days completion percentages.
-
-
- {completionError ? (
-
{completionError}
- ) : null}
-
-
-
-
-
- Date
- Completion
-
-
-
- {isLoadingCompletions ? (
-
-
- Loading…
-
-
- ) : (dailyCompletions ?? []).length === 0 ? (
-
-
- No daily completion records yet. Click “Close day” to
- save today.
-
-
- ) : (
- (dailyCompletions ?? []).map((dc) => (
-
- {dc.date ?? "—"}
-
- {dc.procent ?? 0}%
-
-
- ))
- )}
-
-
-
-
-
- {completionHasMore ? (
-
- {isLoadingMoreCompletions ? "Loading…" : "Load more"}
-
- ) : null}
-
-
-
-
- )}
-
-
-
-
Progress
-
-
- {latestPct >= 0 ? "+" : ""}
- {latestPct.toFixed(1)}% (last)
-
-
-
-
-
- {points.length < 2 ? (
-
- Add at least 2 daily completion records to see % change.
-
- ) : (
-
- )}
-
-
-
- Showing percentage change in average completion % per {range} bucket. Latest bucket avg: {Math.round(latestBase)}%.
-
-
-
-
-
Discipline
-
- Start tracking your daily discipline tasks. You can add, edit, and mark
- tasks as completed.
-
- {error ?
{error}
: null}
-
-
- {isSubmitting ? "Starting…" : "Start tracking"}
-
-
-
-
-
-
-
-
Daily tasks
-
- Check a task to mark it finished. Changes are saved immediately.
-
-
-
-
-
-
-
- {(tasks ?? []).length === 0 ? (
-
No tasks yet.
- ) : (
- (tasks ?? []).map((t) => {
- const isWorking = workingSet.has(t.taskId);
- const isEditing = editTaskId === t.taskId;
-
- return (
-
-
-
-
- {isEditing ? (
- <>
-
- Save
-
-
- Cancel
-
-
- ) : (
- <>
- beginEdit(t)}
- >
- Edit
-
- onDelete(t.taskId)}
- >
- Delete
-
-
- )}
-
-
- );
- })
- )}
-
-
-
-
- {step === "cta" ? (
-
-
-
-
Finance
-
-
- {isEditing ? (
-
- ) : (
-
- )}
-
-
-
-
navigate("/dashboard/finance/incomes/new")}
- />
-
-
-
Finance
- navigate(-1)}>
- Back
-
-
-
-
navigate("/dashboard/finance/tracking")}
- error={error}
- isSubmitting={isSubmitting}
- />
-
-
-
-
Incomes
-
- Add income
-
-
-
- {error ?
{error}
: null}
-
-
-
-
-
- Date
- Amount
-
-
-
- {isLoading ? (
-
-
- Loading…
-
-
- ) : (incomes ?? []).length === 0 ? (
-
-
- No incomes yet.
-
-
- ) : (
- (incomes ?? []).map((i) => (
-
- {formatDate(i.date)}
- {Number(i.amount).toFixed?.(2) ?? i.amount}
-
- ))
- )}
-
-
-
-
-
- {hasMore ? (
-
- {isLoadingMore ? "Loading…" : "Load more"}
-
- ) : null}
-
-
-
- {(segments ?? []).map((s) => (
-
-
- {s.label}
-
-
{Number(s.value) || 0}%
-
- ))}
-
-
- );
-}
-
Index: frontend/src/pages/Dashboard/pages/Finance/components/FinanceProgressCard.jsx
===================================================================
--- frontend/src/pages/Dashboard/pages/Finance/components/FinanceProgressCard.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,60 +1,0 @@
-import React, { useMemo, useState } from "react";
-
-import TimeRangeToggle from "../../../../../components/graphs/TimeRangeToggle.jsx";
-import PercentChangeAreaChart from "../../../../../components/graphs/PercentChangeAreaChart.jsx";
-import { percentChangeSeries, sumByTimeBucket } from "../../../../../utils/timeSeries.js";
-
-export default function FinanceProgressCard({ incomes }) {
- const [range, setRange] = useState("weekly");
-
- const points = useMemo(() => {
- const buckets = sumByTimeBucket(
- incomes,
- range,
- (i) => i.date,
- (i) => i.amount,
- );
- return percentChangeSeries(buckets);
- }, [incomes, range]);
-
- const latest = points?.length ? points[points.length - 1] : null;
- const latestPct = latest ? Number(latest.value ?? 0) : 0;
- const latestBase = latest ? Number(latest.base ?? 0) : 0;
-
- return (
-
-
-
-
Progress
-
-
- {latestPct >= 0 ? "+" : ""}
- {latestPct.toFixed(1)}% (last)
-
-
-
-
-
- {points.length < 2 ? (
-
- Add at least 2 incomes to see % change.
-
- ) : (
-
- )}
-
-
-
- Showing percentage change in income totals per {range} bucket. Latest bucket total: {Math.round(latestBase)}.
-
-
-
-
-
Finance
-
- Start tracking your finances by setting your yearly budget distribution
- percentages.
-
- {error ?
{error}
: null}
-
-
- Start tracking
-
-
-
-
-
-
-
Set your budget distribution
-
- Enter 5 percentages that sum to 100. You can fine-tune later.
-
-
-
-
-
-
-
-
-
-
Budget distribution
-
- Your current percentages (stored in your finance profile).
-
-
-
-
-
- Edit
-
-
-
-
-
-
-
Total money earned this month
-
- {formatMoney(totalThisMonth)}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {segments.map((s) => {
- const pct = Number(s.value) || 0;
- const allocated = ((Number(totalThisMonth) || 0) * pct) / 100;
- return (
-
-
-
- {s.label} allocation
-
-
-
- {formatMoney(allocated)}
-
-
- );
- })}
-
-
-
-
-
-
navigate("/dashboard/investing/assets/new")}
- />
-
- Prices unavailable: {quotesError}
-
- ) : null}
-
- {pendingDelete ? (
-
-
-
Delete investment?
-
- This will permanently delete{" "}
-
- {pendingDelete.tickerSymbol || "this asset"}
-
- .
-
-
-
- setPendingDelete(null)}
- disabled={isDeletingId === pendingDelete.assetId}
- >
- Cancel
-
- doDelete(pendingDelete.assetId)}
- disabled={isDeletingId === pendingDelete.assetId}
- >
- {isDeletingId === pendingDelete.assetId
- ? "Deleting…"
- : "Delete"}
-
-
-
-
{
- if (isDeletingId === pendingDelete.assetId) return;
- setPendingDelete(null);
- }}
- />
- navigate("/dashboard/investing/assets/new")}
- onRequestDelete={onRequestDelete}
- isDeletingId={isDeletingId}
- />
-
-
-
-
Add new investment
-
- Add an asset you bought. (We’ll build performance tracking next.)
-
-
- {error ? (
-
- {error}
-
- ) : null}
-
-
-
-
-
-
-
-
Assets
-
- Showing {pageSize} per page
-
-
-
- {error ? (
-
- {error}
-
- ) : null}
-
-
-
-
Total invested
-
- {totals.hasInvested ? formatMoney(totals.totalInvested) : "—"}
-
-
- Cost basis (buy price × quantity)
-
-
-
-
-
Current value
-
- {totals.hasCurrent && !isQuotesLoading
- ? formatMoney(totals.totalCurrent)
- : isQuotesLoading
- ? "Loading…"
- : "—"}
-
-
Live price × quantity
-
-
-
-
Total ROI
-
- {typeof totals.roiPct === "number" &&
- !Number.isNaN(totals.roiPct) ? (
- 0
- ? "text-green-400 font-semibold"
- : totals.roiPct < 0
- ? "text-red-400 font-semibold"
- : "opacity-80"
- }
- >
- {totals.roiPct > 0 ? "+" : ""}
- {totals.roiPct.toFixed(2)}%
-
- ) : isQuotesLoading ? (
- "Loading…"
- ) : (
- "—"
- )}
-
-
- (current − invested) ÷ invested
-
-
-
-
-
-
-
-
- {columns.map((c) => (
- {c.label}
- ))}
-
-
-
- {isLoading ? (
-
-
- Loading…
-
-
- ) : assets.length === 0 ? (
-
-
-
-
No investments yet.
-
- Add your first investment
-
-
-
- ) : (
- assets.map((a) => (
-
- {a.tickerSymbol ?? "—"}
- {a.quantity ?? "—"}
- {formatMoney(a.buyPrice)}
- {formatDate(a.buyDate)}
-
- {isQuotesLoading
- ? "Loading…"
- : formatMoney(
- quotesBySymbol?.[
- String(a.tickerSymbol ?? "").toUpperCase()
- ],
- )}
-
-
- {(() => {
- const symbol = String(
- a.tickerSymbol ?? "",
- ).toUpperCase();
- const current = Number(quotesBySymbol?.[symbol]);
- const buy = Number(a.buyPrice);
- if (!symbol || Number.isNaN(current)) return "—";
- if (Number.isNaN(buy) || buy <= 0) return "—";
- const roiPct = ((current - buy) / buy) * 100;
- const cls =
- roiPct > 0
- ? "text-green-400 font-semibold"
- : roiPct < 0
- ? "text-red-400 font-semibold"
- : "opacity-80";
- const sign = roiPct > 0 ? "+" : "";
- return (
-
- {sign}
- {roiPct.toFixed(2)}%
-
- );
- })()}
-
-
- {
- if (onRequestDelete) {
- onRequestDelete(a);
- return;
- }
- onDelete?.(a.assetId);
- }}
- disabled={isDeletingId === a.assetId}
- >
-
-
-
- ))
- )}
-
-
-
-
-
- {!isLoading && assets.length === 0 ? null : hasMore ? (
-
- {isLoadingMore ? "Loading…" : "Load more"}
-
- ) : (
- No more assets.
- )}
-
-
-
-
-
-
Portfolio Value
-
-
-
- ${totalCurrentPortfolioValue.toFixed(2)}
-
- = 0 ? "text-success" : "text-error"
- }`}
- >
- {latestPct >= 0 ? "+" : ""}
- {latestPct.toFixed(2)}%
-
-
-
-
-
-
-
- {points.length < 1 ? (
-
- Add investments to see portfolio growth.
-
- ) : (
-
- )}
-
-
-
-
-
Invested
-
${totalInvestedAmount.toFixed(2)}
-
-
-
Current Value
-
${totalCurrentPortfolioValue.toFixed(2)}
-
-
-
Gain/Loss
-
= totalInvestedAmount
- ? "text-success"
- : "text-error"
- }`}
- >
- ${(totalCurrentPortfolioValue - totalInvestedAmount).toFixed(2)}
-
-
-
-
-
-
-
Investing
-
- You’re not tracking investments yet. Start tracking to log your assets
- and visualize your progress.
-
-
- {error ? (
-
- {error}
-
- ) : null}
-
-
-
- {isSubmitting ? "Starting…" : "Start Tracking Investments"}
-
-
-
-
-
-
Investing
-
Track your assets over time.
-
-
- + Add new investment
-
-
-
- {step === "cta" ? (
-
-
- navigate("/dashboard/training/sessions/new")}
- />
-
- );
-}
Index: frontend/src/pages/Dashboard/pages/Training/components/CaloriesEstimate.jsx
===================================================================
--- frontend/src/pages/Dashboard/pages/Training/components/CaloriesEstimate.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,21 +1,0 @@
-import React from "react";
-
-const CaloriesEstimate = ({ estimatedCalories, profileWeightKg }) => {
- return (
-
- {estimatedCalories === null ? (
-
- Estimated calories: —
- {profileWeightKg === null ? " (missing profile weight)" : ""}
-
- ) : (
-
- Estimated calories:{" "}
- {estimatedCalories} kcal
-
- )}
-
-
-
- {title ?
{title} : null}
- {message ?
{message}
: null}
- {children}
-
-
-
-
-
-
Progress
-
-
- {latestPct >= 0 ? "+" : ""}
- {latestPct.toFixed(1)}% (last)
-
-
-
-
-
- {points.length < 2 ? (
-
- Add at least 2 sessions to see % change.
-
- ) : (
-
- )}
-
-
-
- Showing percentage change in calories burned per {range} bucket. Latest bucket total: {Math.round(latestBase)}.
-
-
-
-
-
-
Recent sessions
- Showing up to {pageSize}
-
-
- {error ?
{error}
: null}
-
-
-
-
-
- {columns.map((c) => (
- {c.label}
- ))}
-
-
-
- {isLoading ? (
-
-
- Loading…
-
-
- ) : sessions.length === 0 ? (
-
-
- No sessions yet.
-
-
- ) : (
- sessions.map((s) => (
-
- {formatDate(s.date)}
- {titleCase(s.type)}
- {s.duration ?? "—"}
- {s.calories ?? "—"}
-
- ))
- )}
-
-
-
-
-
-
- {isLoadingMore ? "Loading…" : hasMore ? "Load more" : "No more"}
-
-
-
-
-
-
You are not tracking training
-
- Start tracking to log sessions, see trends, and build consistency.
-
-
- {error ?
{error}
: null}
-
-
- Start Tracking
-
-
-
-
-
Training
-
Your recent sessions and progress.
-
-
-
- + Add new training session
-
-
- Workout type
-
-
- Select…
-
- {workoutTypes.map((t) => (
-
- {t.label ?? t.type}
-
- ))}
-
-
- );
-};
-
-export default WorkoutTypeSelect;
Index: frontend/src/pages/Dashboard/pages/Weight/NewWeightIntake.jsx
===================================================================
--- frontend/src/pages/Dashboard/pages/Weight/NewWeightIntake.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,166 +1,0 @@
-import React, { useEffect, useMemo, useState } from "react";
-import { useNavigate } from "react-router-dom";
-
-import api from "../../../../api/axios";
-
-export default function NewWeightIntake() {
- const navigate = useNavigate();
- const [goalCalories, setGoalCalories] = useState(null);
- const [todayTrainingInfo, setTodayTrainingInfo] = useState(null);
- const [isLoading, setIsLoading] = useState(true);
- const [calories, setCalories] = useState("");
- const [error, setError] = useState("");
- const [isSubmitting, setIsSubmitting] = useState(false);
-
- const todayLabel = useMemo(
- () =>
- new Date().toLocaleDateString(undefined, {
- year: "numeric",
- month: "short",
- day: "2-digit",
- }),
- [],
- );
-
- const adjustedGoalCalories = useMemo(() => {
- if (!goalCalories || !todayTrainingInfo) return null;
- const goal = Number(goalCalories);
- const burned = Number(todayTrainingInfo.totalBurnedCalories) || 0;
- if (!Number.isFinite(goal)) return null;
- return goal + burned;
- }, [goalCalories, todayTrainingInfo]);
-
- useEffect(() => {
- let cancelled = false;
- (async () => {
- try {
- setIsLoading(true);
- setError("");
- const [statusRes, profileRes, trainingRes] = await Promise.all([
- api.get("/weight/status"),
- api.get("/weight/profile"),
- api.get("/weight/today-training"),
- ]);
- if (cancelled) return;
- if (!statusRes?.data?.tracking) {
- navigate("/dashboard/weight", { replace: true });
- return;
- }
- setGoalCalories(profileRes?.data?.goalCalories ?? null);
- setTodayTrainingInfo(trainingRes?.data ?? null);
- } catch (err) {
- if (cancelled) return;
- const message = err?.response?.data?.message || "Failed to load weight profile.";
- if (String(message).toLowerCase().includes("not enabled")) {
- navigate("/dashboard/weight", { replace: true });
- return;
- }
- setError(message);
- } finally {
- if (!cancelled) setIsLoading(false);
- }
- })();
- return () => {
- cancelled = true;
- };
- }, [navigate]);
-
- const onSubmit = async (e) => {
- e.preventDefault();
- setError("");
-
- const caloriesNum = calories === "" ? NaN : Number(calories);
- if (!Number.isFinite(caloriesNum) || caloriesNum < 0) {
- setError("Calories must be 0 or greater.");
- return;
- }
-
- try {
- setIsSubmitting(true);
- await api.post("/weight/intakes", {
- calories: caloriesNum,
- });
- navigate("/dashboard/weight/tracking", { replace: true });
- } catch (err) {
- setError(err?.response?.data?.message || "Failed to add today's intake.");
- } finally {
- setIsSubmitting(false);
- }
- };
-
- return (
-
-
-
-
-
Add today's intake
-
- Log the calories you consumed today. Only one intake can be stored per day.
-
-
-
Today: {todayLabel}
-
- Goal calories: {goalCalories === null ? "—" : `${goalCalories} kcal`}
-
- {todayTrainingInfo?.trainedToday && (
- <>
-
- Burned during training: {todayTrainingInfo.totalBurnedCalories} kcal
-
-
- Adjusted goal for today: {adjustedGoalCalories === null ? "—" : `${adjustedGoalCalories} kcal`}
-
-
- )}
-
- {error ? (
-
- {error}
-
- ) : null}
-
- {isLoading ?
Loading…
: null}
-
-
-
-
-
-
-
- {step === "cta" ? (
-
-
Loading…
;
- }
-
- const onOpenEditProfile = () => {
- setEditForm({
- weight: String(profile?.weight ?? ""),
- height: String(profile?.height ?? ""),
- goalWeight: String(profile?.goalWeight ?? ""),
- goalCalories: String(profile?.goalCalories ?? ""),
- });
- setEditAutoCalculate(false);
- setEditError("");
- setIsEditingProfile(true);
- };
-
- const onCancelEdit = () => {
- setIsEditingProfile(false);
- setEditForm({ weight: "", height: "", goalWeight: "", goalCalories: "" });
- setEditError("");
- };
-
- const onSubmitEdit = async (e) => {
- e.preventDefault();
- setEditError("");
- setIsSubmittingEdit(true);
- try {
- const res = await api.put("/weight/profile", {
- weight: editForm.weight === "" ? null : Number(editForm.weight),
- height: editForm.height === "" ? null : Number(editForm.height),
- goalWeight: editForm.goalWeight === "" ? null : Number(editForm.goalWeight),
- goalCalories: editForm.goalCalories === "" ? null : Number(editForm.goalCalories),
- autoCalculateTargets: editAutoCalculate,
- });
- setProfile(res.data);
- setIsEditingProfile(false);
- } catch (err) {
- setEditError(
- err?.response?.data?.message ||
- Object.values(err?.response?.data?.errors ?? {})[0] ||
- "Failed to update profile"
- );
- } finally {
- setIsSubmittingEdit(false);
- }
- };
-
- return (
-
-
-
- {isEditingProfile ? (
-
- ) : null}
-
-
navigate("/dashboard/weight/intakes/new")}
- isTodayLogged={hasTodayIntake}
- />
-
- Number(profile.weight)
- : null
- }
- />
-
- navigate("/dashboard/weight/intakes/new")}
- currentWeight={profile?.weight}
- goalWeight={profile?.goalWeight}
- />
-
-
-
-
Daily intakes
- Showing {pageSize} per page
-
-
- {error ? (
-
- {error}
-
- ) : null}
-
-
-
-
-
- {columns.map((c) => (
- {c.label}
- ))}
-
-
-
- {isLoading ? (
-
-
- Loading…
-
-
- ) : intakes.length === 0 ? (
-
-
-
-
No daily intakes yet.
-
- Add your first daily intake
-
-
-
- ) : (
- intakes.map((intake) => {
- const calories = Number(intake?.calories);
- const goal = Number(goalCalories);
- const burned = Number(intake?.burnedCalories) || 0;
- // If user trained that day, add burned calories to goal
- const adjustedGoal = intake?.trainedThatDay ? goal + burned : goal;
- const hasGoal = Number.isFinite(adjustedGoal);
- const delta = hasGoal && Number.isFinite(calories) ? calories - adjustedGoal : null;
- const deltaLabel =
- delta === null
- ? "—"
- : `${delta > 0 ? "+" : ""}${formatNumber(delta)} kcal`;
-
- // Determine color based on bulking vs cutting
- let deltaClass = "opacity-80";
- if (delta !== null) {
- if (isBulking === true) {
- // Bulking: eating MORE is good (green), eating LESS is bad (red)
- deltaClass = delta > 0 ? "text-green-400 font-semibold" : delta < 0 ? "text-red-400 font-semibold" : "opacity-80";
- } else if (isBulking === false) {
- // Cutting: eating LESS is good (green), eating MORE is bad (red)
- deltaClass = delta > 0 ? "text-red-400 font-semibold" : delta < 0 ? "text-green-400 font-semibold" : "opacity-80";
- }
- }
-
- return (
-
- {formatDate(intake.date)}
- {formatNumber(intake.calories)} kcal
- {deltaLabel}
-
- );
- })
- )}
-
-
-
-
-
-
-
- {isLoadingMore ? "Loading…" : hasMore ? "Load more" : "No more"}
-
-
-
-
-
-
-
Progress
-
-
- {latestPct >= 0 ? "+" : ""}
- {latestPct.toFixed(1)}% (last)
-
-
-
-
-
- {points.length < 2 ? (
-
- Add at least 2 daily intakes to see % change.
-
- ) : (
-
- )}
-
-
-
- Showing percentage change in goal-accuracy (closeness %) per {range} bucket.
- {isBulking === null ? (
- <> Trend is not adjusted (missing current/goal weight).
- ) : (
- <> Trend is adjusted for your goal ({isBulking ? "bulking" : "cutting"}).
- )}
- Latest bucket closeness: {Math.round(latestBase)}%.
-
-
-
-
-
You are not tracking weight
-
- Start tracking to save your weight profile, calculate your target pace,
- and keep daily calorie intake history.
-
-
- {error ?
{error}
: null}
-
-
- {isSubmitting ? "Starting…" : "Start Tracking Weight"}
-
-
-
-
-
-
-
Profile summary
-
- Your current target and calorie plan at a glance.
-
-
-
-
-
-
-
- {stats.map((stat) => (
-
-
{stat.label}
-
{statValue(stat.value, stat.suffix)}
- {stat.subtitle &&
{stat.subtitle}
}
-
- ))}
-
-
-
-
-
Weight
-
- Track your daily calorie intakes and keep an eye on your target.
-
-
-
- {isTodayLogged ? "Today's intake already logged" : "+ Add today's intake"}
-
-
-
- );
-};
-
-export default LandingPage;
Index: frontend/src/pages/LandingPage/components/Benefits.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/Benefits.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,83 +1,0 @@
-import React from "react";
-
-export const Benefits = () => {
- const benefits = [
- {
- number: "1",
- title: "Unified tracking",
- description:
- "Stop jumping between 5+ different apps. Everything you need is in one place.",
- },
- {
- number: "2",
- title: "Real-time insights",
- description:
- "See your progress at a glance with clear dashboards and intuitive charts.",
- },
- {
- number: "3",
- title: "Goal-focused",
- description:
- "Set targets, log consistently, and watch trends emerge over time.",
- },
- {
- number: "4",
- title: "Built for habit stacking",
- description:
- "Track related areas and discover how fitness, finances, and discipline connect.",
- },
- {
- number: "5",
- title: "Data security",
- description:
- "Your personal metrics are encrypted and private. Only you control access.",
- },
- {
- number: "6",
- title: "Mobile-friendly",
- description:
- "Fully responsive design works seamlessly on phone, tablet, and desktop.",
- },
- ];
-
- return (
-
-
-
-
- Why Trekr
-
-
- Designed for serious progress
-
-
- We built Trekr for people who don't settle for half measures. If
- consistency matters to you, Trekr makes it easier to stay on track.
-
-
-
-
- {benefits.map((benefit, index) => (
-
-
-
-
- {benefit.title}
-
-
- {benefit.description}
-
-
-
- ))}
-
-
- );
-};
-
-export default Benefits;
Index: frontend/src/pages/LandingPage/components/Faq.defaults.js
===================================================================
--- frontend/src/pages/LandingPage/components/Faq.defaults.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,40 +1,0 @@
-export const FaqDefaults = {
- heading: "Frequently asked questions",
- description:
- "Quick answers on how Trekr helps you track self-improvement across multiple areas — in one place.",
- questions: [
- {
- title: "What can I track in Trekr?",
- answer:
- "Workouts (type and duration), weight & nutrition (goal, calories), finances & budgeting (income and expenses), investing (portfolio and returns), and discipline (daily tasks you can check off).",
- },
- {
- title: "Do I need multiple apps to do all this?",
- answer:
- "No — Trekr is designed to unify the most important self-improvement categories so you can get a clear overview without switching between tools.",
- },
- {
- title: "How do goals and progress tracking work?",
- answer:
- "You set a goal (for example: target weight or monthly budget), then log daily/weekly data. Trekr helps you see where you are vs. the goal and how you're trending over time.",
- },
- {
- title: "Where is my data stored?",
- answer:
- "Your entries are stored in a database and linked to your user profile so you can track progress consistently over time.",
- },
- {
- title: "Is Trekr a mobile app?",
- answer:
- "Right now Trekr is a web app. The goal is a fast, simple experience on both mobile and desktop in the browser.",
- },
- ],
- footerHeading: "Still have questions?",
- footerDescription: "Send us a message and we’ll help you get started.",
- button: {
- title: "Contact",
- variant: "secondary",
- },
-};
-
-
Index: frontend/src/pages/LandingPage/components/Faq.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/Faq.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,63 +1,0 @@
-import {
- Button,
- Accordion,
- AccordionContent,
- AccordionItem,
- AccordionTrigger,
-} from "@relume_io/relume-ui";
-
-import { FaqDefaults } from "./Faq.defaults";
-
-export const Faq = (props) => {
- const {
- heading,
- description,
- questions,
- footerHeading,
- footerDescription,
- button,
- } = {
- ...FaqDefaults,
- ...props,
- };
- return (
-
-
-
-
- {heading}
-
-
- {description}
-
-
-
- {questions.map((question, index) => (
-
-
- {question.title}
-
-
- {question.answer}
-
-
- ))}
-
-
-
- {footerHeading}
-
-
- {footerDescription}
-
-
- {button.title}
-
-
-
- );
-};
Index: frontend/src/pages/LandingPage/components/Features.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/Features.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,83 +1,0 @@
-import React from "react";
-
-export const Features = () => {
- const features = [
- {
- icon: "🏋️",
- title: "Fitness tracking",
- description:
- "Log workouts, stay consistent, and see your training trend over time.",
- },
- {
- icon: "⚖️",
- title: "Weight & nutrition",
- description:
- "Track daily weigh-ins and calories so you always know what’s working.",
- },
- {
- icon: "💰",
- title: "Budgeting",
- description:
- "Record income and expenses to stay on top of your money without spreadsheets.",
- },
- {
- icon: "📈",
- title: "Investments",
- description:
- "Monitor assets and returns to keep a clear view of your portfolio.",
- },
- {
- icon: "✅",
- title: "Daily discipline",
- description:
- "Turn intentions into habits with simple daily tasks and check-ins.",
- },
- {
- icon: "📊",
- title: "Insights",
- description:
- "See patterns across categories so you can make better decisions faster.",
- },
- ];
-
- return (
-
-
-
-
- What you can track
-
-
- Everything in one dashboard
-
-
- Trekr brings your health, habits, and money together, so you don’t
- lose momentum switching tools.
-
-
-
-
- {features.map((feature, index) => (
-
-
-
{feature.icon}
-
- {feature.title}
-
-
{feature.description}
-
-
- ))}
-
-
- );
-};
-
-export default Features;
Index: frontend/src/pages/LandingPage/components/Footer.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/Footer.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,53 +1,0 @@
-import React from "react";
-import logo from "../../../assets/logo.png";
-
-const Footer = () => {
- return (
-
- );
-};
-
-export default Footer;
Index: frontend/src/pages/LandingPage/components/Hero.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/Hero.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,50 +1,0 @@
-import React, { useEffect, useState } from "react";
-import { Link } from "react-router-dom";
-
-const Hero = () => {
- const [isAuthed, setIsAuthed] = useState(() =>
- Boolean(localStorage.getItem("authToken")),
- );
-
- useEffect(() => {
- const onStorage = (e) => {
- if (e.key === "authToken") {
- setIsAuthed(Boolean(e.newValue));
- }
- };
- window.addEventListener("storage", onStorage);
- return () => window.removeEventListener("storage", onStorage);
- }, []);
-
- return (
-
-
-
-
-
- Trekr — track progress, every day
-
-
- One self-improvement hub: workouts, weight & nutrition, finances &
- budgeting, investing, and daily discipline tasks. Set goals, log
- consistently, and see your progress in one place.
-
-
- {isAuthed ? "Go to dashboard" : "Get started"}
-
-
-
-
-
-
-
-
{tagline}
-
- {heading}
-
-
- {description}
-
-
- {buttons.map((button, index) => (
-
- {button.title}
-
- ))}
-
-
-
-
-
-
-
- );
-};
-
-
Index: frontend/src/pages/LandingPage/components/NavbarLanding.jsx
===================================================================
--- frontend/src/pages/LandingPage/components/NavbarLanding.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,68 +1,0 @@
-import React, { useEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-import logo from "../../../assets/logo.png";
-
-const NavbarLanding = () => {
- const navigate = useNavigate();
- const [isAuthed, setIsAuthed] = useState(() =>
- Boolean(localStorage.getItem("authToken")),
- );
-
- useEffect(() => {
- const onStorage = (e) => {
- if (e.key === "authToken") {
- setIsAuthed(Boolean(e.newValue));
- }
- };
- window.addEventListener("storage", onStorage);
- return () => window.removeEventListener("storage", onStorage);
- }, []);
-
- const onLogout = () => {
- localStorage.removeItem("authToken");
- localStorage.removeItem("authUser");
- setIsAuthed(false);
- navigate("/", { replace: true });
- };
-
- return (
-
-
-
-
-
-
-
- {isAuthed ? (
-
-
- Logout
-
-
- ) : (
-
- Start Tracking
-
- )}
-
-
-
-
-
-
-
-
-
{tagline}
-
- {heading}
-
-
- {description}
-
-
- {buttons.map((button, index) => (
-
- {button.title}
-
- ))}
-
-
-
-
- );
-};
-
Index: frontend/src/pages/Login/Login.jsx
===================================================================
--- frontend/src/pages/Login/Login.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,99 +1,0 @@
-import React, { useEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-
-import api from "../../api/axios";
-
-const Login = () => {
- const navigate = useNavigate();
- const [usernameOrEmail, setUsernameOrEmail] = useState("");
- const [password, setPassword] = useState("");
- const [error, setError] = useState("");
- const [isSubmitting, setIsSubmitting] = useState(false);
-
- useEffect(() => {
- const token = localStorage.getItem("authToken");
- if (token) navigate("/dashboard", { replace: true });
- }, [navigate]);
-
- const onSubmit = async (e) => {
- e.preventDefault();
- setError("");
- setIsSubmitting(true);
- try {
- const res = await api.post("/auth/login", {
- usernameOrEmail,
- password,
- });
- localStorage.setItem("authToken", res.data.token);
- localStorage.setItem(
- "authUser",
- JSON.stringify({
- userId: res.data.userId,
- username: res.data.username,
- email: res.data.email,
- }),
- );
- navigate("/dashboard");
- } catch (err) {
- const message =
- err?.response?.data?.message ||
- err?.response?.data?.errors?.usernameOrEmail ||
- "Login failed";
- setError(message);
- } finally {
- setIsSubmitting(false);
- }
- };
-
- return (
-
- );
-};
-
-export default Login;
Index: frontend/src/pages/Register/Register.jsx
===================================================================
--- frontend/src/pages/Register/Register.jsx (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,134 +1,0 @@
-import React, { useEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
-
-import api from "../../api/axios";
-
-const Register = () => {
- const navigate = useNavigate();
- const [email, setEmail] = useState("");
- const [username, setUsername] = useState("");
- const [password, setPassword] = useState("");
- const [error, setError] = useState("");
- const [isSubmitting, setIsSubmitting] = useState(false);
-
- useEffect(() => {
- const token = localStorage.getItem("authToken");
- if (token) navigate("/dashboard", { replace: true });
- }, [navigate]);
-
- const onSubmit = async (e) => {
- e.preventDefault();
- setError("");
- setIsSubmitting(true);
-
- const normalizedEmail = email.trim().toLowerCase();
- const normalizedUsername = username.trim();
- const normalizedPassword = password;
-
- if (normalizedUsername.length < 3 || normalizedUsername.length > 50) {
- setError("Username must be between 3 and 50 characters");
- setIsSubmitting(false);
- return;
- }
-
- if (normalizedPassword.length < 6) {
- setError("Password must be at least 6 characters");
- setIsSubmitting(false);
- return;
- }
-
- try {
- const res = await api.post("/auth/register", {
- email: normalizedEmail,
- username: normalizedUsername,
- password: normalizedPassword,
- });
- localStorage.setItem("authToken", res.data.token);
- localStorage.setItem(
- "authUser",
- JSON.stringify({
- userId: res.data.userId,
- username: res.data.username,
- email: res.data.email,
- }),
- );
- navigate("/dashboard");
- } catch (err) {
- const fieldErrors = err?.response?.data?.errors ?? {};
- const firstFieldError = Object.values(fieldErrors)[0];
- const message =
- firstFieldError ||
- err?.response?.data?.message ||
- "Registration failed";
- setError(message);
- } finally {
- setIsSubmitting(false);
- }
- };
-
- return (
-
- );
-};
-
-export default Register;
Index: frontend/src/utils/authSession.js
===================================================================
--- frontend/src/utils/authSession.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,37 +1,0 @@
-export const AUTH_TOKEN_KEY = "authToken";
-export const AUTH_USER_KEY = "authUser";
-
-function decodeJwtPayload(token) {
- try {
- const parts = token.split(".");
- if (parts.length < 2) return null;
- const base64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
- const normalized = base64.padEnd(Math.ceil(base64.length / 4) * 4, "=");
- const json = atob(normalized);
- return JSON.parse(json);
- } catch {
- return null;
- }
-}
-
-export function isTokenExpired(token) {
- if (!token) return true;
- const payload = decodeJwtPayload(token);
- if (!payload || typeof payload.exp !== "number") return true;
- return payload.exp * 1000 <= Date.now();
-}
-
-export function getAuthToken() {
- return localStorage.getItem(AUTH_TOKEN_KEY);
-}
-
-export function clearAuthSession() {
- localStorage.removeItem(AUTH_TOKEN_KEY);
- localStorage.removeItem(AUTH_USER_KEY);
-}
-
-export function logoutAndRedirect(path = "/dashboard") {
- clearAuthSession();
- window.location.assign(path);
-}
-
Index: frontend/src/utils/timeSeries.js
===================================================================
--- frontend/src/utils/timeSeries.js (revision 0427f599f15f08425a193b5b366fd15cc0a95f42)
+++ (revision )
@@ -1,116 +1,0 @@
-// Utilities for bucketing time-series data and computing percentage changes.
-
-function startOfDay(d) {
- return new Date(d.getFullYear(), d.getMonth(), d.getDate());
-}
-
-function startOfMonth(d) {
- return new Date(d.getFullYear(), d.getMonth(), 1);
-}
-
-function startOfYear(d) {
- return new Date(d.getFullYear(), 0, 1);
-}
-
-// ISO week start (Monday)
-function startOfISOWeek(d) {
- const date = startOfDay(d);
- const day = date.getDay(); // 0..6 (Sun..Sat)
- const diff = (day === 0 ? -6 : 1) - day;
- date.setDate(date.getDate() + diff);
- return startOfDay(date);
-}
-
-function bucketKey(date, granularity) {
- const d = new Date(date);
- if (Number.isNaN(d.getTime())) return null;
-
- let s;
- switch (granularity) {
- case "daily":
- s = startOfDay(d);
- break;
- case "weekly":
- s = startOfISOWeek(d);
- break;
- case "monthly":
- s = startOfMonth(d);
- break;
- case "yearly":
- s = startOfYear(d);
- break;
- default:
- s = startOfDay(d);
- }
-
- return s.getTime();
-}
-
-export function sumByTimeBucket(items, granularity, getDate, getValue) {
- const map = new Map();
-
- for (const it of items ?? []) {
- const rawDate = getDate(it);
- const k = bucketKey(rawDate, granularity);
- if (k == null) continue;
-
- const v = Number(getValue(it) ?? 0);
- if (!Number.isFinite(v)) continue;
-
- map.set(k, (map.get(k) ?? 0) + v);
- }
-
- const points = Array.from(map.entries())
- .sort((a, b) => a[0] - b[0])
- .map(([ts, value]) => ({ ts, value }));
-
- return points;
-}
-
-export function percentChangeSeries(points) {
- // Output: [{ ts, value: pctChange, base: sumValue }]
- const out = [];
- let prev = null;
-
- for (const p of points ?? []) {
- const curr = Number(p.value ?? 0);
- let pct = 0;
-
- if (prev == null) {
- pct = 0;
- } else if (prev === 0) {
- // Avoid exploding infinity when previous is 0.
- // Define: if curr is also 0 -> 0%, else -> 100%.
- pct = curr === 0 ? 0 : 100;
- } else {
- pct = ((curr - prev) / prev) * 100;
- }
-
- out.push({ ts: p.ts, value: pct, base: curr });
- prev = curr;
- }
-
- return out;
-}
-
-export function formatBucketLabel(ts, granularity) {
- const d = new Date(ts);
- if (Number.isNaN(d.getTime())) return "—";
-
- const optsDay = { month: "short", day: "2-digit" };
- const optsMonth = { year: "numeric", month: "short" };
-
- switch (granularity) {
- case "daily":
- return d.toLocaleDateString(undefined, optsDay);
- case "weekly":
- return `Wk of ${d.toLocaleDateString(undefined, optsDay)}`;
- case "monthly":
- return d.toLocaleDateString(undefined, optsMonth);
- case "yearly":
- return String(d.getFullYear());
- default:
- return d.toLocaleDateString();
- }
-}
-