Merge remote-tracking branch 'origin/main'

feat(frontend): added CNB API and moved management into a new tab

7project/backend/app/services/bank_scraper.py

@@ -1,17 +1,18 @@
 import json
 import logging
 from os.path import dirname, join
+from time import strptime
 from uuid import UUID
 
 import httpx
 from sqlalchemy import select
 
 from app.core.db import async_session_maker
+from app.models.transaction import Transaction
 from app.models.user import User
 
 logger = logging.getLogger(__name__)
 
-# Reuse CSAS mTLS certs used by OAuth profile calls
 OAUTH_DIR = join(dirname(__file__), "..", "oauth")
 CERTS = (
     join(OAUTH_DIR, "public_key.pem"),
@@ -20,10 +21,6 @@ CERTS = (
 
 
 async def aload_ceska_sporitelna_transactions(user_id: str) -> None:
-    """
-    Async entry point to load Česká spořitelna transactions for a single user.
-    Validates the user_id and performs a minimal placeholder action.
-    """
     try:
         uid = UUID(str(user_id))
     except Exception:
@@ -34,9 +31,6 @@ async def aload_ceska_sporitelna_transactions(user_id: str) -> None:
 
 
 async def aload_all_ceska_sporitelna_transactions() -> None:
-    """
-    Async entry point to load Česká spořitelna transactions for all users.
-    """
     async with async_session_maker() as session:
         result = await session.execute(select(User))
         users = result.unique().scalars().all()
@@ -54,7 +48,7 @@ async def aload_all_ceska_sporitelna_transactions() -> None:
 
 
 async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
-    async with async_session_maker() as session:
+    async with (async_session_maker() as session):
         result = await session.execute(select(User).where(User.id == user_id))
         user: User = result.unique().scalar_one_or_none()
         if user is None:
@@ -106,16 +100,25 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
                 if response.status_code != httpx.codes.OK:
                     continue
 
-                # Placeholder: just print the account transactions
-
                 transactions = response.json()["transactions"]
-                pass
 
             for transaction in transactions:
-                #parse and store transaction to database
+                description = transaction.get("entryDetails", {}).get("transactionDetails", {}).get(
-                #create Transaction object and save to DB
+                    "additionalRemittanceInformation")
-                #obj =
+                date_str = transaction.get("bookingDate", {}).get("date")
+                date = strptime(date_str, "%Y-%m-%d") if date_str else None
+                amount = transaction.get("amount", {}).get("value")
+                if transaction.get("creditDebitIndicator") == "DBIT":
+                    amount = -abs(amount)
 
+                obj = Transaction(
+                    amount=amount,
+                    description=description,
+                    date=date,
+                    user_id=user_id,
+                )
+                session.add(obj)
+                await session.commit()
 
                 pass
             pass

7project/frontend/src/pages/Dashboard.tsx

@@ -1,8 +1,9 @@
 import { useEffect, useMemo, useState } from 'react';
-import { type Category, type Transaction, type BalancePoint, createTransaction, getCategories, getTransactions, createCategory, updateTransaction, getBalanceSeries } from '../api';
+import { type Category, type Transaction, type BalancePoint, getCategories, getTransactions, createTransaction, updateTransaction, getBalanceSeries } from '../api';
 import AccountPage from './AccountPage';
 import AppearancePage from './AppearancePage';
 import BalanceChart from './BalanceChart';
+import ManualManagement from './ManualManagement';
 import CategoryPieChart from './CategoryPieChart';
 import MockBankModal, { type MockGenerationOptions } from './MockBankModal';
 import { BACKEND_URL } from '../config';
@@ -11,8 +12,108 @@ function formatAmount(n: number) {
   return new Intl.NumberFormat(undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(n);
 }
 
+// Add this new component to your Dashboard.tsx file, above the Dashboard component
+
+// Define the structure for the rate data we care about
+type CnbRate = {
+  currencyCode: string;
+  rate: number;
+};
+
+// The part of the API response structure we need
+type CnbApiResponse = {
+  rates: Array<{
+    amount: number;
+    currencyCode: string;
+    rate: number;
+  }>;
+};
+
+// The currencies you want to display
+const TARGET_CURRENCIES = ['EUR', 'USD', 'NOK'];
+
+function CurrencyRates() {
+  const [rates, setRates] = useState<CnbRate[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    async function fetchRates() {
+      setLoading(true);
+      setError(null);
+
+      // Get today's date in YYYY-MM-DD format for the API
+      const today = new Date().toISOString().split('T')[0];
+      const CNB_API_URL = `/api-cnb/cnbapi/exrates/daily?date=${today}&lang=EN`;
+
+      try {
+        const res = await fetch(CNB_API_URL);
+        if (!res.ok) {
+          // This can happen on weekends/holidays or if rates aren't posted yet
+          throw new Error(`Rates unavailable (Status: ${res.status})`);
+        }
+        const data: CnbApiResponse = await res.json();
+
+        if (!data.rates) {
+          throw new Error("Invalid API response");
+        }
+
+        const filteredRates = data.rates
+          .filter(rate => TARGET_CURRENCIES.includes(rate.currencyCode))
+          .map(rate => ({
+            currencyCode: rate.currencyCode,
+            // Handle 'amount' field (e.g., JPY is per 100)
+            rate: rate.rate / rate.amount
+          }));
+
+        setRates(filteredRates);
+      } catch (err: any) {
+        setError(err.message || 'Could not load rates');
+      } finally {
+        setLoading(false);
+      }
+    }
+
+    fetchRates();
+  }, []); // Runs once on component mount
+
+  return (
+    // This component will push itself to the bottom of the sidebar
+    <div
+      className="currency-rates"
+      style={{
+        padding: '0 1.5rem',
+        marginTop: 'auto', // Pushes to bottom
+        paddingBottom: '1.5rem' // Adds some spacing at the end
+      }}
+    >
+      <h4 style={{
+        margin: '1.5rem 0 0.75rem 0',
+        color: '#8a91b4', // Muted color to match dark sidebar
+        fontWeight: 500,
+        fontSize: '0.9em',
+        textTransform: 'uppercase',
+      }}>
+        Rates (vs CZK)
+      </h4>
+      {loading && <div style={{ fontSize: '0.9em', color: '#ccc' }}>Loading...</div>}
+      {error && <div style={{ fontSize: '0.9em', color: 'crimson' }}>{error}</div>}
+      {!loading && !error && (
+        <ul style={{ listStyle: 'none', padding: 0, margin: 0, fontSize: '0.9em', color: '#fff' }}>
+          {rates.length > 0 ? rates.map(rate => (
+            <li key={rate.currencyCode} style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '0.5rem' }}>
+              <strong>{rate.currencyCode}</strong>
+              <span>{rate.rate.toFixed(3)}</span>
+            </li>
+          )) : <li style={{color: '#8a91b4'}}>No rates found.</li>}
+        </ul>
+      )}
+    </div>
+  );
+}
+
 export default function Dashboard({ onLogout }: { onLogout: () => void }) {
-  const [current, setCurrent] = useState<'home' | 'account' | 'appearance'>('home');
+  const [current, setCurrent] = useState<'home' | 'manual' | 'account' | 'appearance'>('home');
   const [transactions, setTransactions] = useState<Transaction[]>([]);
   const [categories, setCategories] = useState<Category[]>([]);
   const [loading, setLoading] = useState(true);
@@ -41,11 +142,6 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
     }
   }
 
