mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 23:20:56 +01:00
Compare commits
2 Commits
c21af2732e
...
1f5d6f127f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f5d6f127f | ||
|
|
3a7580c315 |
@@ -23,9 +23,21 @@ function getBaseUrl() {
|
|||||||
return base || '';
|
return base || '';
|
||||||
}
|
}
|
||||||
|
|
||||||
function authHeaders() {
|
function getHeaders(contentType: 'json' | 'form' | 'none' = 'json'): Record<string, string> {
|
||||||
const token = localStorage.getItem('token');
|
const token = localStorage.getItem('token');
|
||||||
return token ? { Authorization: `Bearer ${token}` } : {};
|
const headers: Record<string, string> = {};
|
||||||
|
|
||||||
|
if (contentType === 'json') {
|
||||||
|
headers['Content-Type'] = 'application/json';
|
||||||
|
} else if (contentType === 'form') {
|
||||||
|
headers['Content-Type'] = 'application/x-www-form-urlencoded';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
headers['Authorization'] = `Bearer ${token}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function login(email: string, password: string): Promise<void> {
|
export async function login(email: string, password: string): Promise<void> {
|
||||||
@@ -62,7 +74,7 @@ export async function register(email: string, password: string, first_name?: str
|
|||||||
|
|
||||||
export async function getCategories(): Promise<Category[]> {
|
export async function getCategories(): Promise<Category[]> {
|
||||||
const res = await fetch(`${getBaseUrl()}/categories/`, {
|
const res = await fetch(`${getBaseUrl()}/categories/`, {
|
||||||
headers: { 'Content-Type': 'application/json', ...authHeaders() },
|
headers: getHeaders(),
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error('Failed to load categories');
|
if (!res.ok) throw new Error('Failed to load categories');
|
||||||
return res.json();
|
return res.json();
|
||||||
@@ -77,7 +89,7 @@ export type CreateTransactionInput = {
|
|||||||
export async function createTransaction(input: CreateTransactionInput): Promise<Transaction> {
|
export async function createTransaction(input: CreateTransactionInput): Promise<Transaction> {
|
||||||
const res = await fetch(`${getBaseUrl()}/transactions/create`, {
|
const res = await fetch(`${getBaseUrl()}/transactions/create`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json', ...authHeaders() },
|
headers: getHeaders(),
|
||||||
body: JSON.stringify(input),
|
body: JSON.stringify(input),
|
||||||
});
|
});
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
@@ -89,7 +101,7 @@ export async function createTransaction(input: CreateTransactionInput): Promise<
|
|||||||
|
|
||||||
export async function getTransactions(): Promise<Transaction[]> {
|
export async function getTransactions(): Promise<Transaction[]> {
|
||||||
const res = await fetch(`${getBaseUrl()}/transactions/`, {
|
const res = await fetch(`${getBaseUrl()}/transactions/`, {
|
||||||
headers: { 'Content-Type': 'application/json', ...authHeaders() },
|
headers: getHeaders(),
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error('Failed to load transactions');
|
if (!res.ok) throw new Error('Failed to load transactions');
|
||||||
return res.json();
|
return res.json();
|
||||||
@@ -107,7 +119,7 @@ export type User = {
|
|||||||
|
|
||||||
export async function getMe(): Promise<User> {
|
export async function getMe(): Promise<User> {
|
||||||
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
||||||
headers: { 'Content-Type': 'application/json', ...authHeaders() },
|
headers: getHeaders(),
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error('Failed to load user');
|
if (!res.ok) throw new Error('Failed to load user');
|
||||||
return res.json();
|
return res.json();
|
||||||
@@ -117,7 +129,7 @@ export type UpdateMeInput = Partial<Pick<User, 'first_name' | 'last_name'>> & {
|
|||||||
export async function updateMe(input: UpdateMeInput): Promise<User> {
|
export async function updateMe(input: UpdateMeInput): Promise<User> {
|
||||||
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
||||||
method: 'PATCH',
|
method: 'PATCH',
|
||||||
headers: { 'Content-Type': 'application/json', ...authHeaders() },
|
headers: getHeaders(),
|
||||||
body: JSON.stringify(input),
|
body: JSON.stringify(input),
|
||||||
});
|
});
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
@@ -130,7 +142,7 @@ export async function updateMe(input: UpdateMeInput): Promise<User> {
|
|||||||
export async function deleteMe(): Promise<void> {
|
export async function deleteMe(): Promise<void> {
|
||||||
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
const res = await fetch(`${getBaseUrl()}/users/me`, {
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
headers: { ...authHeaders() },
|
headers: getHeaders(),
|
||||||
});
|
});
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
const text = await res.text();
|
const text = await res.text();
|
||||||
|
|||||||
38
7project/frontend/src/appearance.ts
Normal file
38
7project/frontend/src/appearance.ts
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
export type Theme = 'system' | 'light' | 'dark';
|
||||||
|
export type FontSize = 'small' | 'medium' | 'large';
|
||||||
|
|
||||||
|
const THEME_KEY = 'app_theme';
|
||||||
|
const FONT_KEY = 'app_font_size';
|
||||||
|
|
||||||
|
export function applyTheme(theme: Theme) {
|
||||||
|
const body = document.body;
|
||||||
|
const effective = theme === 'system' ? (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light') : theme;
|
||||||
|
body.setAttribute('data-theme', effective);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function applyFontSize(size: FontSize) {
|
||||||
|
const root = document.documentElement;
|
||||||
|
const map: Record<FontSize, string> = {
|
||||||
|
small: '14px',
|
||||||
|
medium: '16px',
|
||||||
|
large: '18px',
|
||||||
|
};
|
||||||
|
root.style.fontSize = map[size];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveAppearance(theme: Theme, size: FontSize) {
|
||||||
|
localStorage.setItem(THEME_KEY, theme);
|
||||||
|
localStorage.setItem(FONT_KEY, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function loadAppearance(): { theme: Theme; size: FontSize } {
|
||||||
|
const theme = (localStorage.getItem(THEME_KEY) as Theme) || 'light';
|
||||||
|
const size = (localStorage.getItem(FONT_KEY) as FontSize) || 'medium';
|
||||||
|
return { theme, size };
|
||||||
|
}
|
||||||
|
|
||||||
|
export function applyAppearanceFromStorage() {
|
||||||
|
const { theme, size } = loadAppearance();
|
||||||
|
applyTheme(theme);
|
||||||
|
applyFontSize(size);
|
||||||
|
}
|
||||||
87
7project/frontend/src/pages/AccountPage.tsx
Normal file
87
7project/frontend/src/pages/AccountPage.tsx
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { deleteMe, getMe, type UpdateMeInput, type User, updateMe } from '../api';
|
||||||
|
|
||||||
|
export default function AccountPage({ onDeleted }: { onDeleted: () => void }) {
|
||||||
|
const [user, setUser] = useState<User | null>(null);
|
||||||
|
const [firstName, setFirstName] = useState('');
|
||||||
|
const [lastName, setLastName] = useState('');
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [saving, setSaving] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const u = await getMe();
|
||||||
|
setUser(u);
|
||||||
|
setFirstName(u.first_name || '');
|
||||||
|
setLastName(u.last_name || '');
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || 'Failed to load account');
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
async function handleSave(e: React.FormEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
setSaving(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const payload: UpdateMeInput = { first_name: firstName || null as any, last_name: lastName || null as any };
|
||||||
|
const updated = await updateMe(payload);
|
||||||
|
setUser(updated);
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || 'Failed to update');
|
||||||
|
} finally {
|
||||||
|
setSaving(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDelete() {
|
||||||
|
if (!confirm('Are you sure you want to delete your account? This cannot be undone.')) return;
|
||||||
|
try {
|
||||||
|
await deleteMe();
|
||||||
|
onDeleted();
|
||||||
|
} catch (e: any) {
|
||||||
|
alert(e?.message || 'Failed to delete account');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card">
|
||||||
|
<h3>Account</h3>
|
||||||
|
{loading ? (
|
||||||
|
<div>Loading…</div>
|
||||||
|
) : error ? (
|
||||||
|
<div style={{ color: 'crimson' }}>{error}</div>
|
||||||
|
) : !user ? (
|
||||||
|
<div>Not signed in</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y">
|
||||||
|
<div className="muted">Email: <strong>{user.email}</strong></div>
|
||||||
|
<form onSubmit={handleSave} className="space-y">
|
||||||
|
<div className="form-row">
|
||||||
|
<div>
|
||||||
|
<label className="muted">First name</label>
|
||||||
|
<input className="input" value={firstName} onChange={(e) => setFirstName(e.target.value)} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="muted">Last name</label>
|
||||||
|
<input className="input" value={lastName} onChange={(e) => setLastName(e.target.value)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="actions" style={{ justifyContent: 'flex-end' }}>
|
||||||
|
<button className="btn primary" type="submit" disabled={saving}>{saving ? 'Saving…' : 'Save changes'}</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<div className="actions" style={{ justifyContent: 'space-between' }}>
|
||||||
|
<div className="muted"></div>
|
||||||
|
<button className="btn" style={{ borderColor: 'crimson', color: 'crimson' }} onClick={handleDelete}>Delete account</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
49
7project/frontend/src/pages/AppearancePage.tsx
Normal file
49
7project/frontend/src/pages/AppearancePage.tsx
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { applyFontSize, applyTheme, loadAppearance, saveAppearance, type FontSize, type Theme } from '../appearance';
|
||||||
|
|
||||||
|
export default function AppearancePage() {
|
||||||
|
const [theme, setTheme] = useState<Theme>('light');
|
||||||
|
const [size, setSize] = useState<FontSize>('medium');
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const { theme, size } = loadAppearance();
|
||||||
|
setTheme(theme);
|
||||||
|
setSize(size);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
function onThemeChange(next: Theme) {
|
||||||
|
setTheme(next);
|
||||||
|
applyTheme(next);
|
||||||
|
saveAppearance(next, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onSizeChange(next: FontSize) {
|
||||||
|
setSize(next);
|
||||||
|
applyFontSize(next);
|
||||||
|
saveAppearance(theme, next);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<section className="card">
|
||||||
|
<h3>Appearance</h3>
|
||||||
|
<div className="space-y">
|
||||||
|
<div>
|
||||||
|
<div className="muted" style={{ marginBottom: 6 }}>Theme</div>
|
||||||
|
<div className="segmented">
|
||||||
|
<button className={theme === 'light' ? 'active' : ''} onClick={() => onThemeChange('light')}>Light</button>
|
||||||
|
<button className={theme === 'dark' ? 'active' : ''} onClick={() => onThemeChange('dark')}>Dark</button>
|
||||||
|
<button className={theme === 'system' ? 'active' : ''} onClick={() => onThemeChange('system')}>System</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div className="muted" style={{ marginBottom: 6 }}>Font size</div>
|
||||||
|
<div className="segmented">
|
||||||
|
<button className={size === 'small' ? 'active' : ''} onClick={() => onSizeChange('small')}>Small</button>
|
||||||
|
<button className={size === 'medium' ? 'active' : ''} onClick={() => onSizeChange('medium')}>Medium</button>
|
||||||
|
<button className={size === 'large' ? 'active' : ''} onClick={() => onSizeChange('large')}>Large</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
85
7project/frontend/src/ui.css
Normal file
85
7project/frontend/src/ui.css
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
:root {
|
||||||
|
--bg: #f7f7fb;
|
||||||
|
--panel: #ffffff;
|
||||||
|
--text: #9aa3b2;
|
||||||
|
--muted: #6b7280;
|
||||||
|
--primary: #6f49fe;
|
||||||
|
--primary-600: #5a37fb;
|
||||||
|
--border: #e5e7eb;
|
||||||
|
--radius: 12px;
|
||||||
|
--shadow: 0 1px 2px rgba(0,0,0,0.04), 0 8px 24px rgba(0,0,0,0.08);
|
||||||
|
|
||||||
|
font-family: Inter, ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji";
|
||||||
|
color: var(--text);
|
||||||
|
}
|
||||||
|
|
||||||
|
* { box-sizing: border-box; }
|
||||||
|
|
||||||
|
html, body, #root { height: 100%; }
|
||||||
|
|
||||||
|
body { background: var(--bg); margin: 0; display: block; }
|
||||||
|
|
||||||
|
/* Dark theme variables */
|
||||||
|
body[data-theme="dark"] {
|
||||||
|
--bg: #161a2b;
|
||||||
|
--panel: #283046;
|
||||||
|
--text: #283046;
|
||||||
|
--muted: #cbd5e1;
|
||||||
|
--primary: #8b7bff;
|
||||||
|
--primary-600: #7b69ff;
|
||||||
|
--border: #283046;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Layout */
|
||||||
|
.app-layout { display: grid; grid-template-columns: 260px 1fr; height: 100%; }
|
||||||
|
.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; height: 100%; }
|
||||||
|
.topbar { height: 64px; display: flex; 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; max-width: 1100px; margin: auto; }
|
||||||
|
|
||||||
|
/* Cards */
|
||||||
|
.card { background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius); box-shadow: var(--shadow); padding: 16px; }
|
||||||
|
.card h3 { margin: 0 0 12px; }
|
||||||
|
|
||||||
|
/* Forms */
|
||||||
|
.input, select, textarea { width: 100%; padding: 10px 12px; border-radius: 10px; border: 1px solid var(--border); background: #fff; color: var(--text); }
|
||||||
|
.input:focus, select:focus, textarea:focus { outline: 2px solid var(--primary); border-color: var(--primary); }
|
||||||
|
.form-row { display: grid; gap: 8px; grid-template-columns: repeat(4, minmax(0,1fr)); }
|
||||||
|
.form-row > * { min-width: 140px; }
|
||||||
|
.actions { display: flex; align-items: center; gap: 8px; }
|
||||||
|
|
||||||
|
/* Buttons */
|
||||||
|
.btn { border: 1px solid var(--border); background: #fff; color: var(--text); padding: 10px 14px; border-radius: 10px; cursor: pointer; }
|
||||||
|
.btn.primary { background: var(--primary); border-color: var(--primary); color: #fff; }
|
||||||
|
.btn.primary:hover { background: var(--primary-600); }
|
||||||
|
.btn.ghost { background: transparent; color: var(--muted); }
|
||||||
|
|
||||||
|
/* Tables */
|
||||||
|
.table { width: 100%; border-collapse: collapse; }
|
||||||
|
.table th, .table td { padding: 10px; border-bottom: 1px solid var(--border); }
|
||||||
|
.table th { text-align: left; color: var(--muted); font-weight: 600; }
|
||||||
|
.table td.amount { text-align: right; font-variant-numeric: tabular-nums; }
|
||||||
|
|
||||||
|
/* Segmented control */
|
||||||
|
.segmented { display: inline-flex; background: #f1f5f9; border-radius: 10px; padding: 4px; border: 1px solid var(--border); }
|
||||||
|
.segmented button { border: 0; background: transparent; padding: 8px 12px; border-radius: 8px; color: var(--muted); cursor: pointer; }
|
||||||
|
.segmented button.active { background: #fff; color: var(--text); box-shadow: var(--shadow); }
|
||||||
|
|
||||||
|
/* Auth layout */
|
||||||
|
body.auth-page #root {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-height: 100vh;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Utility */
|
||||||
|
.muted { color: var(--muted); }
|
||||||
|
.space-y > * + * { margin-top: 12px; }
|
||||||
Reference in New Issue
Block a user