mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 15:12:08 +01:00
Compare commits
14 Commits
merge/prom
...
add_more_t
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b301c386e | ||
|
|
733e7a8918 | ||
|
|
524e7a6f98 | ||
|
|
0c9882e9b3 | ||
|
|
72494c4aae | ||
|
|
60560dea99 | ||
|
|
a9b2aba55a | ||
|
|
36b1fe887b | ||
|
|
8543c72730 | ||
| 24087c2810 | |||
|
|
6818b1f649 | ||
| c864e753c9 | |||
| b4a453be04 | |||
| d290664352 |
@@ -1,6 +1,8 @@
|
||||
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
|
||||
@@ -58,7 +60,24 @@ 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")
|
||||
@@ -95,7 +114,7 @@ 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
|
||||
|
||||
|
||||
|
||||
@@ -70,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
|
||||
|
||||
@@ -4,7 +4,7 @@ from httpx import AsyncClient, ASGITransport
|
||||
from fastapi import status
|
||||
|
||||
|
||||
def test_e2e_minimal_auth_flow(client):
|
||||
def test_e2e(client):
|
||||
# 1) Service is alive
|
||||
alive = client.get("/")
|
||||
assert alive.status_code == status.HTTP_200_OK
|
||||
@@ -96,3 +96,84 @@ async def test_e2e_transaction_workflow(fastapi_app, test_user):
|
||||
# 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)
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_register_then_login_and_fetch_me(fastapi_app):
|
||||
transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
email = "newuser@example.com"
|
||||
password = "StrongPassw0rd!"
|
||||
reg = await ac.post("/auth/register", json={"email": email, "password": password})
|
||||
assert reg.status_code in (status.HTTP_201_CREATED, status.HTTP_200_OK)
|
||||
|
||||
login = await ac.post("/auth/jwt/login", data={"username": email, "password": password})
|
||||
assert login.status_code == status.HTTP_200_OK
|
||||
token = login.json()["access_token"]
|
||||
me = await ac.get("/users/me", headers={"Authorization": f"Bearer {token}"})
|
||||
assert me.status_code == status.HTTP_200_OK
|
||||
assert me.json()["email"] == email
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_current_user_revokes_access(fastapi_app):
|
||||
transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
email = "todelete@example.com"
|
||||
password = "Passw0rd!"
|
||||
reg = await ac.post("/auth/register", json={"email": email, "password": password})
|
||||
assert reg.status_code in (status.HTTP_200_OK, status.HTTP_201_CREATED)
|
||||
|
||||
login = await ac.post("/auth/jwt/login", data={"username": email, "password": password})
|
||||
token = login.json()["access_token"]
|
||||
headers = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
# Delete self
|
||||
d = await ac.delete("/users/me", headers=headers)
|
||||
assert d.status_code == status.HTTP_204_NO_CONTENT
|
||||
|
||||
# Access should now fail
|
||||
me = await ac.get("/users/me", headers=headers)
|
||||
assert me.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_update_category_conflict_and_404(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
a = (await ac.post("/categories/create", json={"name": "A"}, headers=h)).json()
|
||||
b = (await ac.post("/categories/create", json={"name": "B"}, headers=h)).json()
|
||||
|
||||
# Attempt to rename A -> B should conflict
|
||||
conflict = await ac.patch(f"/categories/{a['id']}", json={"name": "B"}, headers=h)
|
||||
assert conflict.status_code == status.HTTP_409_CONFLICT
|
||||
|
||||
# Update non-existent
|
||||
missing = await ac.patch("/categories/999999", json={"name": "Z"}, headers=h)
|
||||
assert missing.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_category_cross_user_isolation(fastapi_app):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
# user1
|
||||
u1 = {"email": "u1@example.com", "password": "Aaaaaa1!"}
|
||||
assert (await ac.post("/auth/register", json=u1)).status_code in (200, 201)
|
||||
t1 = (await ac.post("/auth/jwt/login", data={"username": u1["email"], "password": u1["password"]})).json()["access_token"]
|
||||
|
||||
# user1 creates a category
|
||||
c = (await ac.post("/categories/create", json={"name": "Private"}, headers={"Authorization": f"Bearer {t1}"})).json()
|
||||
|
||||
# user2
|
||||
u2 = {"email": "u2@example.com", "password": "Aaaaaa1!"}
|
||||
assert (await ac.post("/auth/register", json=u2)).status_code in (200, 201)
|
||||
t2 = (await ac.post("/auth/jwt/login", data={"username": u2["email"], "password": u2["password"]})).json()["access_token"]
|
||||
|
||||
# user2 cannot read/delete user1's category
|
||||
g = await ac.get(f"/categories/{c['id']}", headers={"Authorization": f"Bearer {t2}"})
|
||||
assert g.status_code == status.HTTP_404_NOT_FOUND
|
||||
d = await ac.delete(f"/categories/{c['id']}", headers={"Authorization": f"Bearer {t2}"})
|
||||
assert d.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
@@ -63,4 +63,108 @@ async def test_create_transaction_missing_amount_fails(fastapi_app, test_user):
|
||||
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
|
||||
assert resp.status_code == status.HTTP_422_UNPROCESSABLE_CONTENT
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_login_invalid_credentials(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
bad = await ac.post("/auth/jwt/login", data={"username": test_user["username"], "password": "nope"})
|
||||
assert bad.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_400_BAD_REQUEST)
|
||||
unknown = await ac.post("/auth/jwt/login", data={"username": "nouser@example.com", "password": "x"})
|
||||
assert unknown.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_category_duplicate_name_conflict(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
p = {"name": "Food"}
|
||||
r1 = await ac.post("/categories/create", json=p, headers=h)
|
||||
assert r1.status_code == status.HTTP_201_CREATED
|
||||
r2 = await ac.post("/categories/create", json=p, headers=h)
|
||||
assert r2.status_code == status.HTTP_409_CONFLICT
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_transaction_invalid_date_format(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
bad = await ac.post("/transactions/create", json={"amount": 10, "description": "x", "date": "31-12-2024"}, headers=h)
|
||||
assert bad.status_code == status.HTTP_400_BAD_REQUEST
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_update_transaction_rejects_duplicate_category_ids(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
tx = (await ac.post("/transactions/create", json={"amount": 5, "description": "x"}, headers=h)).json()
|
||||
dup = await ac.patch(f"/transactions/{tx['id']}/edit", json={"category_ids": [1, 1]}, headers=h)
|
||||
assert dup.status_code == status.HTTP_400_BAD_REQUEST
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_assign_unassign_category_not_found_cases(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
# Create tx and category
|
||||
tx = (await ac.post("/transactions/create", json={"amount": 1, "description": "a"}, headers=h)).json()
|
||||
cat = (await ac.post("/categories/create", json={"name": "X"}, headers=h)).json()
|
||||
|
||||
# Missing transaction
|
||||
r1 = await ac.post(f"/transactions/999999/categories/{cat['id']}", headers=h)
|
||||
assert r1.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
# Missing category
|
||||
r2 = await ac.post(f"/transactions/{tx['id']}/categories/999999", headers=h)
|
||||
assert r2.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_transactions_date_filter_and_balance_series(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
# Seed transactions spanning days
|
||||
data = [
|
||||
{"amount": 100, "description": "day1", "date": "2024-01-01"},
|
||||
{"amount": -25, "description": "day2", "date": "2024-01-02"},
|
||||
{"amount": 50, "description": "day3", "date": "2024-01-03"},
|
||||
]
|
||||
for p in data:
|
||||
r = await ac.post("/transactions/create", json=p, headers=h)
|
||||
assert r.status_code == status.HTTP_201_CREATED
|
||||
|
||||
# Filtered list (2nd and 3rd only)
|
||||
lst = await ac.get("/transactions/", params={"start_date": "2024-01-02", "end_date": "2024-01-03"}, headers=h)
|
||||
assert lst.status_code == status.HTTP_200_OK
|
||||
assert len(lst.json()) == 2
|
||||
|
||||
# Balance series should be cumulative per date
|
||||
series = await ac.get("/transactions/balance_series", headers=h)
|
||||
assert series.status_code == status.HTTP_200_OK
|
||||
s = series.json()
|
||||
assert s == [
|
||||
{"date": "2024-01-01", "balance": 100.0},
|
||||
{"date": "2024-01-02", "balance": 75.0},
|
||||
{"date": "2024-01-03", "balance": 125.0},
|
||||
]
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_transaction_not_found(fastapi_app, test_user):
|
||||
transport = ASGITransport(app=fastapi_app)
|
||||
async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
|
||||
token = (await ac.post("/auth/jwt/login", data=test_user)).json()["access_token"]
|
||||
h = {"Authorization": f"Bearer {token}"}
|
||||
r = await ac.delete("/transactions/999999/delete", headers=h)
|
||||
assert r.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
|
||||
@@ -19,6 +19,17 @@ export type Transaction = {
|
||||
date?: string | null; // ISO date (YYYY-MM-DD)
|
||||
};
|
||||
|
||||
export async function deleteTransaction(id: number): Promise<void> {
|
||||
const res = await fetch(`${getBaseUrl()}/transactions/${id}/delete`, {
|
||||
method: 'DELETE',
|
||||
headers: getHeaders('none'),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const text = await res.text();
|
||||
throw new Error(text || 'Failed to delete transaction');
|
||||
}
|
||||
}
|
||||
|
||||
function getBaseUrl() {
|
||||
const base = BACKEND_URL?.replace(/\/$/, '') || '';
|
||||
return base || '';
|
||||
|
||||
@@ -13,9 +13,9 @@ export function applyTheme(theme: Theme) {
|
||||
export function applyFontSize(size: FontSize) {
|
||||
const root = document.documentElement;
|
||||
const map: Record<FontSize, string> = {
|
||||
small: '14px',
|
||||
medium: '18px',
|
||||
large: '22px',
|
||||
small: '12px',
|
||||
medium: '15px',
|
||||
large: '21px',
|
||||
};
|
||||
root.style.fontSize = map[size];
|
||||
}
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
export const BACKEND_URL: string =
|
||||
import.meta.env.VITE_BACKEND_URL ?? '';
|
||||
|
||||
export const VITE_UNIRATE_API_KEY: string =
|
||||
import.meta.env.VITE_UNIRATE_API_KEY ?? 'wYXMiA0bz8AVRHtiS9hbKIr4VP3k5Qff8XnQdKQM45YM3IwFWP6y73r3KMkv1590';
|
||||
|
||||
@@ -24,8 +24,6 @@ a:hover {
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
place-items: center;
|
||||
min-width: 320px;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
// src/BalanceChart.tsx
|
||||
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend } from 'recharts';
|
||||
import { type BalancePoint } from '../api';
|
||||
|
||||
function formatAmount(n: number) {
|
||||
@@ -10,17 +11,37 @@ function formatDate(dateStr: string) {
|
||||
return new Date(dateStr).toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
|
||||
}
|
||||
|
||||
export default function BalanceChart({ data }: { data: BalancePoint[] }) {
|
||||
type Props = { data: BalancePoint[]; pxPerPoint?: number };
|
||||
|
||||
export default function BalanceChart({ data, pxPerPoint = 40 }: Props) {
|
||||
const wrapRef = useRef<HTMLDivElement | null>(null);
|
||||
const [containerWidth, setContainerWidth] = useState(0);
|
||||
|
||||
useEffect(() => {
|
||||
function measure() {
|
||||
if (!wrapRef.current) return;
|
||||
setContainerWidth(wrapRef.current.clientWidth);
|
||||
}
|
||||
measure();
|
||||
const obs = new ResizeObserver(measure);
|
||||
if (wrapRef.current) obs.observe(wrapRef.current);
|
||||
return () => obs.disconnect();
|
||||
}, []);
|
||||
|
||||
if (data.length === 0) {
|
||||
return <div>No data to display</div>;
|
||||
}
|
||||
|
||||
const desiredWidth = Math.max(containerWidth, Math.max(600, data.length * pxPerPoint));
|
||||
|
||||
return (
|
||||
<ResponsiveContainer width="100%" height={300}>
|
||||
<div ref={wrapRef} className="chart-scroll">
|
||||
<div className="chart-inner" style={{ minWidth: desiredWidth, paddingBottom: 8 }}>
|
||||
<LineChart
|
||||
width={desiredWidth}
|
||||
height={300}
|
||||
data={data}
|
||||
// Increased 'left' margin to create more space for the Y-axis label and tick values
|
||||
margin={{ top: 5, right: 30, left: 50, bottom: 5 }} // <-- Change this line
|
||||
margin={{ top: 5, right: 30, left: 50, bottom: 5 }}
|
||||
>
|
||||
<CartesianGrid strokeDasharray="3 3" />
|
||||
<XAxis
|
||||
@@ -30,9 +51,7 @@ export default function BalanceChart({ data }: { data: BalancePoint[] }) {
|
||||
/>
|
||||
<YAxis
|
||||
tickFormatter={(value) => formatAmount(value as number)}
|
||||
// Adjusted 'offset' for the Y-axis label.
|
||||
// A negative offset moves it further away from the axis.
|
||||
label={{ value: 'Balance', angle: -90, position: 'insideLeft', offset: -30 }} // <-- Change this line
|
||||
label={{ value: 'Balance', angle: -90, position: 'insideLeft', offset: -30 }}
|
||||
/>
|
||||
<Tooltip
|
||||
labelFormatter={formatDate}
|
||||
@@ -41,6 +60,7 @@ export default function BalanceChart({ data }: { data: BalancePoint[] }) {
|
||||
<Legend />
|
||||
<Line type="monotone" dataKey="balance" stroke="#3b82f6" strokeWidth={2} activeDot={{ r: 8 }} />
|
||||
</LineChart>
|
||||
</ResponsiveContainer>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -92,9 +92,13 @@ export default function CategoryPieCharts({ transactions, categories }: { transa
|
||||
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', flexWrap: 'wrap', gap: '20px', justifyContent: 'center' }}>
|
||||
<div className="pie-grid" >
|
||||
<div className="pie-card">
|
||||
<SinglePieChart data={expensesData} title="Expenses by Category" />
|
||||
</div>
|
||||
<div className="pie-card">
|
||||
<SinglePieChart data={earningsData} title="Earnings by Category" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,39 +1,42 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { type Category, type Transaction, type BalancePoint, getCategories, getTransactions, createTransaction, updateTransaction, getBalanceSeries } from '../api';
|
||||
import { type Category, type Transaction, type BalancePoint, deleteTransaction, 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';
|
||||
import { BACKEND_URL, VITE_UNIRATE_API_KEY } from '../config';
|
||||
|
||||
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
|
||||
//https://unirateapi.com/
|
||||
|
||||
|
||||
// Define the structure for the rate data we care about
|
||||
type CnbRate = {
|
||||
type RateData = {
|
||||
currencyCode: string;
|
||||
rate: number;
|
||||
};
|
||||
|
||||
// The part of the API response structure we need
|
||||
type CnbApiResponse = {
|
||||
rates: Array<{
|
||||
amount: number;
|
||||
currencyCode: string;
|
||||
rate: number;
|
||||
}>;
|
||||
type UnirateApiResponse = {
|
||||
base: string;
|
||||
rates: { [key: string]: number };
|
||||
// We'll also check for error formats just in case
|
||||
message?: string;
|
||||
error?: {
|
||||
info: string;
|
||||
};
|
||||
};
|
||||
|
||||
// The currencies you want to display
|
||||
const TARGET_CURRENCIES = ['EUR', 'USD', 'NOK'];
|
||||
|
||||
function CurrencyRates() {
|
||||
const [rates, setRates] = useState<CnbRate[]>([]);
|
||||
const [rates, setRates] = useState<RateData[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
@@ -42,31 +45,49 @@ function CurrencyRates() {
|
||||
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`;
|
||||
const API_KEY = VITE_UNIRATE_API_KEY;
|
||||
|
||||
// We need to get the CZK rate as well, to use it for conversion
|
||||
const allSymbols = [...TARGET_CURRENCIES, 'CZK'].join(',');
|
||||
|
||||
// We remove the `base` param, as the API seems to force base=USD
|
||||
const UNIRATE_API_URL = `https://unirateapi.com/api/rates?api_key=${API_KEY}&symbols=${allSymbols}`;
|
||||
|
||||
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();
|
||||
const res = await fetch(UNIRATE_API_URL);
|
||||
const data: UnirateApiResponse = await res.json();
|
||||
|
||||
// --- THIS IS THE NEW, CORRECTED LOGIC ---
|
||||
|
||||
// 1. Check if the 'rates' object exists. If not, it's an error.
|
||||
if (!data.rates) {
|
||||
throw new Error("Invalid API response");
|
||||
let errorMessage = data.message || (data.error ? data.error.info : 'Invalid API response');
|
||||
throw new Error(errorMessage || 'Could not load rates');
|
||||
}
|
||||
|
||||
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
|
||||
}));
|
||||
// 2. Check that we got the base currency (USD) and our conversion currency (CZK)
|
||||
if (data.base !== 'USD' || !data.rates.CZK) {
|
||||
throw new Error('API response is missing required data for conversion (USD or CZK)');
|
||||
}
|
||||
|
||||
setRates(filteredRates);
|
||||
// 3. Get our main conversion factor
|
||||
const czkPerUsd = data.rates.CZK; // e.g., 23.0
|
||||
|
||||
// 4. Calculate the rates for our target currencies
|
||||
const formattedRates = TARGET_CURRENCIES.map(code => {
|
||||
const targetPerUsd = data.rates[code]; // e.g., 0.9 for EUR
|
||||
|
||||
// This calculates: (CZK per USD) / (TARGET per USD) = CZK per TARGET
|
||||
// e.g. (23.0 CZK / 1 USD) / (0.9 EUR / 1 USD) = 25.55 CZK / 1 EUR
|
||||
const rate = czkPerUsd / targetPerUsd;
|
||||
|
||||
return {
|
||||
currencyCode: code,
|
||||
rate: rate,
|
||||
};
|
||||
});
|
||||
|
||||
setRates(formattedRates);
|
||||
} catch (err: any) {
|
||||
setError(err.message || 'Could not load rates');
|
||||
} finally {
|
||||
@@ -108,10 +129,26 @@ function CurrencyRates() {
|
||||
)) : <li style={{color: '#8a91b4'}}>No rates found.</li>}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
<a
|
||||
href="https://unirateapi.com"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
style={{
|
||||
display: 'block',
|
||||
marginTop: '1rem',
|
||||
fontSize: '0.8em',
|
||||
color: '#8a91b4', // Muted color
|
||||
textDecoration: 'none'
|
||||
}}
|
||||
>
|
||||
Exchange Rates By UniRateAPI
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
const [current, setCurrent] = useState<'home' | 'manual' | 'account' | 'appearance'>('home');
|
||||
const [transactions, setTransactions] = useState<Transaction[]>([]);
|
||||
@@ -161,9 +198,17 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
|
||||
// Manual forms moved to ManualManagement page
|
||||
|
||||
// Inline edit state for transaction categories
|
||||
// Inline edit state for transaction editing
|
||||
const [editingTxId, setEditingTxId] = useState<number | null>(null);
|
||||
const [editingCategoryIds, setEditingCategoryIds] = useState<number[]>([]);
|
||||
const [editingAmount, setEditingAmount] = useState<string>('');
|
||||
const [editingDescription, setEditingDescription] = useState<string>('');
|
||||
const [editingDate, setEditingDate] = useState<string>(''); // YYYY-MM-DD
|
||||
|
||||
// Sidebar toggle for mobile
|
||||
const [sidebarOpen, setSidebarOpen] = useState(false);
|
||||
|
||||
|
||||
|
||||
async function loadAll() {
|
||||
setLoading(true);
|
||||
@@ -259,31 +304,59 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
function categoryNameById(id: number) { return categories.find(c => c.id === id)?.name || `#${id}`; }
|
||||
|
||||
|
||||
function beginEditCategories(t: Transaction) {
|
||||
function beginEditTransaction(t: Transaction) {
|
||||
setEditingTxId(t.id);
|
||||
setEditingCategoryIds([...(t.category_ids || [])]);
|
||||
setEditingAmount(String(t.amount));
|
||||
setEditingDescription(t.description || '');
|
||||
setEditingDate(t.date || '');
|
||||
}
|
||||
function cancelEditCategories() {
|
||||
function cancelEditTransaction() {
|
||||
setEditingTxId(null);
|
||||
setEditingCategoryIds([]);
|
||||
setEditingAmount('');
|
||||
setEditingDescription('');
|
||||
setEditingDate('');
|
||||
}
|
||||
async function saveEditCategories() {
|
||||
async function saveEditTransaction() {
|
||||
if (editingTxId == null) return;
|
||||
const amountNum = Number(editingAmount);
|
||||
if (Number.isNaN(amountNum)) {
|
||||
alert('Amount must be a number.');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const updated = await updateTransaction(editingTxId, { category_ids: editingCategoryIds });
|
||||
const updated = await updateTransaction(editingTxId, {
|
||||
amount: amountNum,
|
||||
description: editingDescription,
|
||||
date: editingDate || undefined,
|
||||
category_ids: editingCategoryIds,
|
||||
});
|
||||
setTransactions(prev => prev.map(p => (p.id === updated.id ? updated : p)));
|
||||
cancelEditCategories();
|
||||
// Optionally refresh balance series to reflect changes immediately
|
||||
try { setBalanceSeries(await getBalanceSeries(startDate || undefined, endDate || undefined)); } catch {}
|
||||
cancelEditTransaction();
|
||||
} catch (err: any) {
|
||||
alert(err?.message || 'Failed to update transaction categories');
|
||||
alert(err?.message || 'Failed to update transaction');
|
||||
}
|
||||
}
|
||||
async function handleDeleteTransaction(id: number) {
|
||||
if (!confirm('Delete this transaction? This cannot be undone.')) return;
|
||||
try {
|
||||
await deleteTransaction(id);
|
||||
setTransactions(prev => prev.filter(t => t.id !== id));
|
||||
try { setBalanceSeries(await getBalanceSeries(startDate || undefined, endDate || undefined)); } catch {}
|
||||
} catch (err: any) {
|
||||
alert(err?.message || 'Failed to delete transaction');
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="app-layout">
|
||||
<div className={`app-layout ${sidebarOpen ? 'sidebar-open' : ''}`}>
|
||||
<aside className="sidebar" style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<div>
|
||||
<div className="logo">7Project</div>
|
||||
<nav className="nav">
|
||||
<div className="logo">Finance Tracker</div>
|
||||
<nav className="nav" onClick={() => setSidebarOpen(false)}>
|
||||
<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>
|
||||
@@ -296,6 +369,12 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
</aside>
|
||||
<div className="content">
|
||||
<div className="topbar">
|
||||
<button
|
||||
className="icon-btn hamburger"
|
||||
aria-label="Open menu"
|
||||
aria-expanded={sidebarOpen}
|
||||
onClick={() => setSidebarOpen(true)}
|
||||
>☰</button>
|
||||
<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>
|
||||
@@ -376,39 +455,98 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
<button className="btn primary" disabled={page >= totalPages - 1} onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}>Next</button>
|
||||
</div>
|
||||
</div>
|
||||
<table className="table">
|
||||
<table className="table responsive">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th style={{ textAlign: 'right' }}>Amount</th>
|
||||
<th>Description</th>
|
||||
<th>Categories</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{visible.map(t => (
|
||||
<tr key={t.id}>
|
||||
<td>{t.date || ''}</td>
|
||||
<td className="amount">{formatAmount(t.amount)}</td>
|
||||
<td>{t.description || ''}</td>
|
||||
<td>
|
||||
{/* Date cell */}
|
||||
<td data-label="Date">
|
||||
{editingTxId === t.id ? (
|
||||
<div className="space-y" style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
||||
<select multiple className="input" value={editingCategoryIds.map(String)} onChange={(e) => {
|
||||
<input
|
||||
className="input"
|
||||
type="date"
|
||||
value={editingDate}
|
||||
onChange={(e) => setEditingDate(e.target.value)}
|
||||
/>
|
||||
) : (
|
||||
t.date || ''
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* Amount cell */}
|
||||
<td data-label="Amount" className="amount" style={{ textAlign: 'right' }}>
|
||||
{editingTxId === t.id ? (
|
||||
<input
|
||||
className="input"
|
||||
type="number"
|
||||
step="0.01"
|
||||
value={editingAmount}
|
||||
onChange={(e) => setEditingAmount(e.target.value)}
|
||||
style={{ textAlign: 'right' }}
|
||||
/>
|
||||
) : (
|
||||
formatAmount(t.amount)
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* Description cell */}
|
||||
<td data-label="Description">
|
||||
{editingTxId === t.id ? (
|
||||
<input
|
||||
className="input"
|
||||
type="text"
|
||||
value={editingDescription}
|
||||
onChange={(e) => setEditingDescription(e.target.value)}
|
||||
/>
|
||||
) : (
|
||||
t.description || ''
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* Categories cell */}
|
||||
<td data-label="Categories">
|
||||
{editingTxId === t.id ? (
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
||||
<select
|
||||
multiple
|
||||
className="input"
|
||||
value={editingCategoryIds.map(String)}
|
||||
onChange={(e) => {
|
||||
const opts = Array.from(e.currentTarget.selectedOptions).map(o => Number(o.value));
|
||||
setEditingCategoryIds(opts);
|
||||
}}>
|
||||
}}
|
||||
>
|
||||
{categories.map(c => (
|
||||
<option key={c.id} value={c.id}>{c.name}</option>
|
||||
))}
|
||||
</select>
|
||||
<button className="btn small" onClick={saveEditCategories}>Save</button>
|
||||
<button className="btn small" onClick={cancelEditCategories}>Cancel</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-x" style={{ display: 'flex', alignItems: 'center', gap: 8, justifyContent: 'space-between' }}>
|
||||
<span>{t.category_ids.map(id => categoryNameById(id)).join(', ') || '—'}</span>
|
||||
<button className="btn small" onClick={() => beginEditCategories(t)}>Change</button>
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* Actions cell */}
|
||||
<td data-label="Actions">
|
||||
{editingTxId === t.id ? (
|
||||
<div className="actions" style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
|
||||
<button className="btn small" onClick={saveEditTransaction}>Save</button>
|
||||
<button className="btn small" onClick={cancelEditTransaction}>Cancel</button>
|
||||
<button className="btn small" onClick={() => handleDeleteTransaction(t.id)}>Delete</button>
|
||||
</div>
|
||||
) : (
|
||||
<div className="actions" style={{ display: 'flex', gap: 8, justifyContent: 'flex-end' }}>
|
||||
<button className="btn small" onClick={() => beginEditTransaction(t)}>Edit</button>
|
||||
<button className="btn small" onClick={() => handleDeleteTransaction(t.id)}>Delete</button>
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
@@ -447,6 +585,7 @@ export default function Dashboard({ onLogout }: { onLogout: () => void }) {
|
||||
onClose={() => setMockModalOpen(false)}
|
||||
onGenerate={handleGenerateMockTransactions}
|
||||
/>
|
||||
{sidebarOpen && <div className="backdrop" onClick={() => setSidebarOpen(false)} />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ export default function LoginRegisterPage({ onLoggedIn }: { onLoggedIn: () => vo
|
||||
<input className="input" type="password" required value={password} onChange={(e) => setPassword(e.target.value)} />
|
||||
</div>
|
||||
{mode === 'register' && (
|
||||
<div className="form-row">
|
||||
<div className="space-y">
|
||||
<div>
|
||||
<label className="muted">First name (optional)</label>
|
||||
<input className="input" type="text" value={firstName} onChange={(e) => setFirstName(e.target.value)} />
|
||||
|
||||
@@ -48,26 +48,49 @@ body[data-theme="dark"] {
|
||||
.card h3 { margin: 0 0 12px; }
|
||||
|
||||
/* Forms */
|
||||
.input, select, textarea {
|
||||
/* Common field styles (no custom arrow here) */
|
||||
.input, textarea {
|
||||
width: 100%;
|
||||
padding: 10px 12px;
|
||||
border-radius: 10px;
|
||||
border: 1px solid var(--border);
|
||||
background-color: var(--panel);
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
/* Add these properties specifically for the select element */
|
||||
/* Select-only: show custom dropdown arrow */
|
||||
select.input {
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none;
|
||||
|
||||
padding-right: 32px; /* Add space for the custom arrow */
|
||||
padding-right: 32px; /* room for the arrow */
|
||||
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
|
||||
background-position: right 0.5rem center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 1.5em 1.5em;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.pie-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.pie-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
/* Make charts scale nicely within the cards */
|
||||
.pie-card canvas, .pie-card svg {
|
||||
max-width: 100%;
|
||||
height: auto;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.input:focus, select:focus, textarea:focus {
|
||||
outline: 2px solid var(--primary);
|
||||
outline-offset: 2px;
|
||||
@@ -151,3 +174,117 @@ body.auth-page #root {
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
/* Responsive enhancements */
|
||||
|
||||
/* Off-canvas sidebar + hamburger for mobile */
|
||||
@media (max-width: 900px) {
|
||||
.app-layout {
|
||||
grid-template-columns: 1fr;
|
||||
min-height: 100dvh;
|
||||
position: relative;
|
||||
}
|
||||
.sidebar {
|
||||
position: fixed;
|
||||
inset: 0 auto 0 0;
|
||||
width: 80vw;
|
||||
max-width: 320px;
|
||||
transform: translateX(-100%);
|
||||
transition: transform 200ms ease;
|
||||
z-index: 1000;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.app-layout.sidebar-open .sidebar {
|
||||
transform: translateX(0);
|
||||
}
|
||||
.hamburger {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
margin-right: 8px;
|
||||
}
|
||||
.topbar { position: sticky; top: 0; z-index: 500; }
|
||||
}
|
||||
|
||||
@media (min-width: 901px) {
|
||||
.hamburger { display: none; }
|
||||
}
|
||||
|
||||
/* Backdrop when sidebar is open */
|
||||
.backdrop {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
background: rgba(0,0,0,0.45);
|
||||
z-index: 900;
|
||||
}
|
||||
|
||||
/* Responsive table: convert to card list on small screens */
|
||||
.table.responsive { width: 100%; }
|
||||
@media (max-width: 700px) {
|
||||
.table.responsive thead { display: none; }
|
||||
.table.responsive tbody tr {
|
||||
display: block;
|
||||
border: 1px solid var(--border, #2a2f45);
|
||||
border-radius: 8px;
|
||||
margin-bottom: 12px;
|
||||
overflow: hidden;
|
||||
background: var(--panel);
|
||||
}
|
||||
.table.responsive tbody td {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
text-align: left !important; /* override any right align */
|
||||
}
|
||||
.table.responsive tbody td:last-child { border-bottom: 0; }
|
||||
.table.responsive tbody td::before {
|
||||
content: attr(data-label);
|
||||
font-weight: 600;
|
||||
color: var(--muted);
|
||||
}
|
||||
.table.responsive .actions { width: 100%; justify-content: flex-end; }
|
||||
.table.responsive .amount { font-weight: 600; }
|
||||
}
|
||||
|
||||
/* Filters and controls wrapping */
|
||||
@media (max-width: 900px) {
|
||||
.form-row { grid-template-columns: repeat(2, minmax(0, 1fr)); }
|
||||
}
|
||||
@media (max-width: 700px) {
|
||||
.form-row { grid-template-columns: 1fr; }
|
||||
}
|
||||
|
||||
.table-controls { gap: 12px; }
|
||||
@media (max-width: 700px) {
|
||||
.table-controls { flex-direction: column; align-items: stretch; }
|
||||
.table-controls .actions { width: 100%; }
|
||||
.table-controls .actions .btn { flex: 1 0 auto; }
|
||||
}
|
||||
|
||||
/* Touch-friendly sizes */
|
||||
.btn, .input, select.input { min-height: 40px; }
|
||||
.btn.small { min-height: 36px; }
|
||||
|
||||
/* Connection rows on mobile */
|
||||
@media (max-width: 700px) {
|
||||
.connection-row { flex-direction: column; align-items: stretch; gap: 8px; }
|
||||
.connection-row .btn { width: 100%; }
|
||||
}
|
||||
|
||||
/* Charts should scale to container */
|
||||
.card canvas, .card svg { max-width: 100%; height: auto; display: block; }
|
||||
|
||||
|
||||
/* Horizontal scroll container for wide charts */
|
||||
.chart-scroll {
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
-webkit-overflow-scrolling: touch; /* momentum scroll on iOS */
|
||||
}
|
||||
.chart-inner { min-width: 900px; }
|
||||
|
||||
@@ -52,46 +52,45 @@ flowchart LR
|
||||
|
||||
- Backend: Python, FastAPI, FastAPI Users, SQLAlchemy, Pydantic, Alembic, Celery
|
||||
- Frontend: React, TypeScript, Vite
|
||||
- Database: PostgreSQL
|
||||
- Messaging: RabbitMQ
|
||||
- Cache: Redis
|
||||
- Database: MariaDB (Maxscale)
|
||||
- Background jobs: RabbitMQ, Celery
|
||||
- Containerization/Orchestration: Docker, Docker Compose (dev), Kubernetes, Helm
|
||||
- IaC/Platform: OpenTofu (Terraform), Argo CD, cert-manager, MetalLB, Cloudflare Tunnel, Prometheus
|
||||
- IaC/Platform: Proxmox, Talos, Cloudflare pages, OpenTofu (Terraform), cert-manager, MetalLB, Cloudflare Tunnel, Prometheus, Loki
|
||||
|
||||
## Prerequisites
|
||||
|
||||
### System Requirements
|
||||
|
||||
- Operating System: Linux, macOS, or Windows
|
||||
- Operating System (dev): Linux, macOS, or Windows with Docker support
|
||||
- Operating System (prod): Linux with kubernetes
|
||||
- Minimum RAM: 4 GB (8 GB recommended for running backend, frontend, and database together)
|
||||
- Storage: 2 GB free (Docker images may require additional space)
|
||||
- Storage: 4 GB free (Docker images may require additional space)
|
||||
|
||||
### Required Software
|
||||
|
||||
- Docker Desktop or Docker Engine 24+
|
||||
- Docker Compose v2+
|
||||
- Node.js 20+ and npm 10+ (for local frontend dev/build)
|
||||
- Python 3.12+ (for local backend dev outside Docker)
|
||||
- PostgreSQL 15+ (optional if running DB outside Docker)
|
||||
- Helm 3.12+ and kubectl 1.29+ (for Kubernetes deployment)
|
||||
- OpenTofu 1.7+ (for infrastructure provisioning)
|
||||
- Docker Desktop or Docker Engine
|
||||
- Docker Compose
|
||||
- Node.js and npm
|
||||
- Python 3.12+
|
||||
- MariaDB 11
|
||||
- Helm 3.12+ and kubectl 1.29+
|
||||
- OpenTofu
|
||||
|
||||
### Environment Variables (common)
|
||||
|
||||
# TODO: UPDATE
|
||||
- Backend: SECRET, FRONTEND_URL, BACKEND_URL, DATABASE_URL, RABBITMQ_URL, REDIS_URL
|
||||
|
||||
- OAuth vars (Backend): MOJEID_CLIENT_ID/SECRET, BANKID_CLIENT_ID/SECRET (optional)
|
||||
- Frontend: VITE_BACKEND_URL
|
||||
|
||||
### Dependencies (key libraries)
|
||||
I am not sure what is meant by "key libraries"
|
||||
|
||||
Backend: FastAPI, fastapi-users, SQLAlchemy, pydantic v2, Alembic, Celery
|
||||
Backend: FastAPI, fastapi-users, SQLAlchemy, pydantic v2, Alembic, Celery, uvicorn
|
||||
Frontend: React, TypeScript, Vite
|
||||
Services: PostgreSQL, RabbitMQ, Redis
|
||||
|
||||
## Build Instructions
|
||||
## Local development
|
||||
|
||||
You can run the project with Docker Compose (recommended for local development) or run services manually.
|
||||
You can run the project with Docker Compose and Python virtual environment for testing and dev purposes
|
||||
|
||||
### 1) Clone the Repository
|
||||
|
||||
@@ -103,9 +102,8 @@ cd 7project
|
||||
### 2) Install dependencies
|
||||
Backend
|
||||
```bash
|
||||
# In 7project/backend
|
||||
python3.12 -m venv .venv
|
||||
source .venv/bin/activate # Windows: .venv\Scripts\activate
|
||||
python3 -m venv .venv
|
||||
source .venv/bin/activate
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
Frontend
|
||||
@@ -120,9 +118,10 @@ Backend
|
||||
```bash
|
||||
# From the 7project/ directory
|
||||
docker compose up --build
|
||||
# This starts: PostgreSQL, RabbitMQ/Redis (if defined)
|
||||
# This starts: MariaDB, RabbitMQ
|
||||
|
||||
# Set environment variables (or create .env file)
|
||||
# TODO: fix
|
||||
export SECRET=CHANGE_ME_SECRET
|
||||
export BACKEND_URL=http://127.0.0.1:8000
|
||||
export FRONTEND_URL=http://localhost:5173
|
||||
@@ -131,13 +130,12 @@ export RABBITMQ_URL=amqp://guest:guest@127.0.0.1:5672/
|
||||
export REDIS_URL=redis://127.0.0.1:6379/0
|
||||
|
||||
# Apply DB migrations (Alembic)
|
||||
# From 7project/backend
|
||||
alembic upgrade head
|
||||
# From 7project
|
||||
bash upgrade_database.sh
|
||||
|
||||
# Run API
|
||||
uvicorn app.app:fastApi --reload --host 0.0.0.0 --port 8000
|
||||
|
||||
# Run Celery worker (optional, for emails/background tasks)
|
||||
celery -A app.celery_app.celery_app worker -l info
|
||||
```
|
||||
|
||||
@@ -152,18 +150,22 @@ npm run dev
|
||||
- Backend default: http://127.0.0.1:8000 (OpenAPI at /docs)
|
||||
- Frontend default: http://localhost:5173
|
||||
|
||||
If needed, adjust compose services/ports in compose.yml.
|
||||
|
||||
## Build Instructions
|
||||
### Backend
|
||||
```bash
|
||||
# run in project7/backend
|
||||
docker buildx build --platform linux/amd64,linux/arm64 -t your_container_registry/your_name --push .
|
||||
```
|
||||
### Frontend
|
||||
```bash
|
||||
# run in project7/frontend
|
||||
npm ci
|
||||
npm run build
|
||||
```
|
||||
|
||||
## Deployment Instructions
|
||||
|
||||
### Local (Docker Compose)
|
||||
|
||||
Described in the previous section (Manual Local Run)
|
||||
|
||||
### Kubernetes (via OpenTofu + Helm)
|
||||
|
||||
1) Provision platform services (RabbitMQ/Redis/ingress/tunnel/etc.) with OpenTofu
|
||||
1) Install base services to cluster
|
||||
```bash
|
||||
cd tofu
|
||||
# copy and edit variables
|
||||
|
||||
@@ -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
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user