-  // New transaction form state
-  const [amount, setAmount] = useState<string>('');
-  const [description, setDescription] = useState('');
-  const [selectedCategoryId, setSelectedCategoryId] = useState<number | ''>('');
-
   // Filters
   const [minAmount, setMinAmount] = useState<string>('');
   const [maxAmount, setMaxAmount] = useState<string>('');
@@ -63,12 +159,7 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
   // Balance chart series for current date filter
   const [balanceSeries, setBalanceSeries] = useState<BalancePoint[]>([]);
 
-  // Category creation form
+  // Manual forms moved to ManualManagement page
-  const [newCatName, setNewCatName] = useState('');
-  const [newCatDesc, setNewCatDesc] = useState('');
-
-  // New transaction date
-  const [txDate, setTxDate] = useState<string>('');
 
   // Inline edit state for transaction categories
   const [editingTxId, setEditingTxId] = useState<number | null>(null);
@@ -167,23 +258,6 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
 
   function categoryNameById(id: number) { return categories.find(c => c.id === id)?.name || `#${id}`; }
 
-  async function handleCreate(e: React.FormEvent) {
-    e.preventDefault();
-    if (!amount) return;
-    const payload = {
-      amount: Number(amount),
-      description: description || undefined,
-      category_ids: selectedCategoryId !== '' ? [Number(selectedCategoryId)] : undefined,
-      date: txDate || undefined,
-    };
-    try {
-      const created = await createTransaction(payload);
-      setTransactions(prev => [created, ...prev]);
-      setAmount(''); setDescription(''); setSelectedCategoryId(''); setTxDate('');
-    } catch (err: any) {
-      alert(err?.message || 'Failed to create transaction');
-    }
-  }
 
   function beginEditCategories(t: Transaction) {
     setEditingTxId(t.id);
@@ -206,17 +280,23 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
 
   return (
     <div className="app-layout">
-      <aside className="sidebar">
+      <aside className="sidebar" style={{ display: 'flex', flexDirection: 'column' }}>
+        <div>
           <div className="logo">7Project</div>
           <nav className="nav">
             <button className={current === 'home' ? 'active' : ''} onClick={() => setCurrent('home')}>Home</button>
+            <button className={current === 'manual' ? 'active' : ''} onClick={() => setCurrent('manual')}>Manual management</button>
             <button className={current === 'account' ? 'active' : ''} onClick={() => setCurrent('account')}>Account</button>
             <button className={current === 'appearance' ? 'active' : ''} onClick={() => setCurrent('appearance')}>Appearance</button>
           </nav>
+        </div>
+
+        <CurrencyRates />
+
       </aside>
       <div className="content">
         <div className="topbar">
-          <h2 style={{ margin: 0 }}>{current === 'home' ? 'Dashboard' : current === 'account' ? 'Account' : 'Appearance'}</h2>
+          <h2 style={{ margin: 0 }}>{current === 'home' ? 'Dashboard' : current === 'manual' ? 'Manual management' : current === 'account' ? 'Account' : 'Appearance'}</h2>
           <div className="actions">
             <span className="user muted">Signed in</span>
             <button className="btn" onClick={onLogout}>Logout</button>
@@ -237,28 +317,7 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
                   </div>
               </section>
 
-              <section className="card">
-                <h3>Add Transaction</h3>
-                <form onSubmit={handleCreate} className="form-row">
-                  <input className="input" type="number" step="0.01" placeholder="Amount" value={amount} onChange={(e) => setAmount(e.target.value)} required />
-                  <input className="input" type="date" placeholder="Date (optional)" value={txDate} onChange={(e) => setTxDate(e.target.value)} />
-                  <input className="input" type="text" placeholder="Description (optional)" value={description} onChange={(e) => setDescription(e.target.value)} />
-                  <select className="input" value={selectedCategoryId} onChange={(e) => setSelectedCategoryId(e.target.value ? Number(e.target.value) : '')}>
-                    <option value="">No category</option>
-                    {categories.map(c => (<option key={c.id} value={c.id}>{c.name}</option>))}
-                  </select>
-                  <button className="btn primary" type="submit">Add</button>
-                </form>
-              </section>
 
-              <section className="card">
-                <h3>Categories</h3>
-                <form className="form-row" onSubmit={async (e) => { e.preventDefault(); if (!newCatName.trim()) return; try { const cat = await createCategory({ name: newCatName.trim(), description: newCatDesc || undefined }); setCategories(prev => [...prev, cat]); setNewCatName(''); setNewCatDesc(''); } catch (err: any) { alert(err?.message || 'Failed to create category'); } }}>
-                  <input className="input" type="text" placeholder="New category name" value={newCatName} onChange={(e) => setNewCatName(e.target.value)} />
-                  <input className="input" type="text" placeholder="Description (optional)" value={newCatDesc} onChange={(e) => setNewCatDesc(e.target.value)} />
-                  <button className="btn primary" type="submit">Create category</button>
-                </form>
-              </section>
 
               <section className="card">
                 <h3>Filters</h3>
@@ -368,6 +427,14 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
             <AccountPage onDeleted={onLogout} />
           )}
 
