feat(logs): add loki logging

feat(metrics): add basic prometheus metrics, cluster scraping

.github/workflows/deploy-pr.yaml

@@ -12,25 +12,7 @@ jobs:
   test:
     name: Run Python Tests
     if: github.event.action != 'closed'
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-tests.yml
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Run tests with pytest
-        run: pytest
-        working-directory: ./7project/backend
 
   build:
     if: github.event.action != 'closed'
@@ -119,7 +101,8 @@ jobs:
             --set image.digest="$DIGEST" \
             --set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
             --set-string database.password="$DB_PASSWORD" \
-            --set-string database.encryptionSecret="$PR"
+            --set-string database.encryptionSecret="$PR" \
+            --set-string app.name="finance-tracker-pr-$PR"
 
       - name: Post preview URLs as PR comment
         uses: actions/github-script@v7

.github/workflows/deploy-prod.yaml

@@ -23,26 +23,7 @@ concurrency:
 jobs:
   test:
     name: Run Python Tests
-    if: github.event.action != 'closed'
+    uses: ./.github/workflows/run-tests.yml
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Run tests with pytest
-        run: pytest
-        working-directory: ./7project/backend
 
   build:
     name: Build and push image (reusable)

.github/workflows/run-tests.yml

@@ -2,47 +2,45 @@ name: Run Python Tests
 permissions:
   contents: read
 
-# -----------------
-# --- Triggers ----
-# -----------------
-# This section defines when the workflow will run.
 on:
-  # Run on every push to the 'main' branch
+  workflow_call:
-  push:
-    branches: [ "main", "30-create-tests-and-set-up-a-github-pipeline" ]
-  # Also run on every pull request that targets the 'main' branch
-  pull_request:
-    branches: [ "main" ]
 
-# -----------------
-# ------ Jobs -----
-# -----------------
-# A workflow is made up of one or more jobs that can run in parallel or sequentially.
 jobs:
-  # A descriptive name for your job
   build-and-test:
-    # Specifies the virtual machine to run the job on. 'ubuntu-latest' is a common and cost-effective choice.
     runs-on: ubuntu-latest
 
-    # -----------------
+    services:
-    # ----- Steps -----
+      mariadb:
-    # -----------------
+        image: mariadb:11.4
-    # A sequence of tasks that will be executed as part of the job.
+        env:
+          MARIADB_ROOT_PASSWORD: rootpw
+          MARIADB_DATABASE: group_project
+          MARIADB_USER: appuser
+          MARIADB_PASSWORD: apppass
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mariadb-admin ping -h 127.0.0.1 -u root -prootpw --silent"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=20
+
+    env:
+      MARIADB_HOST: 127.0.0.1
+      MARIADB_PORT: "3306"
+      MARIADB_DB: group_project
+      MARIADB_USER: appuser
+      MARIADB_PASSWORD: apppass
+
     steps:
-      # Step 1: Check out your repository's code
-      # This action allows the workflow to access your code.
       - name: Check out repository code
         uses: actions/checkout@v4
 
-      # Step 2: Set up the Python environment
-      # This action installs a specific version of Python on the runner.
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11' # Use the Python version that matches your project
+          python-version: '3.11'
 
-      # Step 3: Install project dependencies
-      # Runs shell commands to install the libraries listed in your requirements.txt.
       - name: Add test dependencies to requirements
         run: |
           echo "pytest==8.4.2" >> ./7project/backend/requirements.txt
@@ -53,8 +51,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r ./7project/backend/requirements.txt
 
-      # Step 4: Run your tests!
+      - name: Run Alembic migrations
-      # Executes the pytest command to run your test suite.
+        run: |
+          alembic upgrade head
+        working-directory: ./7project/backend
+
       - name: Run tests with pytest
         run: pytest
         working-directory: ./7project/backend

7project/backend/alembic/env.py

@@ -25,7 +25,8 @@ if not DATABASE_URL:
 
 SYNC_DATABASE_URL = DATABASE_URL.replace("+asyncmy", "+pymysql")
 
-ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
+host_env = os.getenv("MARIADB_HOST", "localhost")
+ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
 connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
 
 def run_migrations_offline() -> None:

