Add self-hosted auth, admin API, and owner web dashboard

- Replace Clerk with self-hosted JWT auth (register/login/verify, bcrypt
  passwords, Gmail OTP with console fallback)
- Add lib/db.ts pg pool + transaction helpers; seed script migrates legacy
  Clerk-era schema (drop clerk_id, enforce UUID ids and unique email)
- Add owner-gated admin API: stats, users, drivers CRUD, rides
- Add dashboard/ Vite React owner dashboard (login, overview, users,
  fleet, rides) with dev-server proxy to avoid Expo CORS middleware
- Add scripts/set-owner.mjs for role management
This commit is contained in:
Krikorios
2026-08-23 16:38:41 +03:00
parent fbe92c9d16
commit a0b297285a
75 changed files with 5158 additions and 2837 deletions
+64
View File
@@ -0,0 +1,64 @@
import { useState } from "react";
import "./index.css";
import Login from "./Login";
import Stats from "./pages/Stats";
import Users from "./pages/Users";
import Drivers from "./pages/Drivers";
import Rides from "./pages/Rides";
import { clearToken, getToken } from "./lib/api";
type Page = "stats" | "users" | "drivers" | "rides";
const NAV: { key: Page; label: string }[] = [
{ key: "stats", label: "Overview" },
{ key: "users", label: "Users" },
{ key: "drivers", label: "Drivers & Fleet" },
{ key: "rides", label: "Rides & Payments" },
];
export default function App() {
const [authed, setAuthed] = useState(Boolean(getToken()));
const [page, setPage] = useState<Page>("stats");
if (!authed) {
return <Login onDone={() => setAuthed(true)} />;
}
return (
<>
<nav className="sidebar">
<h1>Waseel Owner</h1>
{NAV.map((item) => (
<a
key={item.key}
href="#"
className={page === item.key ? "active" : ""}
onClick={(e) => {
e.preventDefault();
setPage(item.key);
}}
>
{item.label}
</a>
))}
<a
href="#"
style={{ marginTop: "auto" }}
onClick={(e) => {
e.preventDefault();
clearToken();
setAuthed(false);
}}
>
Sign out
</a>
</nav>
<main className="main">
{page === "stats" && <Stats />}
{page === "users" && <Users />}
{page === "drivers" && <Drivers />}
{page === "rides" && <Rides />}
</main>
</>
);
}
+53
View File
@@ -0,0 +1,53 @@
import { useState, type FormEvent } from "react";
import { api, setToken } from "./lib/api";
export default function Login({ onDone }: { onDone: () => void }) {
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const submit = async (e: FormEvent) => {
e.preventDefault();
setBusy(true);
setError(null);
try {
const res = await api<{ data: { token: string; user: { role: string | null } } }>(
"/auth/login",
{ method: "POST", body: JSON.stringify({ email, password }) },
);
if (res.data.user.role !== "owner") {
setError("This account does not have owner access.");
return;
}
setToken(res.data.token);
onDone();
} catch (err) {
setError((err as Error).message);
} finally {
setBusy(false);
}
};
return (
<form className="login-wrap" onSubmit={submit}>
<h2>Waseel Owner</h2>
<input
type="email"
placeholder="Email"
value={email}
onChange={(e) => setEmail(e.target.value)}
required
/>
<input
type="password"
placeholder="Password"
value={password}
onChange={(e) => setPassword(e.target.value)}
required
/>
{error && <div className="error">{error}</div>}
<button disabled={busy}>{busy ? "Signing in…" : "Sign in"}</button>
</form>
);
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.5 KiB

+250
View File
@@ -0,0 +1,250 @@
:root {
--bg: #0f1117;
--panel: #171a23;
--border: #262b38;
--text: #e8eaf0;
--muted: #8a91a5;
--accent: #4f7cff;
--danger: #e5484d;
--success: #30a46c;
font-family: Inter, system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
}
* {
box-sizing: border-box;
}
body {
margin: 0;
background: var(--bg);
color: var(--text);
}
#root {
display: flex;
min-height: 100vh;
}
.sidebar {
width: 220px;
background: var(--panel);
border-right: 1px solid var(--border);
padding: 20px 12px;
display: flex;
flex-direction: column;
gap: 4px;
}
.sidebar h1 {
font-size: 16px;
margin: 0 8px 18px;
}
.sidebar a {
color: var(--muted);
text-decoration: none;
padding: 9px 12px;
border-radius: 8px;
font-size: 14px;
}
.sidebar a.active,
.sidebar a:hover {
background: var(--bg);
color: var(--text);
}
.main {
flex: 1;
padding: 28px 32px;
max-width: 1200px;
}
.main h2 {
margin-top: 0;
}
.cards {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
gap: 14px;
margin-bottom: 28px;
}
.card {
background: var(--panel);
border: 1px solid var(--border);
border-radius: 12px;
padding: 18px;
}
.card .label {
color: var(--muted);
font-size: 13px;
}
.card .value {
font-size: 26px;
font-weight: 600;
margin-top: 6px;
}
table {
width: 100%;
border-collapse: collapse;
background: var(--panel);
border: 1px solid var(--border);
border-radius: 12px;
overflow: hidden;
font-size: 14px;
}
th,
td {
text-align: left;
padding: 10px 14px;
border-bottom: 1px solid var(--border);
}
th {
color: var(--muted);
font-weight: 500;
font-size: 13px;
}
tr:last-child td {
border-bottom: none;
}
.badge {
display: inline-block;
padding: 2px 9px;
border-radius: 999px;
font-size: 12px;
border: 1px solid var(--border);
}
.badge.owner { color: #b088ff; }
.badge.driver { color: #4f7cff; }
.badge.rider { color: #8a91a5; }
.badge.paid { color: var(--success); border-color: var(--success); }
.badge.unpaid { color: var(--danger); border-color: var(--danger); }
button,
select,
input {
font: inherit;
color: inherit;
}
button {
background: var(--accent);
border: none;
border-radius: 8px;
padding: 8px 14px;
cursor: pointer;
}
button.secondary {
background: transparent;
border: 1px solid var(--border);
}
button.danger {
background: transparent;
border: 1px solid var(--danger);
color: var(--danger);
}
input,
select {
background: var(--bg);
border: 1px solid var(--border);
border-radius: 8px;
padding: 8px 10px;
}
.toolbar {
display: flex;
gap: 10px;
margin-bottom: 14px;
align-items: center;
}
.error {
color: var(--danger);
margin: 10px 0;
}
.login-wrap {
margin: auto;
width: 340px;
background: var(--panel);
border: 1px solid var(--border);
border-radius: 14px;
padding: 28px;
display: flex;
flex-direction: column;
gap: 12px;
}
.login-wrap h2 {
margin: 0;
}
.chart {
display: flex;
align-items: flex-end;
gap: 6px;
height: 160px;
background: var(--panel);
border: 1px solid var(--border);
border-radius: 12px;
padding: 16px;
}
.chart .bar {
flex: 1;
background: var(--accent);
border-radius: 4px 4px 0 0;
min-height: 2px;
position: relative;
}
.chart .bar span {
position: absolute;
bottom: -22px;
left: 50%;
transform: translateX(-50%);
font-size: 10px;
color: var(--muted);
}
.modal-backdrop {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: center;
}
.modal {
background: var(--panel);
border: 1px solid var(--border);
border-radius: 14px;
padding: 24px;
width: 420px;
display: flex;
flex-direction: column;
gap: 10px;
}
.modal input {
width: 100%;
}
.row-actions {
display: flex;
gap: 6px;
}
+50
View File
@@ -0,0 +1,50 @@
const API_URL =
(import.meta.env.VITE_API_URL as string | undefined) ?? "";
let authToken: string | null = localStorage.getItem("owner_token");
export const setToken = (token: string) => {
authToken = token;
localStorage.setItem("owner_token", token);
};
export const clearToken = () => {
authToken = null;
localStorage.removeItem("owner_token");
};
export const getToken = () => authToken;
export class ApiError extends Error {
status: number;
constructor(message: string, status: number) {
super(message);
this.status = status;
}
}
export const api = async <T>(
path: string,
options: RequestInit = {},
): Promise<T> => {
const headers = new Headers(options.headers);
if (!headers.has("Content-Type") && options.body) {
headers.set("Content-Type", "application/json");
}
if (authToken) headers.set("Authorization", `Bearer ${authToken}`);
const res = await fetch(`${API_URL}${path}`, { ...options, headers });
if (res.status === 401) {
clearToken();
throw new ApiError("Session expired. Please sign in again.", 401);
}
const body = await res.json().catch(() => ({}));
if (!res.ok) {
throw new ApiError(body.error ?? `Request failed (${res.status})`, res.status);
}
return body as T;
};
+10
View File
@@ -0,0 +1,10 @@
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import App from "./App";
import "./index.css";
createRoot(document.getElementById("root")!).render(
<StrictMode>
<App />
</StrictMode>,
);
+199
View File
@@ -0,0 +1,199 @@
import { useCallback, useEffect, useState, type FormEvent } from "react";
import { api } from "../lib/api";
type Driver = {
id: number;
first_name: string;
last_name: string;
profile_image_url: string | null;
car_image_url: string | null;
car_seats: number;
rating: string;
total_rides: number;
revenue: number;
};
const EMPTY = {
first_name: "",
last_name: "",
profile_image_url: "",
car_image_url: "",
car_seats: 4,
rating: 4.5,
};
export default function Drivers() {
const [drivers, setDrivers] = useState<Driver[]>([]);
const [error, setError] = useState<string | null>(null);
const [editing, setEditing] = useState<Driver | "new" | null>(null);
const load = useCallback(async () => {
try {
const res = await api<{ data: Driver[] }>("/admin/drivers");
setDrivers(res.data);
setError(null);
} catch (e) {
setError((e as Error).message);
}
}, []);
useEffect(() => {
load();
}, [load]);
const remove = async (id: number) => {
if (!confirm("Delete this driver?")) return;
try {
await api(`/admin/drivers/${id}`, { method: "DELETE" });
await load();
} catch (e) {
setError((e as Error).message);
}
};
return (
<>
<h2>Drivers & fleet</h2>
<div className="toolbar">
<button onClick={() => setEditing("new")}>Add driver</button>
</div>
{error && <div className="error">{error}</div>}
<table>
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Seats</th>
<th>Rating</th>
<th>Rides</th>
<th>Revenue</th>
<th></th>
</tr>
</thead>
<tbody>
{drivers.map((d) => (
<tr key={d.id}>
<td>{d.id}</td>
<td>
{d.first_name} {d.last_name}
</td>
<td>{d.car_seats}</td>
<td>{d.rating}</td>
<td>{d.total_rides}</td>
<td>{d.revenue.toLocaleString()}</td>
<td>
<div className="row-actions">
<button className="secondary" onClick={() => setEditing(d)}>
Edit
</button>
<button className="danger" onClick={() => remove(d.id)}>
Delete
</button>
</div>
</td>
</tr>
))}
</tbody>
</table>
{editing && (
<DriverForm
initial={editing === "new" ? null : editing}
onClose={() => setEditing(null)}
onSaved={() => {
setEditing(null);
load();
}}
/>
)}
</>
);
}
function DriverForm({
initial,
onClose,
onSaved,
}: {
initial: Driver | null;
onClose: () => void;
onSaved: () => void;
}) {
const [form, setForm] = useState(
initial
? {
first_name: initial.first_name,
last_name: initial.last_name,
profile_image_url: initial.profile_image_url ?? "",
car_image_url: initial.car_image_url ?? "",
car_seats: initial.car_seats,
rating: Number(initial.rating),
}
: { ...EMPTY },
);
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const set = (key: keyof typeof form) => (e: { target: { value: string } }) =>
setForm((f) => ({
...f,
[key]:
key === "car_seats" || key === "rating"
? Number(e.target.value)
: e.target.value,
}));
const submit = async (e: FormEvent) => {
e.preventDefault();
setBusy(true);
try {
await api(initial ? `/admin/drivers/${initial.id}` : "/admin/drivers", {
method: initial ? "PATCH" : "POST",
body: JSON.stringify(form),
});
onSaved();
} catch (err) {
setError((err as Error).message);
} finally {
setBusy(false);
}
};
return (
<div className="modal-backdrop" onClick={onClose}>
<form className="modal" onClick={(e) => e.stopPropagation()} onSubmit={submit}>
<h3>{initial ? `Edit driver #${initial.id}` : "New driver"}</h3>
<input placeholder="First name" value={form.first_name} onChange={set("first_name")} required />
<input placeholder="Last name" value={form.last_name} onChange={set("last_name")} required />
<input placeholder="Profile image URL" value={form.profile_image_url} onChange={set("profile_image_url")} />
<input placeholder="Car image URL" value={form.car_image_url} onChange={set("car_image_url")} />
<label>
Seats{" "}
<select value={form.car_seats} onChange={set("car_seats")}>
{[2, 4, 6, 7].map((n) => (
<option key={n} value={n}>
{n}
</option>
))}
</select>
</label>
<input
type="number"
step="0.1"
min="1"
max="5"
placeholder="Rating"
value={form.rating}
onChange={set("rating")}
/>
{error && <div className="error">{error}</div>}
<div className="row-actions">
<button disabled={busy}>{busy ? "Saving…" : "Save"}</button>
<button type="button" className="secondary" onClick={onClose}>
Cancel
</button>
</div>
</form>
</div>
);
}
+88
View File
@@ -0,0 +1,88 @@
import { useCallback, useEffect, useState } from "react";
import { api } from "../lib/api";
type Ride = {
ride_id: number;
origin_address: string;
destination_address: string;
ride_time: number;
fare_price: number;
payment_status: string;
created_at: string;
user_email: string;
driver: { driver_id: number; name: string; rating: number };
};
export default function Rides() {
const [rides, setRides] = useState<Ride[]>([]);
const [status, setStatus] = useState("");
const [error, setError] = useState<string | null>(null);
const load = useCallback(async (status: string) => {
try {
const res = await api<{ data: Ride[] }>(
`/admin/rides${status ? `?status=${encodeURIComponent(status)}` : ""}`,
);
setRides(res.data);
setError(null);
} catch (e) {
setError((e as Error).message);
}
}, []);
useEffect(() => {
load(status);
}, [load, status]);
return (
<>
<h2>Rides & payments</h2>
<div className="toolbar">
<select value={status} onChange={(e) => setStatus(e.target.value)}>
<option value="">All payments</option>
<option value="paid">Paid</option>
<option value="unpaid">Unpaid</option>
</select>
</div>
{error && <div className="error">{error}</div>}
<table>
<thead>
<tr>
<th>ID</th>
<th>Route</th>
<th>User</th>
<th>Driver</th>
<th>Time (min)</th>
<th>Fare</th>
<th>Payment</th>
<th>Date</th>
</tr>
</thead>
<tbody>
{rides.map((r) => (
<tr key={r.ride_id}>
<td>{r.ride_id}</td>
<td>
{r.origin_address} {r.destination_address}
</td>
<td>{r.user_email}</td>
<td>{r.driver.name}</td>
<td>{r.ride_time}</td>
<td>{r.fare_price.toLocaleString()}</td>
<td>
<span
className={`badge ${
r.payment_status.toLowerCase() === "paid" ? "paid" : "unpaid"
}`}
>
{r.payment_status}
</span>
</td>
<td>{new Date(r.created_at).toLocaleString()}</td>
</tr>
))}
</tbody>
</table>
</>
);
}
+82
View File
@@ -0,0 +1,82 @@
import { useEffect, useState } from "react";
import { api } from "../lib/api";
type Stats = {
totals: { users: number; drivers: number; rides: number; revenue: number };
trend: { day: string; rides: number; revenue: number }[];
topDrivers: { driver_id: number; name: string; rides: number; revenue: number }[];
};
export default function Stats() {
const [stats, setStats] = useState<Stats | null>(null);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
api<{ data: Stats }>("/admin/stats")
.then((r) => setStats(r.data))
.catch((e) => setError(e.message));
}, []);
if (error) return <div className="error">{error}</div>;
if (!stats) return <div>Loading</div>;
const maxRides = Math.max(1, ...stats.trend.map((d) => d.rides));
return (
<>
<h2>Overview</h2>
<div className="cards">
<div className="card">
<div className="label">Users</div>
<div className="value">{stats.totals.users}</div>
</div>
<div className="card">
<div className="label">Drivers</div>
<div className="value">{stats.totals.drivers}</div>
</div>
<div className="card">
<div className="label">Rides</div>
<div className="value">{stats.totals.rides}</div>
</div>
<div className="card">
<div className="label">Revenue (paid)</div>
<div className="value">{stats.totals.revenue.toLocaleString()}</div>
</div>
</div>
<h2>Rides last 14 days</h2>
<div className="chart" style={{ marginBottom: 40 }}>
{stats.trend.map((d) => (
<div
key={d.day}
className="bar"
style={{ height: `${(d.rides / maxRides) * 100}%` }}
title={`${d.day}: ${d.rides} rides`}
>
<span>{d.day.slice(5)}</span>
</div>
))}
</div>
<h2>Top drivers</h2>
<table>
<thead>
<tr>
<th>Driver</th>
<th>Rides</th>
<th>Revenue</th>
</tr>
</thead>
<tbody>
{stats.topDrivers.map((d) => (
<tr key={d.driver_id}>
<td>{d.name}</td>
<td>{d.rides}</td>
<td>{d.revenue.toLocaleString()}</td>
</tr>
))}
</tbody>
</table>
</>
);
}
+124
View File
@@ -0,0 +1,124 @@
import { useCallback, useEffect, useState } from "react";
import { api } from "../lib/api";
type User = {
id: string;
name: string;
email: string;
role: string | null;
email_verified: boolean;
created_at: string;
rides: number;
};
const ROLES = ["rider", "driver", "owner"];
export default function Users() {
const [users, setUsers] = useState<User[]>([]);
const [query, setQuery] = useState("");
const [error, setError] = useState<string | null>(null);
const load = useCallback(async (q: string) => {
try {
const res = await api<{ data: User[] }>(
`/admin/users${q ? `?q=${encodeURIComponent(q)}` : ""}`,
);
setUsers(res.data);
setError(null);
} catch (e) {
setError((e as Error).message);
}
}, []);
useEffect(() => {
load("");
}, [load]);
const setRole = async (id: string, role: string) => {
try {
await api(`/admin/users/${id}`, {
method: "PATCH",
body: JSON.stringify({ role }),
});
await load(query);
} catch (e) {
setError((e as Error).message);
}
};
const toggleVerified = async (u: User) => {
try {
await api(`/admin/users/${u.id}`, {
method: "PATCH",
body: JSON.stringify({ email_verified: !u.email_verified }),
});
await load(query);
} catch (e) {
setError((e as Error).message);
}
};
return (
<>
<h2>Users</h2>
<div className="toolbar">
<input
placeholder="Search name or email…"
value={query}
onChange={(e) => setQuery(e.target.value)}
onKeyDown={(e) => e.key === "Enter" && load(query)}
/>
<button className="secondary" onClick={() => load(query)}>
Search
</button>
</div>
{error && <div className="error">{error}</div>}
<table>
<thead>
<tr>
<th>Name</th>
<th>Email</th>
<th>Role</th>
<th>Verified</th>
<th>Rides</th>
<th>Joined</th>
<th></th>
</tr>
</thead>
<tbody>
{users.map((u) => (
<tr key={u.id}>
<td>{u.name}</td>
<td>{u.email}</td>
<td>
<select
value={u.role ?? ""}
onChange={(e) => setRole(u.id, e.target.value)}
>
<option value=""> none </option>
{ROLES.map((r) => (
<option key={r} value={r}>
{r}
</option>
))}
</select>
</td>
<td>
<span className={`badge ${u.email_verified ? "paid" : "unpaid"}`}>
{u.email_verified ? "yes" : "no"}
</span>
</td>
<td>{u.rides}</td>
<td>{new Date(u.created_at).toLocaleDateString()}</td>
<td>
<button className="secondary" onClick={() => toggleVerified(u)}>
{u.email_verified ? "Unverify" : "Verify"}
</button>
</td>
</tr>
))}
</tbody>
</table>
</>
);
}