+          {current === 'manual' && (
+            <ManualManagement
+              categories={categories}
+              onTransactionAdded={(t) => setTransactions(prev => [t, ...prev])}
+              onCategoryCreated={(c) => setCategories(prev => [...prev, c])}
+            />
+          )}
+
           {current === 'appearance' && (
             <AppearancePage />
           )}

7project/frontend/src/pages/ManualManagement.tsx

@@ -0,0 +1,79 @@
+import { useState } from 'react';
+import { type Category, type Transaction, createTransaction, createCategory } from '../api';
+
+export default function ManualManagement({
+  categories,
+  onTransactionAdded,
+  onCategoryCreated,
+}: {
+  categories: Category[];
+  onTransactionAdded: (t: Transaction) => void;
+  onCategoryCreated: (c: Category) => void;
+}) {
+  // New transaction form state
+  const [amount, setAmount] = useState<string>('');
+  const [description, setDescription] = useState('');
+  const [selectedCategoryId, setSelectedCategoryId] = useState<number | ''>('');
+  const [txDate, setTxDate] = useState<string>('');
+
+  // Category creation form
+  const [newCatName, setNewCatName] = useState('');
+  const [newCatDesc, setNewCatDesc] = useState('');
+
+  async function handleCreate(e: React.FormEvent) {
+    e.preventDefault();
+    if (!amount) return;
+    const payload = {
+      amount: Number(amount),
+      description: description || undefined,
+      category_ids: selectedCategoryId !== '' ? [Number(selectedCategoryId)] : undefined,
+      date: txDate || undefined,
+    };
+    try {
+      const created = await createTransaction(payload);
+      onTransactionAdded(created);
+      setAmount(''); setDescription(''); setSelectedCategoryId(''); setTxDate('');
+    } catch (err: any) {
+      alert(err?.message || 'Failed to create transaction');
+    }
+  }
+
+  async function handleCreateCategory(e: React.FormEvent) {
+    e.preventDefault();
+    if (!newCatName.trim()) return;
+    try {
+      const cat = await createCategory({ name: newCatName.trim(), description: newCatDesc || undefined });
+      onCategoryCreated(cat);
+      setNewCatName(''); setNewCatDesc('');
+    } catch (err: any) {
+      alert(err?.message || 'Failed to create category');
+    }
+  }
+
+  return (
+    <>
+      <section className="card">
+        <h3>Add Transaction</h3>
+        <form onSubmit={handleCreate} className="form-row">
+          <input className="input" type="number" step="0.01" placeholder="Amount" value={amount} onChange={(e) => setAmount(e.target.value)} required />
+          <input className="input" type="date" placeholder="Date (optional)" value={txDate} onChange={(e) => setTxDate(e.target.value)} />
+          <input className="input" type="text" placeholder="Description (optional)" value={description} onChange={(e) => setDescription(e.target.value)} />
+          <select className="input" value={selectedCategoryId} onChange={(e) => setSelectedCategoryId(e.target.value ? Number(e.target.value) : '')}>
+            <option value="">No category</option>
+            {categories.map(c => (<option key={c.id} value={c.id}>{c.name}</option>))}
+          </select>
+          <button className="btn primary" type="submit">Add</button>
+        </form>
+      </section>
+
+      <section className="card">
+        <h3>Categories</h3>
+        <form className="form-row" onSubmit={handleCreateCategory}>
+          <input className="input" type="text" placeholder="New category name" value={newCatName} onChange={(e) => setNewCatName(e.target.value)} />
+          <input className="input" type="text" placeholder="Description (optional)" value={newCatDesc} onChange={(e) => setNewCatDesc(e.target.value)} />
+          <button className="btn primary" type="submit">Create category</button>
+        </form>
+      </section>
+    </>
+  );
+}