7project/backend/alembic/versions/2025_10_30_1342-59cebf320c4a_cascade_categories.py

@@ -0,0 +1,46 @@
+"""Cascade categories
+
+Revision ID: 59cebf320c4a
+Revises: 46b9e702e83f
+Create Date: 2025-10-30 13:42:44.555284
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = '59cebf320c4a'
+down_revision: Union[str, Sequence[str], None] = '46b9e702e83f'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('category_transaction', sa.Column('category_id', sa.Integer(), nullable=False))
+    op.add_column('category_transaction', sa.Column('transaction_id', sa.Integer(), nullable=False))
+    op.drop_constraint(op.f('category_transaction_ibfk_2'), 'category_transaction', type_='foreignkey')
+    op.drop_constraint(op.f('category_transaction_ibfk_1'), 'category_transaction', type_='foreignkey')
+    op.create_foreign_key(None, 'category_transaction', 'transaction', ['transaction_id'], ['id'], ondelete='CASCADE')
+    op.create_foreign_key(None, 'category_transaction', 'categories', ['category_id'], ['id'], ondelete='CASCADE')
+    op.drop_column('category_transaction', 'id_category')
+    op.drop_column('category_transaction', 'id_transaction')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('category_transaction', sa.Column('id_transaction', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+    op.add_column('category_transaction', sa.Column('id_category', mysql.INTEGER(display_width=11), autoincrement=False, nullable=True))
+    op.drop_constraint(None, 'category_transaction', type_='foreignkey')
+    op.drop_constraint(None, 'category_transaction', type_='foreignkey')
+    op.create_foreign_key(op.f('category_transaction_ibfk_1'), 'category_transaction', 'categories', ['id_category'], ['id'])
+    op.create_foreign_key(op.f('category_transaction_ibfk_2'), 'category_transaction', 'transaction', ['id_transaction'], ['id'])
+    op.drop_column('category_transaction', 'transaction_id')
+    op.drop_column('category_transaction', 'category_id')
+    # ### end Alembic commands ###

7project/backend/app/api/auth.py

@@ -24,6 +24,23 @@ async def delete_me(
     await user_manager.delete(user)
 
 # Keep existing paths as-is under /auth/* and /users/*
+from fastapi import Request, Response
+from app.core.security import revoke_token, extract_bearer_token
+
+
+@router.post(
+    "/auth/jwt/logout",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=["auth"],
+    summary="Log out and revoke current token",
+)
+async def custom_logout(request: Request) -> Response:
+    """Revoke the current bearer token so it cannot be used anymore."""
+    token = extract_bearer_token(request)
+    if token:
+        revoke_token(token)
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 router.include_router(
     fastapi_users.get_auth_router(auth_backend), prefix="/auth/jwt", tags=["auth"]
 )

7project/backend/app/app.py

@@ -1,9 +1,12 @@
 import logging
 import os
+import sys
 from datetime import datetime
+from pythonjsonlogger import jsonlogger
 
 from fastapi import Depends, FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+from prometheus_fastapi_instrumentator import Instrumentator, metrics
 from starlette.requests import Request
 
 from app.services import bank_scraper
@@ -15,8 +18,10 @@ from app.api.auth import router as auth_router
 from app.api.csas import router as csas_router
 from app.api.categories import router as categories_router
 from app.api.transactions import router as transactions_router
-from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider, UserManager, get_jwt_strategy
+from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider, \
-
+    UserManager, get_jwt_strategy
+from app.core.security import extract_bearer_token, is_token_revoked, decode_and_verify_jwt
+from app.services.user_service import SECRET
 
 from fastapi import FastAPI
 import sentry_sdk
@@ -29,7 +34,6 @@ sentry_sdk.init(
 )
 
 fastApi = FastAPI()
-app = fastApi
 
 # CORS for frontend dev server
 fastApi.add_middleware(
@@ -44,11 +48,55 @@ fastApi.add_middleware(
     allow_headers=["*"],
 )
 
+prometheus = Instrumentator().instrument(fastApi)
+
+prometheus.expose(
+    fastApi,
+    endpoint="/metrics",
+    include_in_schema=True,
+)
+
 fastApi.include_router(auth_router)
 fastApi.include_router(categories_router)
 fastApi.include_router(transactions_router)
 
-logging.basicConfig(filename='app.log', level=logging.INFO, format='%(asctime)s %(message)s')
+
+for h in list(logging.root.handlers):
+    logging.root.removeHandler(h)
+
+_log_handler = logging.StreamHandler(sys.stdout)
+_formatter = jsonlogger.JsonFormatter(
+    fmt='%(asctime)s %(levelname)s %(name)s %(message)s %(pathname)s %(lineno)d %(process)d %(thread)d'
+)
+_log_handler.setFormatter(_formatter)
+
+logging.root.setLevel(logging.INFO)
+logging.root.addHandler(_log_handler)
+
+
+for _name in ("uvicorn", "uvicorn.error", "uvicorn.access"):
+    _logger = logging.getLogger(_name)
+    _logger.handlers = [_log_handler]
+    _logger.propagate = True
+
+
+@fastApi.middleware("http")
+async def auth_guard(request: Request, call_next):
+    # Enforce revoked/expired JWTs are rejected globally
+    token = extract_bearer_token(request)
+    if token:
+        from fastapi import Response, status as _status
+        # Deny if token is revoked
+        if is_token_revoked(token):
+            return Response(status_code=_status.HTTP_401_UNAUTHORIZED)
+        # Deny if token is expired or invalid
+        try:
+            decode_and_verify_jwt(token, SECRET)
+        except Exception:
+            return Response(status_code=_status.HTTP_401_UNAUTHORIZED)
+    return await call_next(request)
+
+
 @fastApi.middleware("http")
 async def log_traffic(request: Request, call_next):
     start_time = datetime.now()
@@ -66,9 +114,10 @@ async def log_traffic(request: Request, call_next):
         "process_time": process_time,
         "client_host": client_host
     }
-    logging.info(str(log_params))
+    logging.getLogger(__name__).info("http_request", extra=log_params)
     return response
 
+
 fastApi.include_router(
     fastapi_users.get_oauth_router(
         get_oauth_provider("MojeID"),
@@ -95,6 +144,7 @@ fastApi.include_router(
 
 fastApi.include_router(csas_router)
 
+
 # Liveness/root endpoint
 @fastApi.get("/", include_in_schema=False)
 async def root():
@@ -117,4 +167,5 @@ async def debug_scrape_csas_all():
 async def debug_scrape_csas_user(user_id: str, user: User = Depends(current_active_verified_user)):
     logging.info("[Debug] Queueing CSAS scrape for single user via HTTP endpoint (Celery) | user_id=%s", user_id)
     task = load_transactions.delay(user_id)
-    return {"status": "queued", "action": "csas_scrape_single", "user_id": user_id, "task_id": getattr(task, 'id', None)}
+    return {"status": "queued", "action": "csas_scrape_single", "user_id": user_id,
+            "task_id": getattr(task, 'id', None)}

7project/backend/app/core/db.py

@@ -19,7 +19,8 @@ from app.models.user import User
 from app.models.transaction import Transaction
 from app.models.categories import Category
 
-ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
+host_env = os.getenv("MARIADB_HOST", "localhost")
+ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
 connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
 
 engine = create_async_engine(

7project/backend/app/core/security.py

@@ -0,0 +1,52 @@
+from typing import Optional
+import re
+import jwt
+from fastapi import Request
+
+# Simple in-memory revocation store for revoked JWT tokens.
+# 
+# Limitations:
+# - All revoked tokens will be lost if the process restarts (data loss on restart).
+# - Not suitable for multi-instance deployments: the revocation list is not shared between instances.
+#   A token revoked in one instance will not be recognized as revoked in others.
+# 
+# For production, use a persistent and shared store (e.g., Redis or a database).
+_REVOKED_TOKENS: set[str] = set()
+
+# Bearer token regex
+_BEARER_RE = re.compile(r"^[Bb]earer\s+(.+)$")
+
+
+def extract_bearer_token(request: Request) -> Optional[str]:
+    auth = request.headers.get("authorization")
+    if not auth:
+        return None
+    m = _BEARER_RE.match(auth)
+    if not m:
+        return None
+    return m.group(1).strip()
+
+
+def revoke_token(token: str) -> None:
+    if token:
+        _REVOKED_TOKENS.add(token)
+
+
+def is_token_revoked(token: str) -> bool:
+    return token in _REVOKED_TOKENS
+
+
+def decode_and_verify_jwt(token: str, secret: str) -> dict:
+    """
+    Decode the JWT using the shared secret, verifying expiration and signature.
+    Audience is not verified here to be compatible with fastapi-users default tokens.
+    Raises jwt.ExpiredSignatureError if expired.
+    Raises jwt.InvalidTokenError for other issues.
+    Returns the decoded payload dict on success.
+    """
+    return jwt.decode(
+        token,
+        secret,
+        algorithms=["HS256"],
+        options={"verify_aud": False},
+    )  # verify_exp is True by default

7project/backend/app/models/categories.py

@@ -7,8 +7,8 @@ from app.core.base import Base
 association_table = Table(
     "category_transaction",
     Base.metadata,
-    Column("id_category", Integer, ForeignKey("categories.id")),
+    Column("category_id", Integer, ForeignKey("categories.id", ondelete="CASCADE"), primary_key=True),
-    Column("id_transaction", Integer, ForeignKey("transaction.id"))
+    Column("transaction_id", Integer, ForeignKey("transaction.id", ondelete="CASCADE"), primary_key=True)
 )
 
 

7project/backend/app/models/transaction.py

@@ -21,4 +21,4 @@ class Transaction(Base):
 
     # Relationship
     user = relationship("User", back_populates="transactions")
-    categories = relationship("Category", secondary=association_table, back_populates="transactions")
+    categories = relationship("Category", secondary=association_table, back_populates="transactions", passive_deletes=True)

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

@@ -107,9 +107,12 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
                     "additionalRemittanceInformation")
                 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=transaction['amount']['value'],
+                    amount=amount,
                     description=description,
                     date=date,
                     user_id=user_id,

7project/backend/pyproject.toml

@@ -1,2 +1,5 @@
 [tool.pytest.ini_options]
 pythonpath = "."
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+asyncio_default_test_loop_scope = "session"

7project/backend/requirements.txt

@@ -38,6 +38,8 @@ MarkupSafe==3.0.2
 multidict==6.6.4
 packaging==25.0
 pamqp==3.3.0
+prometheus-fastapi-instrumentator==7.1.0
+prometheus_client==0.23.1
 prompt_toolkit==3.0.52
 propcache==0.3.2
 pwdlib==0.2.1
@@ -68,3 +70,4 @@ watchfiles==1.1.0
 wcwidth==0.2.14
 websockets==15.0.1
 yarl==1.20.1
+python-json-logger==2.0.7

7project/backend/tests/conftest.py

@@ -1,7 +1,9 @@
 import sys
+import uuid
 import types
 import pytest
 from fastapi.testclient import TestClient
+from httpx import AsyncClient, ASGITransport
 
 # Stub sentry_sdk to avoid optional dependency issues during import of app
 stub = types.ModuleType("sentry_sdk")
@@ -20,3 +22,23 @@ def fastapi_app():
 @pytest.fixture(scope="session")
 def client(fastapi_app):
     return TestClient(fastapi_app, raise_server_exceptions=True)
+
+
+@pytest.fixture(scope="function")
+async def test_user(fastapi_app):
+    """
+    Creates a new user asynchronously and returns their credentials.
+    Does NOT log them in.
+    Using AsyncClient with ASGITransport avoids event loop conflicts with DB connections.
+    """
+    unique_email = f"testuser_{uuid.uuid4()}@example.com"
+    password = "a_strong_password"
+    user_payload = {"email": unique_email, "password": password}
+
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        response = await ac.post("/auth/register", json=user_payload)
+        assert response.status_code == 201
+
+    return {"username": unique_email, "password": password}
+

7project/backend/tests/test_e2e_auth_flow.py

@@ -1,3 +1,6 @@
+import pytest
+import uuid
+from httpx import AsyncClient, ASGITransport
 from fastapi import status
 
 
@@ -13,3 +16,83 @@ def test_e2e_minimal_auth_flow(client):
     # 3) Protected endpoint should not be accessible without token
     me = client.get("/users/me")
     assert me.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
+
+
+@pytest.mark.asyncio
+async def test_e2e_full_user_lifecycle(fastapi_app, test_user):
+    # Use an AsyncClient with ASGITransport for async tests
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        login_payload = test_user
+
+        # 1. Log in with the new credentials
+        login_resp = await ac.post("/auth/jwt/login", data=login_payload)
+        assert login_resp.status_code == status.HTTP_200_OK
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Access a protected endpoint
+        me_resp = await ac.get("/users/me", headers=headers)
+        assert me_resp.status_code == status.HTTP_200_OK
+        assert me_resp.json()["email"] == test_user["username"]
+
+        # 3. Update the user's profile
+        update_payload = {"first_name": "Test"}
+        patch_resp = await ac.patch("/users/me", json=update_payload, headers=headers)
+        assert patch_resp.status_code == status.HTTP_200_OK
+        assert patch_resp.json()["first_name"] == "Test"
+
+        # 4. Log out
+        logout_resp = await ac.post("/auth/jwt/logout", headers=headers)
+        assert logout_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+        # 5. Verify token is invalid
+        me_again_resp = await ac.get("/users/me", headers=headers)
+        assert me_again_resp.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+@pytest.mark.asyncio
+async def test_e2e_transaction_workflow(fastapi_app, test_user):
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get the token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # NEW STEP: Create a category first to get a valid ID
+        category_payload = {"name": "Test Category for E2E"}
+        create_category_resp = await ac.post("/categories/create", json=category_payload, headers=headers)
+        assert create_category_resp.status_code == status.HTTP_201_CREATED
+        category_id = create_category_resp.json()["id"]
+
+        # 2. Create a new transaction
+        tx_payload = {"amount": -55.40, "description": "Milk and eggs"}
+        tx_resp = await ac.post("/transactions/create", json=tx_payload, headers=headers)
+        assert tx_resp.status_code == status.HTTP_201_CREATED
+        tx_id = tx_resp.json()["id"]
+
+        # 3. Assign the category
+        assign_resp = await ac.post(f"/transactions/{tx_id}/categories/{category_id}", headers=headers)
+        assert assign_resp.status_code == status.HTTP_200_OK
+
+        # 4. Verify assignment
+        get_tx_resp = await ac.get(f"/transactions/{tx_id}", headers=headers)
+        assert category_id in get_tx_resp.json()["category_ids"]
+
+        # 5. Unassign the category
+        unassign_resp = await ac.delete(f"/transactions/{tx_id}/categories/{category_id}", headers=headers)
+        assert unassign_resp.status_code == status.HTTP_200_OK
+
+        # 6. Get the transaction again and verify the category is gone
+        get_tx_again_resp = await ac.get(f"/transactions/{tx_id}", headers=headers)
+        final_tx_data = get_tx_again_resp.json()
+        assert category_id not in final_tx_data["category_ids"]
+
+        # 7. Delete the transaction for cleanup
+        delete_resp = await ac.delete(f"/transactions/{tx_id}/delete", headers=headers)
+        assert delete_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+        # NEW STEP: Clean up the created category
+        delete_category_resp = await ac.delete(f"/categories/{category_id}", headers=headers)
+        assert delete_category_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)

7project/backend/tests/test_integration_app.py

@@ -1,5 +1,6 @@
 from fastapi import status
 import pytest
+from httpx import AsyncClient, ASGITransport
 
 
 def test_root_ok(client):
@@ -13,6 +14,53 @@ def test_authenticated_route_requires_auth(client):
     assert resp.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
 
 
-def test_sentry_debug_raises_exception(client):
+@pytest.mark.asyncio
-    with pytest.raises(ZeroDivisionError):
+async def test_create_and_get_category(fastapi_app, test_user):
-        client.get("/sentry-debug")
+    # Use AsyncClient for async tests
+    transport = ASGITransport(app=fastapi_app)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get an auth token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Define and create the new category
+        category_name = "Async Integration Test"
+        category_payload = {"name": category_name}
+        create_resp = await ac.post("/categories/create", json=category_payload, headers=headers)
+
+        # 3. Assert creation was successful
+        assert create_resp.status_code == status.HTTP_201_CREATED
+        created_data = create_resp.json()
+        category_id = created_data["id"]
+        assert created_data["name"] == category_name
+
+        # 4. GET the list of categories to verify
+        list_resp = await ac.get("/categories/", headers=headers)
+        assert list_resp.status_code == status.HTTP_200_OK
+
+        # 5. Check that our new category is in the list
+        categories_list = list_resp.json()
+        assert any(cat["name"] == category_name for cat in categories_list)
+
+        delete_resp = await ac.delete(f"/categories/{category_id}", headers=headers)
+        assert delete_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+
+@pytest.mark.asyncio
+async def test_create_transaction_missing_amount_fails(fastapi_app, test_user):
+    transport = ASGITransport(app=fastapi_app)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get an auth token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Define an invalid payload
+        invalid_payload = {"description": "This should fail"}
+
+        # 3. Attempt to create the transaction
+        resp = await ac.post("/transactions/create", json=invalid_payload, headers=headers)
+
+        # 4. Assert the expected validation error
+        assert resp.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY

7project/backend/tests/test_unit_user_service.py

@@ -19,7 +19,7 @@ def test_get_oauth_provider_known_unknown():
 def test_get_jwt_strategy_lifetime():
     strategy = user_service.get_jwt_strategy()
     assert strategy is not None
-    # Basic smoke check: strategy has a lifetime set to 3600
+    # Basic smoke check: strategy has a lifetime set to 604800
     assert getattr(strategy, "lifetime_seconds", None) in (604800,)
 
 

7project/charts/myapp-chart/templates/app-deployment.yaml

@@ -8,10 +8,12 @@ spec:
   selector:
     matchLabels:
       app: {{ .Values.app.name }}
+      endpoint: metrics
   template:
     metadata:
       labels:
         app: {{ .Values.app.name }}
+        endpoint: metrics
     spec:
       containers:
         - name: {{ .Values.app.name }}

7project/charts/myapp-chart/templates/monitoring.yaml

@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: fastapi-servicemonitor
+  labels:
+    release: kube-prometheus-stack
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Values.app.name }}
+  endpoints:
+    - port: http
+      path: /metrics
+      interval: 15s

7project/charts/myapp-chart/templates/service.yaml

@@ -2,9 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.app.name }}
+  labels:
+    app: {{ .Values.app.name }}
 spec:
   ports:
-    - port: {{ .Values.service.port }}
+    - name: http
+      port: {{ .Values.service.port }}
       targetPort: {{ .Values.app.port }}
   selector:
     app: {{ .Values.app.name }}

7project/checklist.md

@@ -7,64 +7,64 @@ Focus on areas that align with your project goals and interests.
 The core deliverables are required.
 This means that you must get at least 2 points for each item in this category.
 
-| **Category**                     | **Item**                                | **Max Points** | **Points**       |
+| **Category**                     | **Item**                                | **Max Points** | **Points**                                      |
-| -------------------------------- | --------------------------------------- | -------------- | ---------------- |
+|----------------------------------| --------------------------------------- | -------------- |-------------------------------------------------|
-| **Core Deliverables (Required)** |                                         |                |                  |
+| **Core Deliverables (Required)** |                                         |                |                                                 |
-| Codebase & Organization          | Well-organized project structure        | 5              |                  |
+| Codebase & Organization          | Well-organized project structure        | 5              | 5                                               |
-|                                  | Clean, readable code                    | 5              |                  |
+|                                  | Clean, readable code                    | 5              | 4                                               |
-|                                  | Use planning tool (e.g., GitHub issues) | 5              |                  |
+|                                  | Use planning tool (e.g., GitHub issues) | 5              | 4                                               |
-|                                  | Proper version control usage            | 5              |                  |
+|                                  | Proper version control usage            | 5              | 5                                               |
-|                                  | Complete source code                    | 5              |                  |
+| 23                               | Complete source code                    | 5              | 5                                               |
-| Documentation                    | Comprehensive reproducibility report    | 10             |                  |
+| Documentation                    | Comprehensive reproducibility report    | 10             | 4-5                                             |
-|                                  | Updated design document                 | 5              |                  |
+|                                  | Updated design document                 | 5              | 2                                               |
-|                                  | Clear build/deployment instructions     | 5              |                  |
+|                                  | Clear build/deployment instructions     | 5              | 2                                               |
-|                                  | Troubleshooting guide                   | 5              |                  |
+|                                  | Troubleshooting guide                   | 5              | 1                                               |
-|                                  | Completed self-assessment table         | 5              |                  |
+|                                  | Completed self-assessment table         | 5              | 2                                               |
-|                                  | Hour sheets for all members             | 5              |                  |
+| 14                               | Hour sheets for all members             | 5              | 3                                               |
-| Presentation Video               | Project demonstration                   | 5              |                  |
+| Presentation Video               | Project demonstration                   | 5              | 0                                               |
-|                                  | Code walk-through                       | 5              |                  |
+|                                  | Code walk-through                       | 5              | 0                                               |
-|                                  | Deployment showcase                     | 5              |                  |
+| 0                                | Deployment showcase                     | 5              | 0                                               |
-| **Technical Implementation**     |                                         |                |                  |
+| **Technical Implementation**     |                                         |                |                                                 |
-| Application Functionality        | Basic functionality works               | 10             |                  |
+| Application Functionality        | Basic functionality works               | 10             | 8                                               |
-|                                  | Advanced features implemented           | 10             |                  |
+|                                  | Advanced features implemented           | 10             | 0                                               |
-|                                  | Error handling & robustness             | 10             |                  |
+|                                  | Error handling & robustness             | 10             | 4                                               |
-|                                  | User-friendly interface                 | 5              |                  |
+| 16                               | User-friendly interface                 | 5              | 4                                               |
-| Backend & Architecture           | Stateless web server                    | 5              |                  |
+| Backend & Architecture           | Stateless web server                    | 5              | 5                                               |
-|                                  | Stateful application                    | 10             |                  |
+|                                  | Stateful application                    | 10             | ? WHAT DOES THIS MEAN                           |
-|                                  | Database integration                    | 10             |                  |
+|                                  | Database integration                    | 10             | 10                                              |
-|                                  | API design                              | 5              |                  |
+|                                  | API design                              | 5              | 5                                               |
-|                                  | Microservices architecture              | 10             |                  |
+| 20                               | Microservices architecture              | 10             | 0                                               |
-| Cloud Integration                | Basic cloud deployment                  | 10             |                  |
+| Cloud Integration                | Basic cloud deployment                  | 10             | 10                                              |
-|                                  | Cloud APIs usage                        | 10             |                  |
+|                                  | Cloud APIs usage                        | 10             | ? WHAT DOES THIS MEAN                           |
-|                                  | Serverless components                   | 10             |                  |
+|                                  | Serverless components                   | 10             | 0                                               |
-|                                  | Advanced cloud services                 | 5              |                  |
+| 10                               | Advanced cloud services                 | 5              | 0                                               |
-| **DevOps & Deployment**          |                                         |                |                  |
+| **DevOps & Deployment**          |                                         |                |                                                 |
-| Containerization                 | Basic Dockerfile                        | 5              |                  |
+| Containerization                 | Basic Dockerfile                        | 5              | 5                                               |
-|                                  | Optimized Dockerfile                    | 5              |                  |
+|                                  | Optimized Dockerfile                    | 5              | 0                                               |
-|                                  | Docker Compose                          | 5              |                  |
+|                                  | Docker Compose                          | 5              | 5 - dev only                                    |
-|                                  | Persistent storage                      | 5              |                  |
+| 15                               | Persistent storage                      | 5              | 5                                               |
-| Deployment & Scaling             | Manual deployment                       | 5              |                  |
+| Deployment & Scaling             | Manual deployment                       | 5              | 5                                               |
-|                                  | Automated deployment                    | 5              |                  |
+|                                  | Automated deployment                    | 5              | 5                                               |
-|                                  | Multiple replicas                       | 5              |                  |
+|                                  | Multiple replicas                       | 5              | 5                                               |
-|                                  | Kubernetes deployment                   | 10             |                  |
+| 20                               | Kubernetes deployment                   | 10             | 10                                              |
-| **Quality Assurance**            |                                         |                |                  |
+| **Quality Assurance**            |                                         |                |                                                 |
-| Testing                          | Unit tests                              | 5              |                  |
+| Testing                          | Unit tests                              | 5              | 2                                               |
-|                                  | Integration tests                       | 5              |                  |
+|                                  | Integration tests                       | 5              | 2                                               |
-|                                  | End-to-end tests                        | 5              |                  |
+|                                  | End-to-end tests                        | 5              | 5                                               |
-|                                  | Performance testing                     | 5              |                  |
+| 9                                | Performance testing                     | 5              | 0                                               |
-| Monitoring & Operations          | Health checks                           | 5              |                  |
+| Monitoring & Operations          | Health checks                           | 5              | 5                                               |
-|                                  | Logging                                 | 5              |                  |
+|                                  | Logging                                 | 5              | 2 - only to terminal add logstash               |
-|                                  | Metrics/Monitoring                      | 5              |                  |
+| 9                                | Metrics/Monitoring                      | 5              | 2 - only DB, need to create Prometheus endpoint |
-| Security                         | HTTPS/TLS                               | 5              |                  |
+| Security                         | HTTPS/TLS                               | 5              | 5                                               |
-|                                  | Authentication                          | 5              |                  |
+|                                  | Authentication                          | 5              | 5                                               |
-|                                  | Authorization                           | 5              |                  |
+| 15                               | Authorization                           | 5              | 5                                               |
-| **Innovation & Excellence**      |                                         |                |                  |
+| **Innovation & Excellence**      |                                         |                |                                                 |
-| Advanced Features and            | AI/ML Integration                       | 10             |                  |
+| Advanced Features and            | AI/ML Integration                       | 10             | 0                                               |
-| Technical Excellence             | Real-time features                      | 10             |                  |
+| Technical Excellence             | Real-time features                      | 10             | 0                                               |
-|                                  | Creative problem solving                | 10             |                  |
+|                                  | Creative problem solving                | 10             | ?                                               |
-|                                  | Performance optimization                | 5              |                  |
+|                                  | Performance optimization                | 5              | 2                                               |
-|                                  | Exceptional user experience             | 5              |                  |
+| 2                                | Exceptional user experience             | 5              | 0                                               |
-| **Total**                        |                                         | **255**        | **[Your Total]** |
+| **Total**                        |                                         | **255**        | **153**                                         |
 
 ## Grading Scale
 

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 className="logo">7Project</div>
+        <div>
-        <nav className="nav">
+          <div className="logo">7Project</div>
-          <button className={current === 'home' ? 'active' : ''} onClick={() => setCurrent('home')}>Home</button>
+          <nav className="nav">
-          <button className={current === 'account' ? 'active' : ''} onClick={() => setCurrent('account')}>Account</button>
+            <button className={current === 'home' ? 'active' : ''} onClick={() => setCurrent('home')}>Home</button>
-          <button className={current === 'appearance' ? 'active' : ''} onClick={() => setCurrent('appearance')}>Appearance</button>
+            <button className={current === 'manual' ? 'active' : ''} onClick={() => setCurrent('manual')}>Manual management</button>
-        </nav>
+            <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

@@ -3,5 +3,5 @@ import react from '@vitejs/plugin-react'
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react()],
+    plugins: [react()],
 })

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.
+
+- [ ] Change the name on frontend from 7project
+- [ ] Finalize the funcionality and everyting in the code part
+- [ ] Try to finalize report with focus on reproducibility
+- [ ] More high level explanation of the workflow in the 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
@@ -351,13 +351,15 @@ curl -H "Authorization: Bearer $TOKEN" http://127.0.0.1:8000/authenticated-route
 
 ### Dejan
 
-| Date        | Activity             | Hours  | Description                    |
+| 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

7project/tofu/modules/prometheus/main.tf

@@ -64,3 +64,21 @@ resource "kubectl_manifest" "argocd-tunnel-bind" {
     base_domain = var.cloudflare_domain
   })
 }
+
+resource "helm_release" "loki_stack" {
+  name       = "loki-stack"
+  repository = "https://grafana.github.io/helm-charts"
+  chart      = "loki-stack"
+  namespace  = kubernetes_namespace.monitoring.metadata[0].name
+  version = "2.9.12"
+
+  set = [{
+    name  = "grafana.enabled"
+    value = "false"
+  }]
+
+
+  depends_on = [
+    helm_release.kube_prometheus_stack
+  ]
+}