7project/frontend/src/ui.css

@@ -31,14 +31,14 @@ body[data-theme="dark"] {
 }
 
 /* Layout */
-.app-layout { display: grid; grid-template-columns: 260px 1fr; height: 100vh; }
+.app-layout { display: grid; grid-template-columns: 260px minmax(0,1fr); height: 100vh; }
 .sidebar { background: #15172a; color: #e5e7eb; display: flex; flex-direction: column; padding: 20px 12px; }
 .sidebar .logo { color: #fff; font-weight: 700; font-size: 18px; padding: 12px 14px; display: flex; align-items: center; gap: 10px; }
 .nav { margin-top: 12px; display: grid; gap: 4px; }
 .nav a, .nav button { color: #cbd5e1; text-align: left; background: transparent; border: 0; padding: 10px 12px; border-radius: 8px; cursor: pointer; }
 .nav a.active, .nav a:hover, .nav button:hover { background: rgba(255,255,255,0.08); color: #fff; }
 
-.content { display: flex; flex-direction: column; overflow-y: auto; }
+.content { display: flex; flex-direction: column; overflow-y: auto; min-width: 0; width: 100%; }
 .topbar { height: 64px; display: flex; flex-shrink: 0; align-items: center; justify-content: space-between; padding: 0 24px; background: var(--panel); border-bottom: 1px solid var(--border); }
 .topbar .user { color: var(--muted); }
 .page { padding: 24px; }

7project/frontend/vite.config.ts

@@ -4,4 +4,21 @@ import react from '@vitejs/plugin-react'
 // https://vite.dev/config/
 export default defineConfig({
     plugins: [react()],
+    server: {
+    proxy: {
+      // We'll proxy any request that starts with '/api-cnb'
+      '/api-cnb': {
+        // This is the real API server we want to talk to
+        target: 'https://api.cnb.cz',
+
+        // This is crucial: it changes the 'Origin' header
+        // to match the target, so the CNB server is happy.
+        changeOrigin: true,
+
+        // This rewrites the request path. It removes the '/api-cnb' part
+        // so the CNB server gets the correct path ('/cnbapi/exrates/daily...').
+        rewrite: (path) => path.replace(/^\/api-cnb/, ''),
+      },
+    },
+  },
 })

7project/meetings/2025-10-30-meeting.md

@@ -0,0 +1,51 @@
+# Weekly Meeting Notes
+
+- Group 8 - Personal finance tracker
+- Mentor: Jaychander
+
+Keep all meeting notes in the `meetings.md` file in your project folder.
+Just copy the template below for each weekly meeting and fill in the details.
+
+## Administrative Info
+
+- Date: 2025-10-30
+- Attendees: Dejan, Lukas
+- Notetaker: Dejan
+
+## Progress Update (Before Meeting)
+
+Last 3 minutes of the meeting, summarize action items.
+
+- [ ] Dont store data in database (security) - Load it on login (from CSAS API and local database), load automatically with email
+- [X] Go through the checklist
+- [X] Look for possible APIs (like stocks or financial details whatever)
+- [ ] Report - partly
+
+Summary of what has been accomplished since the last meeting in the following categories.
+
+### Coding
+Implemented CSAS API transactions fetch, Added tests with testing database on github actions, redone UI, 
+added currency exchange rate with CNB API
+
+### Documentation
+Not much - just updated the work done
+
+## Questions and Topics for Discussion (Before Meeting)
+
+1. Security regarding storing transactions - possibility of encryption
+2. Realisticaly what needs to be done for us to be done
+3. Question 3
+
+## Discussion Notes (During Meeting)
+The tracker should not store the transactions in the database - security vulnerability.
+
+## Action Items for Next Week (During Meeting)
+
+Last 3 minutes of the meeting, summarize action items.
+
+- [ ] Dont store data in database (security) - Load it on login (from CSAS API and local database), load automatically with email
+- [ ] Go through the checklist
+- [ ] Look for possible APIs (like stocks or financial details whatever)
+- [ ] Report
+
+---

7project/report.md

@@ -323,13 +323,13 @@ curl -H "Authorization: Bearer $TOKEN" http://127.0.0.1:8000/authenticated-route
 |-----------------------------------------------------------------------|-------------| ------------- |----------------|------------| ----------- |
 | [Project Setup & Repository](https://github.com/dat515-2025/Group-8#) | Lukas       | ✅ Complete    | [X hours]      | Medium     | [Any notes] |
 | [Design Document](https://github.com/dat515-2025/Group-8/blob/main/6design/design.md)          | Both        | ✅ Complete    | 2 Hours        | Easy       | [Any notes] |
-| [Backend API Development](https://github.com/dat515-2025/Group-8/tree/main/7project/backend/app/api)  | Dejan       | ✅ Complete    | 10 hours       | Medium     | [Any notes] |
+| [Backend API Development](https://github.com/dat515-2025/Group-8/tree/main/7project/backend/app/api)  | Dejan       | 🔄 In Progress    | 10 hours       | Medium     | [Any notes] |
-| [Database Setup & Models](https://github.com/dat515-2025/Group-8/tree/main/7project/backend/app/models)  | Lukas       | ✅ Complete    | [X hours]      | Medium     | [Any notes] |
+| [Database Setup & Models](https://github.com/dat515-2025/Group-8/tree/main/7project/backend/app/models)  | Lukas       | 🔄 In Progress    | [X hours]      | Medium     | [Any notes] |
 | [Frontend Development](https://github.com/dat515-2025/Group-8/tree/main/7project/frontend)     | Dejan       | 🔄 In Progress | 7 hours so far | Medium     | [Any notes] |
 | [Docker Configuration](https://github.com/dat515-2025/Group-8/blob/main/7project/compose.yml)     | Lukas       | ✅ Complete    | [X hours]      | Easy       | [Any notes] |
 | [Cloud Deployment](https://github.com/dat515-2025/Group-8/blob/main/7project/deployment/app-demo-deployment.yaml)         | Lukas       | ✅ Complete    | [X hours]      | Hard       | [Any notes] |
-| [Testing Implementation](https://github.com/dat515-2025/group-name)   | Dejan       | ❌ Not Started     | [X hours]      | Medium     | [Any notes] |
+| [Testing Implementation](https://github.com/dat515-2025/group-name)   | Dejan       | 🔄 In Progress     | [X hours]      | Medium     | [Any notes] |
-| [Documentation](https://github.com/dat515-2025/group-name)            | Both        | ❌ Not Started   | [X hours]      | Easy       | [Any notes] |
+| [Documentation](https://github.com/dat515-2025/group-name)            | Both        | 🔄 In Progress   | [X hours]      | Easy       | [Any notes] |
 | [Presentation Video](https://github.com/dat515-2025/group-name)       | Both        | ❌ Not Started     | [X hours]      | Medium     | [Any notes] |
 
 **Legend**: ✅ Complete | 🔄 In Progress | ⏳ Pending | ❌ Not Started
@@ -352,12 +352,14 @@ curl -H "Authorization: Bearer $TOKEN" http://127.0.0.1:8000/authenticated-route
 ### Dejan
 
 | Date            | Activity             | Hours  | Description                                                                      |
-|-------------|----------------------|--------|--------------------------------|
+|-----------------|----------------------|--------|----------------------------------------------------------------------------------|
-| 25.9.       | Design               | 1.5    | 6design                        |
+| 25.9.           | Design               | 2      | 6design                                                                          |
-| 9-11.10.    | Backend APIs         | 10     | Implemented Backend APIs       |
+| 9.10 to 11.10.  | Backend APIs         | 10     | Implemented Backend APIs                                                         |
-| 13-15.10.   | Frontend Development | 6.5    | Created user interface mockups |
+| 13.10 to 15.10. | Frontend Development | 7      | Created user interface mockups                                                   |
-| Continually | Documantation        | 3      | Documenting the dev process    |
+| Continually     | Documantation        | 5      | Documenting the dev process                                                      |
-| **Total**   |                      | **21** |                                |
+| 21.10 to 23.10  | Tests, forntend      | 10     | Test basics, balance charts, and frontend improvement                            |
+| 28.10 to 30.10  | Tests, forntend      | 7      | Tests improvement with test database setup, UI fix and exchange rate integration |
+| **Total**       |                      | **41** |                                                                                  |
 
 
 ### Group Total: [XXX.X] hours