remove unncessary packages & files

.gitea/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  REGISTRY: gitea.defaoite.dev
+  REGISTRY: gitea.vodsystem.ddns.net
   IMAGE_PREFIX: dylan/vod-system
 
 jobs:

docker-compose.dev.yml

@@ -20,11 +20,12 @@ services:
       context: ./nginx
       dockerfile: Dockerfile
     container_name: vod_rtmp
-    network_mode: host
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     env_file:
       - .env
     environment:
-      - WEB_SERVER_URL=http://localhost:8080
+      - WEB_SERVER_URL=http://host.docker.internal:8080
     ports:
       - "1935:1935"
     volumes:

docker-compose.prod.yml

@@ -15,7 +15,7 @@ services:
     restart: unless-stopped
 
   backend:
-    image: gitea.defaoite.dev/dylan/vod-system-backend:latest
+    image: gitea.vodsystem.ddns.net/dylan/vod-system-backend:latest
     container_name: vod_backend
     depends_on:
       - postgres
@@ -29,7 +29,7 @@ services:
     restart: unless-stopped
 
   frontend:
-    image: gitea.defaoite.dev/dylan/vod-system-frontend:latest
+    image: gitea.vodsystem.ddns.net/dylan/vod-system-frontend:latest
     container_name: vod_frontend
     environment:
       VITE_API_URL: ${BACKEND_URL}
@@ -38,11 +38,11 @@ services:
     depends_on:
       - backend
     ports:
-      - "5173:80"
+      - "5173:5173"
     restart: unless-stopped
 
   rtmp:
-    image: gitea.defaoite.dev/dylan/vod-system-rtmp:latest
+    image: gitea.vodsystem.ddns.net/dylan/vod-system-rtmp:latest
     container_name: vod_rtmp
     env_file:
       - .env

docker-compose.yml

@@ -37,7 +37,7 @@ services:
     depends_on:
       - backend
     ports:
-      - "5173:80"
+      - "5173:5173"
     restart: unless-stopped
 
   rtmp:

frontend/Dockerfile

@@ -1,19 +1,9 @@
-# --- Build stage ---
-FROM node:20-alpine AS build
+FROM node:20-alpine
+
 WORKDIR /app
 COPY package*.json ./
 RUN --mount=type=cache,target=/root/.npm npm ci
+
 COPY . .
-RUN npm run build
-
-# --- Production stage ---
-FROM nginx:1.27-alpine AS prod
-COPY --from=build /app/dist /usr/share/nginx/html
-COPY frontend_nginx.conf /etc/nginx/conf.d/default.conf
-
-# Inject envs at runtime
-COPY env.sh /docker-entrypoint.d/40-env.sh
-RUN chmod +x /docker-entrypoint.d/40-env.sh
-
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+EXPOSE 5173
+CMD ["npm", "run", "dev"]

frontend/env.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -eu
-
-cat <<EOF > /usr/share/nginx/html/env-config.js
-window._env_ = {
-  VITE_API_URL: "${VITE_API_URL:-}",
-  VITE_FRONTEND_URL: "${VITE_FRONTEND_URL:-}",
-  VITE_GOOGLE_CLIENT_ID: "${VITE_GOOGLE_CLIENT_ID:-}"
-};
-EOF

frontend/frontend_nginx.conf

@@ -1,15 +0,0 @@
-server {
-    listen 80;
-    server_name _;
-    root /usr/share/nginx/html;
-    index index.html;
-
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        root /usr/share/nginx/html;
-    }
-}

frontend/index.html

@@ -3,14 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/png" href="/small_icon.png" />
-
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Newsreader:wght@100;200;300;400;500;600;700&family=IBM+Plex+Sans:wght@100;200;300;400;500;600;700&family=IBM+Plex+Mono:wght@100;200;300;400;500;600;700&display=swap" rel="stylesheet">
-
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="/env-config.js"></script>
-    <title>The VoD System</title>
+    <title>Vite + React + TS</title>
   </head>
   <body>
     <div id="root"></div>

frontend/package-lock.json

@@ -7,6 +7,7 @@
     "": {
       "name": "frontend",
       "version": "0.0.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@react-oauth/google": "^0.12.2",
         "clsx": "^2.1.1",

frontend/package.json

@@ -8,7 +8,8 @@
     "dev": "vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "postinstall": "flowbite-react patch"
   },
   "dependencies": {
     "@react-oauth/google": "^0.12.2",

frontend/src/App.css

@@ -0,0 +1,42 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}

frontend/src/App.tsx

@@ -15,9 +15,6 @@ import EditVod from "./pages/EditVod.tsx";
 import Profile from "./pages/Profile.tsx";
 import StreamControl from "./pages/StreamControl.tsx";
 import { GoogleOAuthProvider } from '@react-oauth/google';
-import {config} from "./config.ts";
- import NotFound from "./pages/NotFound.tsx";
-import AuthProvider from "./auth/AuthProvider.tsx";
 
 
 function App() {
@@ -26,8 +23,7 @@ function App() {
     }, []);
 
     return (
-        <GoogleOAuthProvider clientId={config.googleClientId}>
-            <AuthProvider>
+        <GoogleOAuthProvider clientId={import.meta.env.VITE_GOOGLE_CLIENT_ID}>
             <Router>
                 <Routes>
                     <Route element={<MainLayout />}>
@@ -42,11 +38,9 @@ function App() {
                         <Route path="/vods/:id/edit" element={<EditVod />} />
                         <Route path="/profile" element={<Profile />} />
                         <Route path="/stream" element={<StreamControl />} />
-                            <Route path="*" element={<NotFound />} />
                     </Route>
                 </Routes>
             </Router>
-            </AuthProvider>
         </ GoogleOAuthProvider>
     );
 }

frontend/src/auth/AuthContext.ts

@@ -1,20 +0,0 @@
-import { createContext } from "react";
-import type { User } from "../utils/types.ts";
-
-type AuthContextValue = {
-    /** The currently authenticated user, or null when logged out. */
-    user: User | null;
-    /** True until the initial "who am I" request has resolved. */
-    loading: boolean;
-    /** Exchange a Google credential for a session, then load the user. */
-    login: (googleCredential: string) => Promise<void>;
-    /** End the session and clear the user. */
-    logout: () => Promise<void>;
-    /** Re-fetch the current user (e.g. after a profile change). */
-    refresh: () => Promise<void>;
-};
-
-const AuthContext = createContext<AuthContextValue | null>(null);
-
-export { AuthContext };
-export type { AuthContextValue };

frontend/src/auth/AuthProvider.tsx

@@ -1,46 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import type { ReactNode } from "react";
-import type { User } from "../utils/types.ts";
-import { login as apiLogin, logout as apiLogout, getUser } from "../utils/api/users.ts";
-import { AuthContext } from "./AuthContext.ts";
-
-/**
- * Owns the single source of truth for the authenticated user. Everything that
- * needs to know who is logged in — the layout, the top bar, protected pages —
- * reads it through the `useAuth` hook rather than fetching the user itself.
- */
-const AuthProvider = ({ children }: { children: ReactNode }) => {
-    const [user, setUser] = useState<User | null>(null);
-    const [loading, setLoading] = useState(true);
-
-    const refresh = useCallback(async () => {
-        try {
-            setUser(await getUser());
-        } catch (error) {
-            console.error("Failed to fetch user:", error);
-            setUser(null);
-        }
-    }, []);
-
-    useEffect(() => {
-        refresh().finally(() => setLoading(false));
-    }, [refresh]);
-
-    const login = useCallback(async (googleCredential: string) => {
-        await apiLogin(googleCredential);
-        await refresh();
-    }, [refresh]);
-
-    const logout = useCallback(async () => {
-        await apiLogout();
-        setUser(null);
-    }, []);
-
-    return (
-        <AuthContext.Provider value={{ user, loading, login, logout, refresh }}>
-            {children}
-        </AuthContext.Provider>
-    );
-};
-
-export default AuthProvider;

frontend/src/auth/useAuth.ts

@@ -1,14 +0,0 @@
-import { useContext } from "react";
-import { AuthContext } from "./AuthContext.ts";
-import type { AuthContextValue } from "./AuthContext.ts";
-
-/** Access the centralised auth state. Must be used within an <AuthProvider>. */
-const useAuth = (): AuthContextValue => {
-    const context = useContext(AuthContext);
-    if (!context) {
-        throw new Error("useAuth must be used within an AuthProvider");
-    }
-    return context;
-};
-
-export { useAuth };

frontend/src/components/Box.tsx

@@ -1,5 +1,4 @@
 import clsx from "clsx";
-import React from "react";
 
 type Props = {
     children: React.ReactNode;
@@ -7,7 +6,7 @@ type Props = {
 };
 
 const Box = ({ children, className }: Props) => (
-    <div className={clsx("bg-card border-hairline shadow-sm rounded-lg", className)}>
+    <div className={clsx("bg-white border border-gray-200 shadow-sm rounded-lg", className)}>
         {children}
     </div>
 );

frontend/src/components/Dropdown.tsx

@@ -9,7 +9,7 @@ type DropdownItemProps = {
 
 const DropdownItem = ({ item, onClick, className }: DropdownItemProps) => (
     <li
-        className={clsx("cursor-pointer hover:bg-hover px-3 py-2 text-sm rounded-md", className)}
+        className={clsx("cursor-pointer hover:bg-gray-50 px-3 py-2 text-sm text-gray-700", className)}
         onClick={() => onClick(item)}
     >
         {item}
@@ -40,12 +40,12 @@ const Dropdown = ({ label, children, className }: DropdownProps) => {
         <div className={clsx(className, "relative inline-block text-left")} ref={ref}>
             <button
                 onClick={() => setIsOpen(v => !v)}
-                className="inline-flex items-center gap-1 px-3 py-2 text-sm transition-colors duration-150"
+                className="inline-flex items-center gap-1 rounded-lg px-3 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 transition-colors duration-150"
             >
                 {label}
             </button>
             {isOpen && (
-                <ul className="absolute right-0 mt-1 w-36 origin-top-right rounded-lg bg-background border border-hairline shadow-md z-50 py-1 overflow-hidden">
+                <ul className="absolute right-0 mt-1 w-36 origin-top-right rounded-lg bg-white border border-gray-200 shadow-md z-50 py-1 overflow-hidden">
                     {children}
                 </ul>
             )}

frontend/src/components/Selector.tsx

@@ -7,8 +7,8 @@ type Props = {
 
 const Selector = ({ children, label }: Props) => (
     <div className="flex items-center gap-2">
-        <label className="w-full text-sm text-text-secondary">{label}</label>
-        <div className="w-px h-5 text-text-secondary mx-2" />
+        <label className="w-full text-sm text-gray-600">{label}</label>
+        <div className="w-px h-5 bg-gray-200 mx-2" />
         {children}
     </div>
 );

frontend/src/components/Sidebar.tsx

@@ -1,51 +1,50 @@
 import clsx from "clsx";
 import SidebarButton from "./buttons/SidebarButton.tsx";
 import { Plus, Film, Home, User as UserIcon, Video, Radio } from 'lucide-react';
-import { useAuth } from "../auth/useAuth.ts";
+import type {User} from "../utils/types.ts";
 
 type props = {
+    user: User | null;
     className?: string
 }
 
-const Divider = () => <hr className="w-full my-1.5 mx-2 border-hover" />;
-
-const Sidebar = ({className}: props) => {
-    const { user } = useAuth();
+const Divider = () => <hr className="my-1.5 mx-2 border-gray-100" />;
 
+const Sidebar = ({user, className}: props) => {
     return (
-        <aside className={clsx("h-screen flex flex-col bg-sidebar border-r border-hairline p-2 items-center gap-1", className)}>
-            <h2 className={"font-heading text-2xl mt-1"}>The VoD System</h2>
-
-            <nav className="flex flex-col flex-1 items-center w-3/4">
-                <Divider />
-
-                <div className="flex flex-col gap-0.5 w-full">
+        <aside className={clsx("h-screen flex flex-col bg-white border-r border-gray-200", className)}>
+            <div className="px-4 pt-5 pb-3">
+                <img
+                    className="w-36 mx-auto"
+                    src="../../public/logo.png"
+                    alt="VoD System Logo"
+                />
+            </div>
+            <nav className="flex flex-col flex-1 px-2 pb-4">
+                <div className="flex flex-col gap-0.5">
                     <SidebarButton url="/" logo={<Home size={18}/>} label="Home" />
                     <SidebarButton url="/create" logo={<Plus size={18}/>} label="Create Clip" />
                 </div>
 
-                <Divider />
-
                 {user && (
-                        <div className="flex flex-col gap-0.5 w-full">
-                            <div>
+                    <>
+                        <Divider />
+                        <div className="flex flex-col gap-0.5">
                             <SidebarButton url="/stream" logo={<Radio size={18}/>} label="Stream" />
                             <SidebarButton url="/my-clips" logo={<Film size={18}/>} label="Clips" />
                             <SidebarButton url="/my-vods" logo={<Video size={18}/>} label="VoDs" />
                         </div>
-                        </div>
+                    </>
                 )}
 
                 <div className="flex-1" />
 
-                <div className={"w-full"}>
                 {user && (
                     <>
                         <Divider />
                         <SidebarButton url="/profile" logo={<UserIcon size={18}/>} label="Profile" />
                     </>
                 )}
-                </div>
             </nav>
         </aside>
     );

frontend/src/components/Topbar.tsx

@@ -1,18 +1,21 @@
 import { Menu, X } from 'lucide-react';
+import { login, logout } from "../utils/api/users.ts";
 import { Dropdown, DropdownItem } from "./Dropdown.tsx";
 import { GoogleLogin } from '@react-oauth/google';
 
+import type { User } from "../utils/types.ts";
 import type { CredentialResponse } from '@react-oauth/google';
 
 import MenuButton from "./buttons/MenuButton.tsx";
 import clsx from "clsx";
 import {useNavigate} from "react-router-dom";
-import { useAuth } from "../auth/useAuth.ts";
 
 
 type props = {
     sidebarToggled: boolean;
     setSidebarToggled: (toggled: boolean) => void;
+    user: User | null;
+    fetchUser: () => void;
     isStreaming: boolean;
     className?: string;
 }
@@ -20,11 +23,12 @@ type props = {
 const Topbar = ({
                     sidebarToggled,
                     setSidebarToggled,
+                    user,
+                    fetchUser,
                     isStreaming,
                     className}: props) => {
 
     const navigate = useNavigate();
-    const { user, login, logout } = useAuth();
 
     const handleLogin = (response: CredentialResponse) => {
         if (!response.credential) {
@@ -33,6 +37,10 @@ const Topbar = ({
         }
 
         login(response.credential)
+            .then(() => {
+                fetchUser();
+                navigate(0);
+            })
             .catch((error) => {
                 console.error("Login failed:", error);
             });
@@ -40,20 +48,23 @@ const Topbar = ({
 
     const handleLogout = () => {
         logout()
-            .then(() => navigate("/"))
+            .then(() => {
+                fetchUser();
+                navigate("/");
+            })
             .catch((error) => {
                 console.error("Logout failed:", error);
             });
     }
 
     return (
-        <div className={clsx(className, "flex justify-between items-center px-4 py-2 bg-sidebar border-b border-hairline")}>
+        <div className={clsx(className, "flex justify-between items-center px-4 py-2 bg-white border-b border-gray-200")}>
             <MenuButton onClick={() => setSidebarToggled(!sidebarToggled)}>
                 {sidebarToggled ? <Menu size={24}/> :  <X size={24}/>}
             </MenuButton>
 
             { user ? (
-                <div className={"hover:bg-hover rounded-lg p-0.5"}>
+                <div>
                     <img
                         className={"w-8 h-8 rounded-full inline-block"}
                         src={user.profilePictureUrl}
@@ -65,8 +76,8 @@ const Topbar = ({
                             {user.name}
                             {isStreaming && (
                                 <span className="relative flex h-2 w-2">
-                                    <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-live opacity-75" />
-                                    <span className="relative inline-flex rounded-full h-2 w-2 bg-live" />
+                                    <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75" />
+                                    <span className="relative inline-flex rounded-full h-2 w-2 bg-red-500" />
                                 </span>
                             )}
                         </span>
@@ -75,7 +86,7 @@ const Topbar = ({
                                       onClick={() => navigate("/profile")} />
                         <DropdownItem item="Logout"
                                       onClick={() => handleLogout()}
-                                      className={"text-error font-medium"} />
+                                      className={"text-red-500 font-medium"} />
                     </Dropdown>
                 </div>
             ) :

frontend/src/components/buttons/BlueButton.tsx

@@ -0,0 +1,14 @@
+import React from "react";
+
+type Props = React.ButtonHTMLAttributes<HTMLButtonElement>;
+
+const BlueButton: React.FC<Props> = ({ className = "", ...props }) => {
+  return (
+    <button
+      className={`bg-primary text-white font-medium rounded-lg hover:bg-primary-pressed transition-colors duration-150 h-10 px-4 ${className}`}
+      {...props}
+    />
+  );
+};
+
+export default BlueButton;

frontend/src/components/buttons/MenuButton.tsx

@@ -6,7 +6,7 @@ type Props = React.ButtonHTMLAttributes<HTMLButtonElement>;
 const MenuButton: React.FC<Props> = ({ className = "", ...props }) => {
     return (
         <button
-            className={clsx("p-2 rounded-md text-text-secondary hover:bg-hover hover:text-text-primary transition-colors duration-150", className)}
+            className={clsx("p-2 rounded-md text-gray-600 hover:bg-gray-100 hover:text-gray-900 transition-colors duration-150", className)}
             {...props}
         />
     );

frontend/src/components/buttons/PrimaryButton.tsx

@@ -1,14 +0,0 @@
-import React from "react";
-
-type Props = React.ButtonHTMLAttributes<HTMLButtonElement>;
-
-const PrimaryButton: React.FC<Props> = ({ className = "", ...props }) => {
-  return (
-    <button
-      className={`bg-terracotta text-on-accent font-body text-sm rounded-lg hover:bg-terracotta-hover disabled:bg-terracotta-disabled transition-colors duration-150 h-10 px-4 ${className}`}
-      {...props}
-    />
-  );
-};
-
-export default PrimaryButton;

frontend/src/components/buttons/SidebarButton.tsx

@@ -1,5 +1,5 @@
+import MenuButton from "./MenuButton.tsx";
 import { Link, useLocation } from "react-router-dom";
-import React from "react";
 
 type Props = {
     url: string;
@@ -13,15 +13,9 @@ const SidebarButton = ({url, logo, label}: Props) => {
 
     return (
         <Link className="w-full" to={url}>
-            <button className={`flex items-center gap-2.5 w-full text-sm 
-            font-body p-2 hover:bg-hover hover:text-text-strong
-            rounded-md 
-            ${isActive ?
-                "bg-card text-text-strong font-medium shadow-sm"
-                :
-                "text-text-primary"}`}>
+            <MenuButton className={`flex items-center gap-2.5 w-full px-3 py-2 text-sm font-medium rounded-md ${isActive ? "bg-gray-100 text-gray-900" : "text-gray-600"}`}>
                 {logo}{label}
-            </button>
+            </MenuButton>
         </Link>
     )
 }

frontend/src/components/video/ConfigBox.tsx

@@ -8,7 +8,7 @@ type Props = {
     className?: string;
 };
 
-const inputClass = "border border-hairline bg-card rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors";
+const inputClass = "border border-gray-300 bg-white rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary transition-colors";
 
 export default function ConfigBox({ setMetadata, className }: Props) {
     const updateRes = (e: React.ChangeEvent<HTMLSelectElement>) => {
@@ -26,7 +26,7 @@ export default function ConfigBox({ setMetadata, className }: Props) {
 
     return (
         <div className={clsx("flex flex-col gap-3 p-6", className)}>
-            <h2 className="text-sm text-text-primary font-semibold mb-1">Export Settings</h2>
+            <h2 className="text-sm font-semibold text-gray-800 mb-1">Export Settings</h2>
 
             <Selector label="Resolution">
                 <select id="resolution" name="resolution" defaultValue="1280,720"

frontend/src/components/video/ExportWidget.tsx

@@ -1,4 +1,4 @@
-import PrimaryButton from "../buttons/PrimaryButton.tsx";
+import BlueButton from "../buttons/BlueButton.tsx";
 import React from "react";
 
 type props = {
@@ -24,24 +24,24 @@ const Spinner = () => (
 const ExportWidget = ({dataSend, handleDownload, downloadable, progress, uploading}: props) => {
     return (
         <div className={"flex flex-col gap-3"}>
-            <PrimaryButton
+            <BlueButton
                 onClick={dataSend}
                 disabled={uploading}
                 className={uploading ? "opacity-60 cursor-not-allowed flex items-center justify-center gap-2" : ""}
             >
                 {uploading && <Spinner />}
                 {uploading ? "Uploading..." : "Export"}
-            </PrimaryButton>
+            </BlueButton>
 
             <div className="h-10 flex items-center">
                 { downloadable ?
-                    (<PrimaryButton className="w-full" onClick={handleDownload}>
+                    (<BlueButton className="w-full" onClick={handleDownload}>
                         Download
-                    </PrimaryButton>)
+                    </BlueButton>)
                     :(
                         <progress
                             value={progress}
-                            className="w-full h-1.5 rounded bg-fields">
+                            className="w-full h-1.5 rounded bg-gray-200">
                         </progress>
                     )
                 }

frontend/src/components/video/MetadataBox.tsx

@@ -9,15 +9,12 @@ type Props = {
 
 const MetadataBox = ({ setMetadata, className }: Props) => (
     <div className={clsx("flex flex-col content-between p-6 gap-2", className)}>
-        <p className="w-full font-body text-text-strong font-bold text-sm">
-            Title <span className="text-error">*</span>
-        </p>
+        <p className="w-full font-semibold text-gray-800 text-sm">Title</p>
         <input
             type="text"
-            required
             placeholder="Enter title"
             onChange={(e) => setMetadata(prev => ({ ...prev, title: e.target.value }))}
-            className="border border-hairline bg-fields rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors"
+            className="border border-gray-300 bg-white rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary transition-colors"
         />
     </div>
 );

frontend/src/components/video/Playbar.tsx

@@ -62,11 +62,11 @@ export default function Playbar({ video, videoMetadata, className }: Props) {
             </div>
             <button
                 onClick={togglePlay}
-                className="hover:bg-hover rounded-full p-1.5 transition-colors duration-150 text-text-body"
+                className="hover:bg-gray-100 rounded-full p-1.5 transition-colors duration-150 text-gray-700"
             >
                 {isPlaying ? <Pause size={24} /> : <Play size={24} />}
             </button>
-            <span className="font-data text-sm text-text-secondary tabular-nums">
+            <span>
                 {formatTime(video?.currentTime ?? 0)} / {formatTime(videoMetadata.duration ?? 0)}
             </span>
         </div>

frontend/src/components/video/VideoCard.tsx

@@ -1,9 +1,9 @@
 import clsx from "clsx";
 import { formatTime, stringToDate, dateToTimeAgo } from "../../utils/utils.ts";
 import { Link } from "react-router-dom";
-import React, { useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
+import { isThumbnailAvailable } from "../../utils/api/client.ts";
 import { MoreVertical, Pencil, Trash2 } from "lucide-react";
-import {config} from "../../config.ts";
 
 type VideoCardProps = {
     id: number,
@@ -18,12 +18,12 @@ type VideoCardProps = {
     itemLabel?: string,
 }
 
-const fallbackThumbnail = "public/default_thumbnail.png";
-const API_URL = config.apiUrl;
+const fallbackThumbnail = "../../../public/default_thumbnail.png";
+const API_URL = import.meta.env.VITE_API_URL;
 
 const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className, mediaApiPath = '/api/v1/clips', playerPath = '/video', itemLabel = 'clip' }: VideoCardProps) => {
     const [timeAgo, setTimeAgo] = useState(dateToTimeAgo(stringToDate(createdAt)));
-    const [imgFailed, setImgFailed] = useState(false);
+    const [thumbnailAvailable, setThumbnailAvailable] = useState(true);
     const [menuOpen, setMenuOpen] = useState(false);
     const [confirmDelete, setConfirmDelete] = useState(false);
     const menuRef = useRef<HTMLDivElement>(null);
@@ -36,6 +36,12 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
         return () => clearInterval(interval);
     }, [createdAt]);
 
+    useEffect(() => {
+        isThumbnailAvailable(thumbnailUrl)
+            .then(setThumbnailAvailable)
+            .catch(() => setThumbnailAvailable(false));
+    }, [thumbnailUrl]);
+
     useEffect(() => {
         if (!menuOpen) return;
         const handleClickOutside = (e: MouseEvent) => {
@@ -59,13 +65,12 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
             <div className={clsx("flex flex-col group cursor-pointer", className)}>
                 <div className="relative overflow-hidden rounded-lg">
                     <img
-                        src={imgFailed ? fallbackThumbnail : thumbnailUrl}
-                        onError={() => setImgFailed(true)}
+                        src={thumbnailAvailable ? thumbnailUrl : fallbackThumbnail}
                         alt="Video Thumbnail"
                         className="w-full aspect-video object-cover group-hover:scale-105 transition-transform duration-200"
                     />
 
-                    <span className="absolute top-1.5 left-1.5 bg-text-primary/75 text-on-dark px-1.5 py-0.5 rounded text-xs font-data pointer-events-none">
+                    <span className="absolute top-1.5 left-1.5 bg-black/70 text-white px-1.5 py-0.5 rounded text-xs font-medium pointer-events-none">
                         {formatTime(duration)}
                     </span>
 
@@ -77,18 +82,18 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
                         >
                             <button
                                 onClick={(e) => stopAndRun(e, () => { setMenuOpen(v => !v); setConfirmDelete(false); })}
-                                className="bg-text-primary/75 hover:bg-text-primary/90 text-on-dark rounded p-0.5 transition-colors"
+                                className="bg-black/70 hover:bg-black/90 text-white rounded p-0.5 transition-colors"
                             >
                                 <MoreVertical size={14} />
                             </button>
 
                             {menuOpen && (
-                                <div className="absolute right-0 top-7 w-32 bg-card rounded-lg border border-hairline shadow-md z-50 py-1 overflow-hidden">
+                                <div className="absolute right-0 top-7 w-32 bg-white rounded-lg border border-gray-200 shadow-md z-50 py-1 overflow-hidden">
                                     {!confirmDelete && (<>
                                         {onEdit && (
                                             <button
                                                 onClick={(e) => stopAndRun(e, onEdit)}
-                                                className="flex items-center gap-2 w-full px-3 py-2 text-sm text-text-body hover:bg-hover"
+                                                className="flex items-center gap-2 w-full px-3 py-2 text-sm text-gray-700 hover:bg-gray-50"
                                             >
                                                 <Pencil size={13} /> Edit
                                             </button>
@@ -96,7 +101,7 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
                                         {onDelete && (
                                             <button
                                                 onClick={(e) => stopAndRun(e, () => setConfirmDelete(true))}
-                                                className="flex items-center gap-2 w-full px-3 py-2 text-sm text-error hover:bg-hover"
+                                                className="flex items-center gap-2 w-full px-3 py-2 text-sm text-red-500 hover:bg-red-50"
                                             >
                                                 <Trash2 size={13} /> Delete
                                             </button>
@@ -104,17 +109,17 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
                                     </>)}
                                     {confirmDelete && (
                                         <div className="px-3 py-2">
-                                            <p className="text-xs text-text-secondary mb-2">Delete this {itemLabel}?</p>
+                                            <p className="text-xs text-gray-600 mb-2">Delete this {itemLabel}?</p>
                                             <div className="flex gap-1.5">
                                                 <button
                                                     onClick={(e) => stopAndRun(e, onDelete!)}
-                                                    className="flex-1 text-xs bg-error text-on-accent rounded px-2 py-1 hover:bg-terracotta-hover transition-colors"
+                                                    className="flex-1 text-xs bg-red-500 text-white rounded px-2 py-1 hover:bg-red-600 transition-colors"
                                                 >
                                                     Delete
                                                 </button>
                                                 <button
                                                     onClick={(e) => stopAndRun(e, () => setConfirmDelete(false))}
-                                                    className="flex-1 text-xs bg-fields text-text-secondary rounded px-2 py-1 hover:bg-hover transition-colors"
+                                                    className="flex-1 text-xs bg-gray-100 text-gray-600 rounded px-2 py-1 hover:bg-gray-200 transition-colors"
                                                 >
                                                     Cancel
                                                 </button>
@@ -128,10 +133,10 @@ const VideoCard = ({ id, title, duration, createdAt, onEdit, onDelete, className
                 </div>
 
                 <div className="flex flex-col p-2">
-                    <p className="font-body text-text-strong text-sm leading-snug line-clamp-2">
+                    <p className="font-medium text-gray-900 text-sm leading-snug line-clamp-2">
                         {title === "" ? "(No Title)" : title}
                     </p>
-                    <p className="text-muted text-xs mt-0.5">{timeAgo}</p>
+                    <p className="text-gray-500 text-xs mt-0.5">{timeAgo}</p>
                 </div>
             </div>
         </Link>

frontend/src/config.ts

@@ -1,5 +0,0 @@
-export const config = {
-    apiUrl: window._env_?.VITE_API_URL ?? import.meta.env.VITE_API_URL ?? '',
-    frontendUrl: window._env_?.VITE_FRONTEND_URL ?? import.meta.env.VITE_FRONTEND_URL ?? '',
-    googleClientId: window._env_?.VITE_GOOGLE_CLIENT_ID ?? import.meta.env.VITE_GOOGLE_CLIENT_ID ?? '',
-};

frontend/src/index.css

@@ -1,51 +1,37 @@
 @import "tailwindcss";
+@plugin "flowbite-react/plugin/tailwindcss";
+@source "../.flowbite-react/class-list.json";
 
 @theme {
-    /* ── Fonts ───────────────────────────────────────────────────────────── */
-    --font-body: "IBM Plex Sans", system-ui, sans-serif;
-    --font-data: "IBM Plex Mono", monospace;
+    --font-sans: "Inter", ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
 
-    /* ── Surfaces ────────────────────────────────────────────────────────── */
-    --color-background: #F7F4EE;
-    --color-sidebar: #F2EEE6;
-    --color-card: #FDFBF7;
-    --color-fields: #F4F0E8;
-    --color-dropzone: #F9F6EF;
+    /* Breakpoints */
+    --breakpoint-3xl: 1920px;
 
-    /* ── Ink ─────────────────────────────────────────────────────────────── */
-    --color-text-primary: #2B2620;
-    --color-text-strong: #35302A;
-    --color-text-body: #554D44;
-    --color-text-secondary: #6E6559;
-    --color-muted: #9A9084;
-    --color-faint-mono: #A79C8E;
+    --color-primary: oklch(0.55 0.21 254);
+    --color-primary-pressed: oklch(0.45 0.21 254);
+    --color-secondary: oklch(0.94 0.01 250);
+    --color-accent: oklch(0.68 0.20 288);
+    --color-text: oklch(0.17 0.01 270);
+    --color-background: oklch(0.97 0.005 250);
+    --color-surface: oklch(1 0 0);
+    --color-border: oklch(0.91 0.008 250);
 
-    /* ── Accents ─────────────────────────────────────────────────────────── */
-    --color-terracotta: #A85A38;
-    --color-terracotta-hover: #94492A;
-    --color-terracotta-light: #C87A52;
-    --color-terracotta-disabled: #C9AE9C;
-    --color-olive: #6E7A50;
+    /* Easing */
+    --ease-fluid: cubic-bezier(0.3, 0, 0, 1);
+    --ease-snappy: cubic-bezier(0.2, 0, 0, 1);
+}
 
-    /* ── Status ──────────────────────────────────────────────────────────── */
-    --color-live: #B5432E;
-    --color-error: #B5432E;
+#range-slider .range-slider__range {
+    background: var(--color-primary);
+}
 
-    /* ── Ink on dark / accent surfaces ───────────────────────────────────── */
-    --color-on-dark: #FBF8F2;
-    --color-on-accent: #FDFBF7;
-
-    /* ── Lines, chips, placeholders ──────────────────────────────────────── */
-    --color-hairline: #F0EBE2;
-    --color-hover: #E7E0D2;
-    --color-selected: #F6EFE6;
-    --color-ring: #E2DACB;
-    --color-inactive: #DED7CA;
-    --color-inactive-strong: #C4BAA9;
+#range-slider .range-slider__thumb {
+    background: var(--color-primary);
 }
 
 :root {
-    font-family: "IBM Plex Sans", system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
+    font-family: "Inter", ui-sans-serif, system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
     line-height: 1.5;
     font-weight: 400;
     font-synthesis: none;
@@ -56,35 +42,4 @@
 
 body {
     background-color: var(--color-background);
-    font-family: "IBM Plex Sans", system-ui, sans-serif;
-    color: var(--color-text-body);
-}
-
-@utility font-heading {
-    font-family: "Newsreader", serif;
-    font-weight: 400;
-    color: var(--color-text-primary);
-}
-
-/* Clip trim slider (react-range-slider-input). Its own stylesheet ships blue
-   defaults; the #id beats those class selectors regardless of import order. */
-#range-slider {
-    height: 8px;
-    background: var(--color-fields);
-    border-radius: 8px;
-}
-
-#range-slider .range-slider__range {
-    background: var(--color-terracotta-light);
-}
-
-#range-slider .range-slider__thumb {
-    width: 18px;
-    height: 18px;
-    background: var(--color-terracotta);
-    box-shadow: 0 1px 2px rgba(90, 40, 20, 0.2);
-}
-
-#range-slider .range-slider__thumb:focus-visible {
-    box-shadow: 0 0 0 4px color-mix(in oklab, var(--color-terracotta) 35%, transparent);
 }

frontend/src/layouts/MainLayout.tsx

@@ -3,13 +3,27 @@ import Sidebar from '../components/Sidebar'
 import Topbar from '../components/Topbar'
 import { Outlet } from 'react-router-dom';
 import {useEffect, useState} from "react";
-import { useAuth } from "../auth/useAuth";
+import type {User} from "../utils/types";
+import { getUser } from "../utils/api/users";
 import { getStreamStatus } from "../utils/api/stream";
 
 const MainLayout = () => {
     const [sidebarToggled, setSidebarToggled] = useState(false);
+    const [user, setUser] = useState<null | User>(null);
     const [isStreaming, setIsStreaming] = useState(false);
-    const { user } = useAuth();
+
+    const fetchUser = async () => {
+        try {
+            const userData = await getUser();
+            setUser(userData);
+        } catch (error) {
+            console.error('Failed to fetch user:', error);
+        }
+    };
+
+    useEffect(() => {
+        fetchUser();
+    }, []);
 
     useEffect(() => {
         if (!user) return;
@@ -20,13 +34,16 @@ const MainLayout = () => {
     }, [user]);
 
     return (
-        <div className={`transition-all duration-300 grid h-screen ${sidebarToggled ? "grid-cols-[0px_1fr]" : "grid-cols-[252px_1fr]"} grid-rows-[auto_1fr]`}>
+        <div className={`transition-all duration-300 grid h-screen ${sidebarToggled ? "grid-cols-[0px_1fr]" : "grid-cols-[240px_1fr]"} grid-rows-[auto_1fr]`}>
             <Sidebar
+                user={user}
                 className={`row-span-2 transition-all duration-300 overflow-hidden whitespace-nowrap ${sidebarToggled ? "-translate-x-full" : "translate-x-0"}`}/>
             <Topbar
                 className={"transition-all duration-300"}
                 sidebarToggled={sidebarToggled}
                 setSidebarToggled={setSidebarToggled}
+                user={user}
+                fetchUser={fetchUser}
                 isStreaming={isStreaming}/>
             <div className="overflow-auto bg-background">
                 <Outlet />

frontend/src/pages/ClipEdit.tsx

@@ -10,9 +10,8 @@ import { getJob } from "../utils/api/jobs"
 import type { VideoMetadata } from "../utils/types.ts";
 import Box from "../components/Box.tsx";
 import MetadataBox from "../components/video/MetadataBox.tsx";
-import {config} from "../config.ts";
 
-const API_URL = config.apiUrl;
+const API_URL = import.meta.env.VITE_API_URL;
 
 const ClipEdit = () => {
     const location = useLocation();
@@ -64,18 +63,12 @@ const ClipEdit = () => {
     const sendData = async () => {
         if (!localFile || uploading) return;
 
-        const title = outputMetadata.title.trim();
-        if (!title) {
-            setError('A title is required before exporting.');
-            return;
-        }
-
         setUploading(true);
         setError(null);
 
         let jobId: string;
         try {
-            jobId = await compress(localFile, { ...outputMetadata, title });
+            jobId = await compress(localFile, outputMetadata);
             setUploadedId(jobId);
         } catch (err: unknown) {
             setError(`Failed to start compression: ${err instanceof Error ? err.message : 'Unknown error'}`);
@@ -86,7 +79,7 @@ const ClipEdit = () => {
         const interval = setInterval(async () => await pollProgress(jobId, interval), 500);
     };
 
-    const pollProgress = async (jobId: string, intervalId: ReturnType<typeof setInterval>) => {
+    const pollProgress = async (jobId: string, intervalId: number) => {
         getJob(jobId)
             .then((job) => {
                 setProgress(job.progress);
@@ -135,7 +128,7 @@ const ClipEdit = () => {
             <video
                 ref={videoRef}
                 src={videoUrl}
-                className={"w-full rounded-lg shadow-sm bg-text-primary"}
+                className={"w-full rounded-lg shadow-sm bg-black"}
                 onLoadedMetadata={handleVideoMetadataLoaded}
             />
 
@@ -149,7 +142,7 @@ const ClipEdit = () => {
                     <Playbar
                         video={videoRef.current}
                         videoMetadata={metadata}
-                        className={"w-full accent-terracotta"}
+                        className={"w-full accent-primary"}
                     />
 
                     <PlaybackSlider
@@ -157,7 +150,7 @@ const ClipEdit = () => {
                         videoMetadata={metadata}
                         sliderValue={playbackValue}
                         setSliderValue={setPlaybackValue}
-                        className={"w-full accent-terracotta"}
+                        className={"w-full accent-primary"}
                     />
 
                     <ClipRangeSlider
@@ -165,11 +158,11 @@ const ClipEdit = () => {
                         videoMetadata={metadata}
                         setSliderValue={setPlaybackValue}
                         setMetadata={setOutputMetadata}
-                        className={"w-full mt-2"}
+                        className={"w-full mt-2 bg-primary"}
                     />
 
                     {error && (
-                        <div className={"text-error text-center mt-2"}>
+                        <div className={"text-red-600 text-center mt-2"}>
                             {error}
                         </div>
                     )}

frontend/src/pages/ClipUpload.tsx

@@ -1,11 +1,12 @@
 import {useState} from "react";
 import {useNavigate} from "react-router-dom";
+import BlueButton from "../components/buttons/BlueButton.tsx";
 import Box from "../components/Box.tsx";
 
 const ClipUpload = () => {
     const [file, setFile] = useState<File | null>(null);
-    const [error, setError] = useState<null | string>(null);
     const navigate = useNavigate();
+    const [error, setError] = useState<null | string>(null);
 
     const press = () => {
         if (!file) {
@@ -16,17 +17,10 @@ const ClipUpload = () => {
     };
 
     return (
-        <div className="flex justify-center p-8">
+        <div className="flex items-start justify-center p-8 min-h-full">
             <Box className="flex flex-col gap-4 p-6 w-full max-w-md">
-                <div
-                    className="cursor-pointer rounded-lg border-2
-                                border-dashed border-hairline bg-dropzone
-                                text-center text-sm text-text-secondary
-                                hover:bg-hover transition-colors duration-150
-                                min-h-50 flex flex-col items-center justify-center gap-2"
-                    >
-                    <label className="cursor-pointer flex flex-col items-center justify-center gap-2 w-full h-full">
-                        Choose file
+                <h1 className="text-lg font-semibold text-gray-900">Upload Clip</h1>
+
                 <input
                     type="file"
                     onChange={(e) => {
@@ -34,22 +28,12 @@ const ClipUpload = () => {
                         setFile(selected);
                         setError(null);
                     }}
-                            className="hidden"
+                    className="h-36 cursor-pointer rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 p-4 text-center text-sm text-gray-500 hover:bg-gray-100 hover:border-primary transition-colors duration-150"
                 />
-                    </label>
-                    {file && (
-                        <p className="mt-2 text-xs text-text-secondary">{file.name}</p>
-                    )}
-                </div>
 
-                <button
-                    onClick={press}
-                    className={"hover:bg-hover p-1 rounded-md"}
-                >
-                    Upload
-                </button>
+                <BlueButton onClick={press}>Upload</BlueButton>
 
-                {error && <p className="text-sm font-body text-center">{error}</p>}
+                {error && <p className="text-sm text-red-500 text-center">{error}</p>}
             </Box>
         </div>
     )

frontend/src/pages/EditClip.tsx

@@ -3,9 +3,9 @@ import { useNavigate, useParams } from "react-router-dom";
 import { ArrowLeft, Check } from "lucide-react";
 import { getClipById, patchClip } from "../utils/api/clips.ts";
 import Box from "../components/Box.tsx";
-import PrimaryButton from "../components/buttons/PrimaryButton.tsx";
+import BlueButton from "../components/buttons/BlueButton.tsx";
 
-const inputClass = "border border-hairline bg-fields rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors";
+const inputClass = "border border-gray-300 bg-white rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary transition-colors";
 
 const EditClip = () => {
     const { id } = useParams();
@@ -50,20 +50,20 @@ const EditClip = () => {
         <div className="px-8 py-10 max-w-2xl mx-auto">
             <button
                 onClick={() => navigate(-1)}
-                className="flex items-center gap-1.5 text-sm text-text-secondary hover:text-text-primary mb-6 transition-colors duration-150"
+                className="flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-900 mb-6 transition-colors duration-150"
             >
                 <ArrowLeft size={16} />
                 Back
             </button>
 
-            <h1 className="text-4xl font-heading text-text-primary mb-6">Edit Clip</h1>
+            <h1 className="text-2xl font-semibold text-gray-900 mb-6">Edit Clip</h1>
 
             {loading ? (
-                <div className="text-muted text-sm">Loading...</div>
+                <div className="text-gray-400 text-sm">Loading...</div>
             ) : (
                 <Box className="p-6 flex flex-col gap-4">
                     <div className="flex flex-col gap-1.5">
-                        <label className="text-sm font-medium text-text-secondary">Title</label>
+                        <label className="text-sm font-medium text-gray-700">Title</label>
                         <input
                             type="text"
                             value={title}
@@ -74,7 +74,7 @@ const EditClip = () => {
                     </div>
 
                     <div className="flex flex-col gap-1.5">
-                        <label className="text-sm font-medium text-text-secondary">Description</label>
+                        <label className="text-sm font-medium text-gray-700">Description</label>
                         <textarea
                             value={description}
                             onChange={(e) => setDescription(e.target.value)}
@@ -84,17 +84,17 @@ const EditClip = () => {
                         />
                     </div>
 
-                    {error && <p className="text-sm text-error">{error}</p>}
+                    {error && <p className="text-sm text-red-500">{error}</p>}
 
                     <div className="flex items-center gap-3 pt-1">
-                        <PrimaryButton onClick={handleSave} disabled={saving} className="w-28">
+                        <BlueButton onClick={handleSave} disabled={saving} className="w-28">
                             {saving ? "Saving…" : saved
                                 ? <span className="flex items-center gap-1.5 justify-center"><Check size={14} />Saved</span>
                                 : "Save"}
-                        </PrimaryButton>
+                        </BlueButton>
                         <button
                             onClick={() => navigate(-1)}
-                            className="text-sm text-text-secondary hover:text-text-primary transition-colors duration-150"
+                            className="text-sm text-gray-500 hover:text-gray-900 transition-colors duration-150"
                         >
                             Cancel
                         </button>

frontend/src/pages/EditVod.tsx

@@ -3,9 +3,9 @@ import { useNavigate, useParams } from "react-router-dom";
 import { ArrowLeft, Check } from "lucide-react";
 import { getVodById, patchVod } from "../utils/api/vods.ts";
 import Box from "../components/Box.tsx";
-import PrimaryButton from "../components/buttons/PrimaryButton.tsx";
+import BlueButton from "../components/buttons/BlueButton.tsx";
 
-const inputClass = "border border-hairline bg-fields rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors";
+const inputClass = "border border-gray-300 bg-white rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary transition-colors";
 
 const EditVod = () => {
     const { id } = useParams();
@@ -50,20 +50,20 @@ const EditVod = () => {
         <div className="px-8 py-10 max-w-2xl mx-auto">
             <button
                 onClick={() => navigate(-1)}
-                className="flex items-center gap-1.5 text-sm text-text-secondary hover:text-text-primary mb-6 transition-colors duration-150"
+                className="flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-900 mb-6 transition-colors duration-150"
             >
                 <ArrowLeft size={16} />
                 Back
             </button>
 
-            <h1 className="text-4xl font-heading text-text-primary mb-6">Edit VoD</h1>
+            <h1 className="text-2xl font-semibold text-gray-900 mb-6">Edit VoD</h1>
 
             {loading ? (
-                <div className="text-muted text-sm">Loading...</div>
+                <div className="text-gray-400 text-sm">Loading...</div>
             ) : (
                 <Box className="p-6 flex flex-col gap-4">
                     <div className="flex flex-col gap-1.5">
-                        <label className="text-sm font-medium text-text-secondary">Title</label>
+                        <label className="text-sm font-medium text-gray-700">Title</label>
                         <input
                             type="text"
                             value={title}
@@ -74,7 +74,7 @@ const EditVod = () => {
                     </div>
 
                     <div className="flex flex-col gap-1.5">
-                        <label className="text-sm font-medium text-text-secondary">Description</label>
+                        <label className="text-sm font-medium text-gray-700">Description</label>
                         <textarea
                             value={description}
                             onChange={(e) => setDescription(e.target.value)}
@@ -84,17 +84,17 @@ const EditVod = () => {
                         />
                     </div>
 
-                    {error && <p className="text-sm text-error">{error}</p>}
+                    {error && <p className="text-sm text-red-500">{error}</p>}
 
                     <div className="flex items-center gap-3 pt-1">
-                        <PrimaryButton onClick={handleSave} disabled={saving} className="w-28">
+                        <BlueButton onClick={handleSave} disabled={saving} className="w-28">
                             {saving ? "Saving…" : saved
                                 ? <span className="flex items-center gap-1.5 justify-center"><Check size={14} />Saved</span>
                                 : "Save"}
-                        </PrimaryButton>
+                        </BlueButton>
                         <button
                             onClick={() => navigate(-1)}
-                            className="text-sm text-text-secondary hover:text-text-primary transition-colors duration-150"
+                            className="text-sm text-gray-500 hover:text-gray-900 transition-colors duration-150"
                         >
                             Cancel
                         </button>

frontend/src/pages/Home.tsx

@@ -43,10 +43,10 @@ const Home = () => {
                     alt="VoD System Logo"
                     className="h-24 mb-6 object-contain"
                 />
-                <h1 className="text-4xl font-heading text-text-primary">
+                <h1 className="text-4xl font-semibold text-gray-900 mb-3 leading-tight">
                     A home for your clips.
                 </h1>
-                <p className="text-text-secondary">
+                <p className="text-base text-gray-500 leading-relaxed">
                     Upload, trim, and export video clips. Stream live if you need to.
                 </p>
             </div>
@@ -56,21 +56,21 @@ const Home = () => {
                 {features.map(({ icon: Icon, title, description }) => (
                     <div
                         key={title}
-                        className="bg-card border border-hairline rounded-xl p-5 flex flex-col gap-3 shadow-sm"
+                        className="bg-white border border-gray-200 rounded-xl p-5 flex flex-col gap-3 shadow-sm"
                     >
-                        <div className="w-9 h-9 rounded-lg flex items-center justify-center shrink-0">
-                            <Icon size={18} className="text-terracotta" />
+                        <div className="w-9 h-9 rounded-lg bg-primary/10 flex items-center justify-center flex-shrink-0">
+                            <Icon size={18} className="text-primary" />
                         </div>
                         <div>
-                            <p className="font-body text-text-strong font-bold text-sm mb-1">{title}</p>
-                            <p className="text-sm text-text-secondary leading-relaxed">{description}</p>
+                            <p className="font-semibold text-gray-900 text-sm mb-1">{title}</p>
+                            <p className="text-sm text-gray-500 leading-relaxed">{description}</p>
                         </div>
                     </div>
                 ))}
             </div>
 
             {/* Format note */}
-            <p className="text-xs text-muted">
+            <p className="text-xs text-gray-400">
                 Supports MP4, MOV, WebM, and OGG.
             </p>
         </div>

frontend/src/pages/MediaPlayer.tsx

@@ -202,16 +202,16 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
     if (notAuthenticated) {
         return (
             <div className="h-full flex flex-col items-center justify-center gap-4 text-center p-8">
-                <div className="w-14 h-14 rounded-full bg-fields flex items-center justify-center">
-                    <Lock size={24} className="text-muted" />
+                <div className="w-14 h-14 rounded-full bg-gray-100 flex items-center justify-center">
+                    <Lock size={24} className="text-gray-400" />
                 </div>
                 <div>
-                    <p className="text-2xl font-heading text-text-primary">Not authenticated</p>
-                    <p className="text-sm text-text-secondary mt-1">You don't have access to this {noun.toLowerCase()}.</p>
+                    <p className="text-lg font-semibold text-gray-900">Not authenticated</p>
+                    <p className="text-sm text-gray-500 mt-1">You don't have access to this {noun.toLowerCase()}.</p>
                 </div>
                 <button
                     onClick={() => navigate(-1)}
-                    className="flex items-center gap-1.5 text-sm text-text-secondary hover:text-text-primary transition-colors duration-150"
+                    className="flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-900 transition-colors duration-150"
                 >
                     <ArrowLeft size={16} />
                     Go back
@@ -224,7 +224,7 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
         <div className="h-full flex flex-col p-4 gap-3">
             <button
                 onClick={() => navigate(-1)}
-                className="flex items-center gap-1.5 text-sm text-text-secondary hover:text-text-primary flex-shrink-0 transition-colors duration-150"
+                className="flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-900 flex-shrink-0 transition-colors duration-150"
             >
                 <ArrowLeft size={16} />
                 Back
@@ -233,7 +233,7 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
             {/* Player */}
             <div
                 ref={containerRef}
-                className="relative bg-text-primary rounded-xl overflow-hidden flex-1 min-h-0 select-none"
+                className="relative bg-black rounded-xl overflow-hidden flex-1 min-h-0 select-none"
                 onMouseMove={showControls}
                 onMouseLeave={() => isPlaying && setControlsVisible(false)}
                 onClick={togglePlay}
@@ -265,7 +265,7 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
                 {/* Buffering spinner */}
                 {isWaiting && mediaUrl && (
                     <div className="absolute inset-0 flex items-center justify-center pointer-events-none">
-                        <div className="w-11 h-11 rounded-full border-[3px] border-on-dark/20 border-t-on-dark animate-spin" />
+                        <div className="w-11 h-11 rounded-full border-[3px] border-white/20 border-t-white animate-spin" />
                     </div>
                 )}
 
@@ -282,20 +282,20 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
                         {/* Scrub bar */}
                         <div
                             ref={progressRef}
-                            className="relative h-1 rounded-full bg-on-dark/25 cursor-pointer mb-3 group/prog hover:h-1.5 transition-[height] duration-150"
+                            className="relative h-1 rounded-full bg-white/25 cursor-pointer mb-3 group/prog hover:h-1.5 transition-[height] duration-150"
                             onMouseDown={(e) => { setIsDragging(true); seekTo(e.clientX); }}
                         >
-                            <div className="absolute inset-y-0 left-0 bg-on-dark/35 rounded-full" style={{ width: `${bufferedPct}%` }} />
-                            <div className="absolute inset-y-0 left-0 bg-terracotta-light rounded-full" style={{ width: `${progressPct}%` }} />
+                            <div className="absolute inset-y-0 left-0 bg-white/35 rounded-full" style={{ width: `${bufferedPct}%` }} />
+                            <div className="absolute inset-y-0 left-0 bg-primary rounded-full" style={{ width: `${progressPct}%` }} />
                             <div
-                                className="absolute top-1/2 -translate-y-1/2 w-3 h-3 bg-on-dark rounded-full shadow opacity-0 group-hover/prog:opacity-100 transition-opacity"
+                                className="absolute top-1/2 -translate-y-1/2 w-3 h-3 bg-white rounded-full shadow opacity-0 group-hover/prog:opacity-100 transition-opacity"
                                 style={{ left: `calc(${progressPct}% - 6px)` }}
                             />
                         </div>
 
                         {/* Buttons row */}
-                        <div className="flex items-center gap-3 text-on-dark">
-                            <button onClick={togglePlay} className="hover:text-on-dark/70 transition-colors">
+                        <div className="flex items-center gap-3 text-white">
+                            <button onClick={togglePlay} className="hover:text-white/70 transition-colors">
                                 {isPlaying
                                     ? <Pause size={20} fill="currentColor" />
                                     : <Play size={20} fill="currentColor" />}
@@ -303,7 +303,7 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
 
                             {/* Volume — slider expands on hover */}
                             <div className="flex items-center gap-1.5 group/vol">
-                                <button onClick={toggleMute} className="hover:text-on-dark/70 transition-colors">
+                                <button onClick={toggleMute} className="hover:text-white/70 transition-colors">
                                     <VolumeIcon size={18} />
                                 </button>
                                 <div className="overflow-hidden w-0 group-hover/vol:w-16 transition-[width] duration-200">
@@ -312,18 +312,18 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
                                         min={0} max={1} step={0.02}
                                         value={effectiveVolume}
                                         onChange={handleVolumeChange}
-                                        className="w-16 accent-on-dark cursor-pointer"
+                                        className="w-16 accent-white cursor-pointer"
                                     />
                                 </div>
                             </div>
 
-                            <span className="text-xs font-data tabular-nums text-on-dark/80">
+                            <span className="text-xs font-mono tabular-nums text-white/80">
                                 {formatTime(currentTime)} / {formatTime(duration)}
                             </span>
 
                             <div className="flex-1" />
 
-                            <button onClick={toggleFullscreen} className="hover:text-on-dark/70 transition-colors">
+                            <button onClick={toggleFullscreen} className="hover:text-white/70 transition-colors">
                                 {isFullscreen ? <Minimize size={18} /> : <Maximize size={18} />}
                             </button>
                         </div>
@@ -331,17 +331,17 @@ const MediaPlayer = ({ noun, getMediaUrl, fetchDetails }: MediaPlayerProps) => {
                 </div>
             </div>
 
-            {error && <div className="text-error text-sm mt-3">{error}</div>}
+            {error && <div className="text-red-500 text-sm mt-3">{error}</div>}
             {!mediaLoaded && !error && (
-                <div className="text-muted text-sm mt-3 flex items-center gap-2">
-                    <div className="w-3 h-3 rounded-full border-2 border-inactive border-t-muted animate-spin" />
+                <div className="text-gray-400 text-sm mt-3 flex items-center gap-2">
+                    <div className="w-3 h-3 rounded-full border-2 border-gray-300 border-t-gray-500 animate-spin" />
                     Loading video...
                 </div>
             )}
 
             <Box className="p-4 flex-shrink-0">
-                <p className="text-2xl font-heading text-text-primary">{item?.title || "(No Title)"}</p>
-                <p className="text-sm text-text-secondary mt-1">{timeAgo}</p>
+                <p className="text-xl font-semibold text-gray-900">{item?.title || "(No Title)"}</p>
+                <p className="text-sm text-gray-500 mt-1">{timeAgo}</p>
             </Box>
         </div>
     );

frontend/src/pages/MyClips.tsx

@@ -26,7 +26,7 @@ const MyClips = () => {
 
     return (
         <div className="p-6">
-            <h1 className="text-4xl font-heading text-text-primary mb-6">My Clips</h1>
+            <h1 className="text-2xl font-semibold text-gray-900 mb-6">My Clips</h1>
 
             <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
                 {clips.map((clip) => (
@@ -43,13 +43,13 @@ const MyClips = () => {
             </div>
 
             {clips.length === 0 && !error && (
-                <div className="flex flex-col items-center justify-center py-16 text-muted">
+                <div className="flex flex-col items-center justify-center py-16 text-gray-400">
                     <p className="text-base">No clips yet.</p>
                     <p className="text-sm mt-1">Upload your first clip to get started.</p>
                 </div>
             )}
 
-            {error && <p className="text-sm text-error mt-4">{error.toString()}</p>}
+            {error && <p className="text-sm text-red-500 mt-4">{error.toString()}</p>}
         </div>
     );
 }

frontend/src/pages/MyVods.tsx

@@ -26,7 +26,7 @@ const MyVods = () => {
 
     return (
         <div className="p-6">
-            <h1 className="text-4xl font-heading text-text-primary mb-6">My VoDs</h1>
+            <h1 className="text-2xl font-semibold text-gray-900 mb-6">My VoDs</h1>
 
             <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 gap-4">
                 {vods.map((vod) => (
@@ -46,13 +46,13 @@ const MyVods = () => {
             </div>
 
             {vods.length === 0 && !error && (
-                <div className="flex flex-col items-center justify-center py-16 text-muted">
+                <div className="flex flex-col items-center justify-center py-16 text-gray-400">
                     <p className="text-base">No VoDs yet.</p>
                     <p className="text-sm mt-1">Your stream recordings will appear here.</p>
                 </div>
             )}
 
-            {error && <p className="text-sm text-error mt-4">{error}</p>}
+            {error && <p className="text-sm text-red-500 mt-4">{error}</p>}
         </div>
     );
 };

frontend/src/pages/NotFound.tsx

@@ -1,24 +0,0 @@
-import { Lock } from 'lucide-react';
-import {useNavigate} from "react-router-dom";
-
-const NotFound = () => {
-    const navigate = useNavigate();
-
-    const goHomePage = () => {
-        navigate("/")
-    }
-
-    return (
-        <div className="w-full min-h-screen flex flex-col items-center justify-center gap-3 text-center px-6">
-            <Lock className="w-8 h-8 text-faint-mono/60 mb-1" strokeWidth={1.5} />
-            <h2 className="font-heading text-2xl md:text-3xl text-faint-mono">
-                This page does not exist.
-            </h2>
-            <p className="text-sm text-faint-mono/70 max-w-xs">
-                <a onClick={goHomePage} className={"font-bold cursor-pointer"}>Click here</a> to get back to the home page.
-            </p>
-        </div>
-    );
-}
-
-export default NotFound;

frontend/src/pages/Profile.tsx

@@ -1,14 +1,19 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { Eye, EyeOff, Copy, Check } from "lucide-react";
 import Box from "../components/Box.tsx";
-import { useAuth } from "../auth/useAuth.ts";
+import { getUser } from "../utils/api/users.ts";
+import type { User } from "../utils/types.ts";
 import { formatLocalDate } from "../utils/utils.ts";
 
 const Profile = () => {
-    const { user } = useAuth();
+    const [user, setUser] = useState<User | null>(null);
     const [keyVisible, setKeyVisible] = useState(false);
     const [copied, setCopied] = useState(false);
 
+    useEffect(() => {
+        getUser().then(setUser).catch(console.error);
+    }, []);
+
     const handleCopy = () => {
         if (!user?.streamKey) return;
         navigator.clipboard.writeText(user.streamKey);
@@ -18,7 +23,7 @@ const Profile = () => {
 
     if (!user) {
         return (
-            <div className="flex justify-center items-center h-full text-muted text-base">
+            <div className="flex justify-center items-center h-full text-gray-400 text-base">
                 Please log in to view your profile.
             </div>
         );
@@ -26,7 +31,7 @@ const Profile = () => {
 
     return (
         <div className="px-8 py-10 max-w-2xl mx-auto">
-            <h1 className="text-4xl font-heading text-text-primary mb-6">Profile</h1>
+            <h1 className="text-2xl font-semibold text-gray-900 mb-6">Profile</h1>
 
             <Box className="p-6 mb-4 flex items-center gap-5">
                 <img
@@ -36,31 +41,31 @@ const Profile = () => {
                     className="w-20 h-20 rounded-full shadow-sm"
                 />
                 <div>
-                    <p className="text-2xl font-heading text-text-primary">{user.name}</p>
-                    <p className="text-sm text-text-secondary">@{user.username}</p>
-                    <p className="text-sm text-text-secondary">{user.email}</p>
-                    <p className="text-xs text-muted mt-1">
+                    <p className="text-lg font-semibold text-gray-900">{user.name}</p>
+                    <p className="text-sm text-gray-500">@{user.username}</p>
+                    <p className="text-sm text-gray-500">{user.email}</p>
+                    <p className="text-xs text-gray-400 mt-1">
                         Member since {formatLocalDate(user.createdAt)}
                     </p>
                 </div>
             </Box>
 
             <Box className="p-6">
-                <h2 className="text-xl font-heading text-text-primary mb-1">Stream Key</h2>
-                <p className="text-sm text-text-secondary mb-4">
+                <h2 className="text-sm font-semibold text-gray-800 mb-1">Stream Key</h2>
+                <p className="text-sm text-gray-500 mb-4">
                     Use this key in OBS or any RTMP-compatible software to start streaming.
                     Keep it private — anyone with this key can stream to your account.
                 </p>
 
                 <div className="flex items-center gap-2">
-                    <div className="flex-1 bg-fields border border-hairline rounded-md px-4 py-2 font-data text-sm text-text-strong overflow-hidden">
+                    <div className="flex-1 bg-gray-50 border border-gray-200 rounded-md px-4 py-2 font-mono text-sm text-gray-700 overflow-hidden">
                         {keyVisible ? user.streamKey : "•".repeat(user.streamKey.length)}
                     </div>
 
                     <button
                         onClick={() => setKeyVisible(v => !v)}
                         title={keyVisible ? "Hide key" : "Show key"}
-                        className="p-2 rounded-md bg-fields hover:bg-hover transition-colors duration-150 text-text-secondary"
+                        className="p-2 rounded-md bg-gray-100 hover:bg-gray-200 transition-colors duration-150 text-gray-600"
                     >
                         {keyVisible ? <EyeOff size={16} /> : <Eye size={16} />}
                     </button>
@@ -68,9 +73,9 @@ const Profile = () => {
                     <button
                         onClick={handleCopy}
                         title="Copy key"
-                        className="p-2 rounded-md bg-fields hover:bg-hover transition-colors duration-150 text-text-secondary"
+                        className="p-2 rounded-md bg-gray-100 hover:bg-gray-200 transition-colors duration-150 text-gray-600"
                     >
-                        {copied ? <Check size={16} className="text-olive" /> : <Copy size={16} />}
+                        {copied ? <Check size={16} className="text-green-600" /> : <Copy size={16} />}
                     </button>
                 </div>
             </Box>

frontend/src/pages/StreamControl.tsx

@@ -2,17 +2,17 @@ import { useEffect, useState } from "react";
 import { Radio, Check, Bookmark, Scissors, Film, Activity, Loader2, X } from "lucide-react";
 import clsx from "clsx";
 import Box from "../components/Box.tsx";
-import PrimaryButton from "../components/buttons/PrimaryButton.tsx";
-import { useAuth } from "../auth/useAuth.ts";
+import BlueButton from "../components/buttons/BlueButton.tsx";
+import { getUser } from "../utils/api/users.ts";
 import { getCurrentStream, getStreamHistory } from "../utils/api/stream.ts";
 import { getMarkers, createMarker, deleteMarker } from "../utils/api/markers.ts";
 import { saveSectionByMarkers, clipSection } from "../utils/api/media.ts";
 import { getJob } from "../utils/api/jobs.ts";
-import type { StreamStatus, StreamHistoryItem, Marker, JobResponse } from "../utils/types.ts";
+import type { User, StreamStatus, StreamHistoryItem, Marker, JobResponse } from "../utils/types.ts";
 import { formatTime, formatLocalDate, stringToDate } from "../utils/utils.ts";
 
-const inputClass = "border border-hairline bg-fields rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-muted transition-colors";
-const labelClass = "font-data text-[11px] text-muted uppercase tracking-[0.12em]";
+const inputClass = "border border-gray-300 bg-white rounded-md w-full p-2 text-sm focus:outline-none focus:ring-2 focus:ring-primary/20 focus:border-primary transition-colors";
+const labelClass = "text-xs font-medium text-gray-500 uppercase tracking-wide";
 
 type TrackedJob = {
     uuid: string;
@@ -24,10 +24,10 @@ type TrackedJob = {
 
 const CardHeader = ({ icon: Icon, title, accent = "primary" }: { icon: React.ElementType; title: string; accent?: "primary" | "accent" }) => (
     <div className="flex items-center gap-2.5">
-        <div className={clsx("w-8 h-8 rounded-lg flex items-center justify-center flex-shrink-0", accent === "primary" ? "bg-terracotta/10" : "bg-olive/10")}>
-            <Icon size={16} className={accent === "primary" ? "text-terracotta" : "text-olive"} />
+        <div className={clsx("w-8 h-8 rounded-lg flex items-center justify-center flex-shrink-0", accent === "primary" ? "bg-primary/10" : "bg-accent/10")}>
+            <Icon size={16} className={accent === "primary" ? "text-primary" : "text-accent"} />
         </div>
-        <h2 className="text-xl font-heading text-text-primary">{title}</h2>
+        <h2 className="text-sm font-semibold text-gray-800">{title}</h2>
     </div>
 );
 
@@ -35,32 +35,32 @@ const JobStatus = ({ job }: { job: TrackedJob }) => {
     if (job.state === 'FAILED') {
         return (
             <div className="flex items-start gap-2 text-sm">
-                <X size={15} className="text-error mt-0.5 flex-shrink-0" />
-                <p className="text-error">{job.label} failed: {job.errorOutput ?? "Unknown error"}</p>
+                <X size={15} className="text-red-500 mt-0.5 flex-shrink-0" />
+                <p className="text-red-500">{job.label} failed: {job.errorOutput ?? "Unknown error"}</p>
             </div>
         );
     }
     if (job.state === 'SUCCEEDED') {
         return (
             <div className="flex items-center gap-2 text-sm">
-                <Check size={15} className="text-olive flex-shrink-0" />
-                <p className="text-text-body">{job.label} saved</p>
+                <Check size={15} className="text-green-600 flex-shrink-0" />
+                <p className="text-gray-700">{job.label} saved</p>
             </div>
         );
     }
     return (
         <div className="flex items-center gap-2">
-            <Loader2 size={15} className="text-terracotta animate-spin flex-shrink-0" />
+            <Loader2 size={15} className="text-primary animate-spin flex-shrink-0" />
             <div className="flex-1">
-                <p className="text-sm text-text-secondary mb-1">{job.label}…</p>
-                <progress value={job.progress} className="w-full h-1.5 rounded bg-fields" />
+                <p className="text-sm text-gray-600 mb-1">{job.label}…</p>
+                <progress value={job.progress} className="w-full h-1.5 rounded bg-gray-200" />
             </div>
         </div>
     );
 };
 
 const StreamControl = () => {
-    const { user } = useAuth();
+    const [user, setUser] = useState<User | null>(null);
     const [streamStatus, setStreamStatus] = useState<StreamStatus | null>(null);
     const [streamDetails, setStreamDetails] = useState<StreamHistoryItem | null>(null);
     const [now, setNow] = useState(Date.now());
@@ -85,6 +85,10 @@ const StreamControl = () => {
 
     const isStreaming = streamStatus?.isStreaming ?? false;
 
+    useEffect(() => {
+        getUser().then(setUser).catch(() => setUser(null));
+    }, []);
+
     useEffect(() => {
         if (!user) return;
         const poll = () => getCurrentStream().then(setStreamStatus).catch(() => {});
@@ -222,7 +226,7 @@ const StreamControl = () => {
 
     if (!user) {
         return (
-            <div className="flex justify-center items-center h-full text-muted text-base">
+            <div className="flex justify-center items-center h-full text-gray-400 text-base">
                 Please log in to control your stream.
             </div>
         );
@@ -237,35 +241,35 @@ const StreamControl = () => {
 
     return (
         <div className="px-8 py-10 max-w-5xl mx-auto flex flex-col gap-5">
-            <h1 className="text-4xl font-heading text-text-primary">Stream Control</h1>
+            <h1 className="text-2xl font-semibold text-gray-900">Stream Control</h1>
 
             {/* Hero status bar */}
             <Box className={clsx(
                 "p-6 flex items-center justify-between gap-6 border-l-4",
-                isStreaming ? "border-l-live" : "border-l-hairline"
+                isStreaming ? "border-l-red-500" : "border-l-gray-200"
             )}>
                 <div className="flex items-center gap-3.5">
                     <span className="relative flex h-3.5 w-3.5">
-                        {isStreaming && <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-live opacity-75" />}
-                        <span className={clsx("relative inline-flex rounded-full h-3.5 w-3.5", isStreaming ? "bg-live" : "bg-inactive-strong")} />
+                        {isStreaming && <span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-500 opacity-75" />}
+                        <span className={clsx("relative inline-flex rounded-full h-3.5 w-3.5", isStreaming ? "bg-red-500" : "bg-gray-300")} />
                     </span>
                     <div>
-                        <p className="text-2xl font-heading text-text-primary leading-tight">{isStreaming ? "Live" : "Offline"}</p>
+                        <p className="font-semibold text-gray-900 text-lg leading-tight">{isStreaming ? "Live" : "Offline"}</p>
                         {isStreaming && streamDetails?.startDate ? (
-                            <p className="text-sm text-text-secondary">Started {formatLocalDate(streamDetails.startDate)}</p>
+                            <p className="text-sm text-gray-500">Started {formatLocalDate(streamDetails.startDate)}</p>
                         ) : !isStreaming ? (
-                            <p className="text-sm text-text-secondary">Point OBS at your stream key (see Profile) to go live.</p>
+                            <p className="text-sm text-gray-500">Point OBS at your stream key (see Profile) to go live.</p>
                         ) : null}
                     </div>
                 </div>
 
                 {isStreaming && elapsed ? (
                     <div className="text-right">
-                        <p className="text-2xl font-data text-text-primary tabular-nums">{elapsed}</p>
-                        <p className={labelClass}>elapsed</p>
+                        <p className="text-2xl font-mono font-semibold text-gray-900 tabular-nums">{elapsed}</p>
+                        <p className="text-xs text-gray-400 uppercase tracking-wide">elapsed</p>
                     </div>
                 ) : (
-                    <Radio size={28} className="text-inactive" />
+                    <Radio size={28} className="text-gray-200" />
                 )}
             </Box>
 
@@ -274,7 +278,7 @@ const StreamControl = () => {
                     {/* Quick mark toolbar */}
                     <Box className="p-4 flex flex-col gap-3">
                         <div className="flex items-center gap-3">
-                            <Bookmark size={18} className="text-olive flex-shrink-0" />
+                            <Bookmark size={18} className="text-accent flex-shrink-0" />
                             <input
                                 type="text"
                                 value={markerMessage}
@@ -283,11 +287,11 @@ const StreamControl = () => {
                                 placeholder="What just happened?"
                                 className={inputClass}
                             />
-                            <PrimaryButton onClick={handleAddMarker} disabled={markerBusy || !markerMessage.trim()} className="whitespace-nowrap">
+                            <BlueButton onClick={handleAddMarker} disabled={markerBusy || !markerMessage.trim()} className="whitespace-nowrap">
                                 Add Marker
-                            </PrimaryButton>
+                            </BlueButton>
                         </div>
-                        {markerError && <p className="text-sm text-error">{markerError}</p>}
+                        {markerError && <p className="text-sm text-red-500">{markerError}</p>}
 
                         {markers.length > 0 && (
                             <div className="flex gap-2 overflow-x-auto pb-0.5 -mx-1 px-1 pt-1.5">
@@ -300,22 +304,22 @@ const StreamControl = () => {
                                                 onClick={() => handleChipClick(m.id)}
                                                 className={clsx(
                                                     "flex flex-col items-start gap-0.5 rounded-lg border px-3 py-1.5 text-left transition-colors duration-150",
-                                                    isStart && "border-terracotta bg-selected ring-1 ring-terracotta",
-                                                    isEnd && "border-olive bg-selected ring-1 ring-olive",
-                                                    !isStart && !isEnd && "border-hairline hover:border-ring hover:bg-hover"
+                                                    isStart && "border-primary bg-primary/5 ring-1 ring-primary",
+                                                    isEnd && "border-accent bg-accent/5 ring-1 ring-accent",
+                                                    !isStart && !isEnd && "border-gray-200 hover:border-gray-300 hover:bg-gray-50"
                                                 )}
                                             >
-                                                <span className="text-xs font-medium text-text-strong max-w-40 truncate">{m.message}</span>
-                                                <span className="font-data text-[11px] text-muted">
+                                                <span className="text-xs font-medium text-gray-800 max-w-40 truncate">{m.message}</span>
+                                                <span className="text-[11px] text-gray-400">
                                                     {formatLocalDate(m.timestamp, { hour: "2-digit", minute: "2-digit", second: "2-digit" })}
-                                                    {isStart && <span className="text-terracotta font-medium"> · start</span>}
-                                                    {isEnd && <span className="text-olive font-medium"> · end</span>}
+                                                    {isStart && <span className="text-primary font-medium"> · start</span>}
+                                                    {isEnd && <span className="text-accent font-medium"> · end</span>}
                                                 </span>
                                             </button>
                                             <button
                                                 onClick={(e) => { e.stopPropagation(); handleDeleteMarker(m.id); }}
                                                 title="Delete marker"
-                                                className="hidden group-hover:flex items-center justify-center absolute -top-1.5 -right-1.5 w-4 h-4 rounded-full bg-muted hover:bg-error text-on-accent transition-colors duration-150"
+                                                className="hidden group-hover:flex items-center justify-center absolute -top-1.5 -right-1.5 w-4 h-4 rounded-full bg-gray-400 hover:bg-red-500 text-white transition-colors duration-150"
                                             >
                                                 <X size={10} />
                                             </button>
@@ -342,44 +346,44 @@ const StreamControl = () => {
                             </div>
                             <input type="text" placeholder="Title" value={clipTitle} onChange={(e) => setClipTitle(e.target.value)} className={inputClass} />
                             <textarea placeholder="Description" value={clipDescription} onChange={(e) => setClipDescription(e.target.value)} rows={2} className={inputClass + " resize-none"} />
-                            {clipError && <p className="text-sm text-error">{clipError}</p>}
-                            <PrimaryButton onClick={handleClip} className="self-start mt-auto">Clip</PrimaryButton>
+                            {clipError && <p className="text-sm text-red-500">{clipError}</p>}
+                            <BlueButton onClick={handleClip} className="self-start mt-auto">Clip</BlueButton>
                         </Box>
 
                         <Box className="p-6 flex flex-col gap-3">
                             <CardHeader icon={Film} title="Save between two markers" accent="accent" />
                             {markers.length < 2 ? (
-                                <p className="text-sm text-muted">Add at least two markers above to save a section between them.</p>
+                                <p className="text-sm text-gray-400">Add at least two markers above to save a section between them.</p>
                             ) : (
                                 <>
                                     <div className="flex items-center gap-2 flex-wrap">
                                         <span className={clsx(
                                             "text-xs font-medium px-2.5 py-1 rounded-full border",
-                                            startMarker ? "border-terracotta text-terracotta bg-selected" : "border-dashed border-inactive text-muted"
+                                            startMarker ? "border-primary text-primary bg-primary/5" : "border-dashed border-gray-300 text-gray-400"
                                         )}>
                                             {startMarker ? startMarker.message : "Tap a marker to set start"}
                                         </span>
-                                        <span className="text-inactive-strong">→</span>
+                                        <span className="text-gray-300">→</span>
                                         <span className={clsx(
                                             "text-xs font-medium px-2.5 py-1 rounded-full border",
-                                            endMarker ? "border-olive text-olive bg-selected" : "border-dashed border-inactive text-muted"
+                                            endMarker ? "border-accent text-accent bg-accent/5" : "border-dashed border-gray-300 text-gray-400"
                                         )}>
                                             {endMarker ? endMarker.message : "Tap a marker to set end"}
                                         </span>
                                     </div>
                                     <input type="text" placeholder="Title" value={markerSaveTitle} onChange={(e) => setMarkerSaveTitle(e.target.value)} className={inputClass} />
                                     <textarea placeholder="Description" value={markerSaveDescription} onChange={(e) => setMarkerSaveDescription(e.target.value)} rows={2} className={inputClass + " resize-none"} />
-                                    {markerSaveError && <p className="text-sm text-error">{markerSaveError}</p>}
+                                    {markerSaveError && <p className="text-sm text-red-500">{markerSaveError}</p>}
                                 </>
                             )}
-                            <PrimaryButton onClick={handleSaveByMarkers} disabled={markers.length < 2} className="self-start mt-auto">Save</PrimaryButton>
+                            <BlueButton onClick={handleSaveByMarkers} disabled={markers.length < 2} className="self-start mt-auto">Save</BlueButton>
                         </Box>
                     </div>
 
                     <Box className="p-5 flex flex-col gap-3">
                         <CardHeader icon={Activity} title="Recent actions" />
                         {jobs.length === 0 ? (
-                            <p className="text-sm text-muted">Clip and save actions will show up here.</p>
+                            <p className="text-sm text-gray-400">Clip and save actions will show up here.</p>
                         ) : (
                             <div className="flex flex-col gap-3">
                                 {jobs.map((job) => <JobStatus key={job.uuid} job={job} />)}

frontend/src/utils/api/client.ts

@@ -1,6 +1,4 @@
-import {config} from "../../config.ts";
-
-const API_URL = config.apiUrl;
+const API_URL = import.meta.env.VITE_API_URL;
 
 class AuthError extends Error {
     constructor() { super("Not authenticated"); this.name = "AuthError"; }

frontend/src/vite-env.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="vite/client" />
-
-interface Window {
-    _env_?: {
-        VITE_API_URL?: string;
-        VITE_FRONTEND_URL?: string;
-        VITE_GOOGLE_CLIENT_ID?: string;
-    };
-}

frontend/vite.config.ts

@@ -1,12 +1,13 @@
 import { defineConfig, loadEnv } from 'vite'
 import react from '@vitejs/plugin-react'
 import tailwindcss from '@tailwindcss/vite'
+import flowbiteReact from "flowbite-react/plugin/vite";
 
 export default defineConfig(({ mode }) => {  // change to function form
   const env = loadEnv(mode, process.cwd(), '')  // load all env vars
 
   return {
-    plugins: [react(), tailwindcss()],
+    plugins: [react(), tailwindcss(), flowbiteReact()],
     preview: {
       port: 5173,
       strictPort: true,

src/main/java/com/ddf/vodsystem/VodSystemApplication.java

@@ -10,11 +10,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableAsync
 public class VodSystemApplication {
 
-	/**
-	 * Application entry point; boots the Spring context.
-	 *
-	 * @param args command-line arguments passed to Spring Boot
-	 */
 	public static void main(String[] args) {
 		SpringApplication.run(VodSystemApplication.class, args);
 	}

src/main/java/com/ddf/vodsystem/configuration/AsyncConfig.java

@@ -14,11 +14,6 @@ import java.util.concurrent.Executor;
 public class AsyncConfig implements AsyncConfigurer {
     private static final Logger logger = LoggerFactory.getLogger(AsyncConfig.class);
 
-    /**
-     * Provides the bounded thread pool that runs ffmpeg-backed {@code @Async} media tasks.
-     *
-     * @return the configured {@link Executor} registered as {@code ffmpegTaskExecutor}
-     */
     @Bean(name = "ffmpegTaskExecutor")
     public Executor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
@@ -30,11 +25,6 @@ public class AsyncConfig implements AsyncConfigurer {
         return executor;
     }
 
-    /**
-     * Supplies the handler that logs uncaught exceptions from void-returning {@code @Async} methods.
-     *
-     * @return the async uncaught-exception handler
-     */
     @Override
     public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
         return (ex, method, params) ->

src/main/java/com/ddf/vodsystem/configuration/CorsConfig.java

@@ -12,11 +12,6 @@ public class CorsConfig {
     @Value("${frontend.url}")
     private String frontendUrl;
 
-    /**
-     * Configures CORS for the API, allowing credentialed requests from the configured frontend origin.
-     *
-     * @return a {@link WebMvcConfigurer} that registers the CORS mappings for {@code /api/v1/**}
-     */
     @Bean
     public WebMvcConfigurer corsConfigurer() {
         return new WebMvcConfigurer() {

src/main/java/com/ddf/vodsystem/configuration/SecurityConfig.java

@@ -22,14 +22,6 @@ public class SecurityConfig {
         this.jwtFilter = jwtFilter;
     }
 
-    /**
-     * Builds the security filter chain: stateless sessions, CSRF disabled, the {@link JwtFilter}
-     * installed, and per-endpoint authorization rules.
-     *
-     * @param http the HTTP security builder to configure
-     * @return the built {@link SecurityFilterChain}
-     * @throws Exception if the security configuration cannot be built
-     */
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
@@ -38,9 +30,8 @@ public class SecurityConfig {
                 .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers(HttpMethod.OPTIONS, "/api/v1/**").permitAll()
-                        .requestMatchers("/api/v1/media/compress").permitAll() // compression available without authenticated
-                        .requestMatchers("/api/v1/jobs/**").permitAll() // same with jobs
                         .requestMatchers("/api/v1/media/**").authenticated()
+                        .requestMatchers("/api/v1/jobs/**").authenticated()
                         .requestMatchers("/api/v1/users/me", "/api/v1/users/logout").authenticated()
                         .requestMatchers("/api/v1/users/login").permitAll()
                         .requestMatchers("/api/v1/stream/start", "/api/v1/stream/stop", "/api/v1/stream/heartbeat").permitAll()

src/main/java/com/ddf/vodsystem/controllers/ClipController.java

@@ -6,12 +6,14 @@ import com.ddf.vodsystem.controllers.dto.ClipUpdateRequest;
 import com.ddf.vodsystem.entities.Clip;
 import com.ddf.vodsystem.services.ClipService;
 import org.springframework.core.io.Resource;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.MediaTypeFactory;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/api/v1/clips")
@@ -24,11 +26,6 @@ public class ClipController {
         this.clipService = clipService;
     }
 
-    /**
-     * Lists all clips belonging to the authenticated user.
-     *
-     * @return {@code 200 OK} wrapping the user's clips as {@link ClipResponse} DTOs
-     */
     @GetMapping("")
     public ResponseEntity<APIResponse<List<ClipResponse>>> getClips() {
         List<Clip> clips = clipService.getClipsByUser();
@@ -44,12 +41,6 @@ public class ClipController {
         );
     }
 
-    /**
-     * Retrieves a single clip owned by the authenticated user.
-     *
-     * @param id the ID of the clip to retrieve
-     * @return {@code 200 OK} wrapping the clip as a {@link ClipResponse} DTO
-     */
     @GetMapping("/{id}")
     public ResponseEntity<APIResponse<ClipResponse>> getClipById(@PathVariable Long id) {
         Clip clip = clipService.getClipById(id);
@@ -63,13 +54,6 @@ public class ClipController {
         );
     }
 
-    /**
-     * Applies a partial update to a clip's metadata; null fields are left unchanged.
-     *
-     * @param id           the ID of the clip to update
-     * @param updateFields the title and/or description to overwrite
-     * @return {@code 200 OK} wrapping the updated clip as a {@link ClipResponse} DTO
-     */
     @PatchMapping("/{id}")
     public ResponseEntity<APIResponse<ClipResponse>> updateClip(@PathVariable Long id,
                                                            @RequestBody ClipUpdateRequest updateFields) {
@@ -81,12 +65,6 @@ public class ClipController {
         );
     }
 
-    /**
-     * Deletes a clip and its associated files.
-     *
-     * @param id the ID of the clip to delete
-     * @return {@code 200 OK} with a confirmation message
-     */
     @DeleteMapping("/{id}")
     public ResponseEntity<APIResponse<String>> deleteClip(@PathVariable Long id) {
         clipService.deleteClip(id);
@@ -100,13 +78,6 @@ public class ClipController {
         );
     }
 
-    /**
-     * Streams the clip's video file inline, supporting HTTP range requests.
-     *
-     * @param id the ID of the clip to download
-     * @return {@code 200 OK} with the video resource, or {@code 404 Not Found} if the file is missing
-     * @throws IOException if the resource's content length cannot be read
-     */
     @GetMapping(value = "/{id}/media", produces = MediaType.ALL_VALUE)
     public ResponseEntity<Resource> downloadClip(@PathVariable Long id) throws IOException {
         Resource resource = clipService.downloadClip(id);
@@ -124,15 +95,8 @@ public class ClipController {
                 .body(resource);
     }
 
-    /**
-     * Streams the clip's thumbnail image with a public cache policy.
-     *
-     * @param id the ID of the clip whose thumbnail to download
-     * @return {@code 200 OK} with the thumbnail resource, or {@code 404 Not Found} if the file is missing
-     * @throws IOException if the resource's last-modified time cannot be read
-     */
     @GetMapping("/{id}/thumbnail")
-    public ResponseEntity<Resource> downloadThumbnail(@PathVariable Long id) throws IOException {
+    public ResponseEntity<Resource> downloadThumbnail(@PathVariable Long id) {
         Resource resource = clipService.downloadThumbnail(id);
 
         if (resource == null || !resource.exists()) {
@@ -140,8 +104,6 @@ public class ClipController {
         }
 
         return ResponseEntity.ok()
-                .cacheControl(CacheControl.maxAge(2, TimeUnit.DAYS).cachePublic())
-                .lastModified(resource.lastModified())
                 .header(HttpHeaders.CONTENT_DISPOSITION, String.format(FILENAME_HEADER, resource.getFilename()))
                 .contentType(MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM))
                 .body(resource);

src/main/java/com/ddf/vodsystem/controllers/GlobalExceptionHandler.java

@@ -18,12 +18,6 @@ public class GlobalExceptionHandler {
     private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
     private static final String ERROR = "error";
 
-    /**
-     * Handles malformed multipart requests, returning {@code 400 Bad Request}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler({ MultipartException.class })
     public ResponseEntity<APIResponse<Void>> handleMultipartException(MultipartException ex) {
         logger.error("MultipartException: {}", ex.getMessage());
@@ -31,12 +25,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
     }
 
-    /**
-     * Handles requests missing a required file part, returning {@code 400 Bad Request}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler({ MissingServletRequestPartException.class })
     public ResponseEntity<APIResponse<Void>> handleMissingPart(MissingServletRequestPartException ex) {
         logger.error("MissingServletRequestPartException: {}", ex.getMessage());
@@ -44,12 +32,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
     }
 
-    /**
-     * Handles unsupported request content types, returning {@code 415 Unsupported Media Type}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler({ HttpMediaTypeNotSupportedException.class })
     public ResponseEntity<APIResponse<Void>> handleUnsupportedMediaType(HttpMediaTypeNotSupportedException ex) {
         logger.error("HttpMediaTypeNotSupportedException: {}", ex.getMessage());
@@ -57,12 +39,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.UNSUPPORTED_MEDIA_TYPE).body(response);
     }
 
-    /**
-     * Handles invalid arguments, returning {@code 400 Bad Request} with the exception message.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<APIResponse<Void>> handleIllegalArgument(IllegalArgumentException ex) {
         logger.error("IllegalArgumentException: {}", ex.getMessage());
@@ -70,12 +46,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response);
     }
 
-    /**
-     * Handles lookups for a non-existent job, returning {@code 404 Not Found}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(JobNotFound.class)
     public ResponseEntity<APIResponse<Void>> handleFileNotFound(JobNotFound ex) {
         logger.error("JobNotFound: {}", ex.getMessage());
@@ -83,12 +53,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
     }
 
-    /**
-     * Handles requests for a job that is still running, returning {@code 202 Accepted}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(JobNotFinished.class)
     public ResponseEntity<APIResponse<Void>> handleJobNotFinished(JobNotFinished ex) {
         logger.error("JobNotFinished: {}", ex.getMessage());
@@ -96,12 +60,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.ACCEPTED).body(response);
     }
 
-    /**
-     * Handles ffmpeg processing failures, returning {@code 500 Internal Server Error}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(FFMPEGException.class)
     public ResponseEntity<APIResponse<Void>> handleFFMPEGException(FFMPEGException ex) {
         logger.error("FFMPEGException: {}", ex.getMessage());
@@ -109,12 +67,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
     }
 
-    /**
-     * Handles unauthenticated or unauthorized access, returning {@code 401 Unauthorized}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(NotAuthenticated.class)
     public ResponseEntity<APIResponse<Void>> handleNotAuthenticated(NotAuthenticated ex) {
         logger.error("NotAuthenticated: {}", ex.getMessage());
@@ -122,12 +74,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response);
     }
 
-    /**
-     * Handles an unrecognised stream key, returning {@code 404 Not Found}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(KeyNotFound.class)
     public ResponseEntity<APIResponse<Void>> handleKeyNotFound(KeyNotFound ex) {
         logger.error("KeyNotFound: {}", ex.getMessage());
@@ -135,12 +81,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
     }
 
-    /**
-     * Handles an attempt to start a stream while one is already active, returning {@code 409 Conflict}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(AlreadyStreaming.class)
     public ResponseEntity<APIResponse<Void>> handleAlreadyStreaming(AlreadyStreaming ex) {
         logger.error("AlreadyStreaming: {}", ex.getMessage());
@@ -148,12 +88,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.CONFLICT).body(response);
     }
 
-    /**
-     * Handles file storage failures, returning {@code 500 Internal Server Error}.
-     *
-     * @param e the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(StorageException.class)
     public ResponseEntity<APIResponse<Void>> handleStorage(StorageException e) {
         logger.error("Storage operation failed", e);
@@ -161,12 +95,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
     }
 
-    /**
-     * Handles lookups for a non-existent clip, returning {@code 404 Not Found}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(ClipNotFound.class)
     public ResponseEntity<APIResponse<Void>> handleClipNotFound(ClipNotFound ex) {
         logger.error("ClipNotFound: {}", ex.getMessage());
@@ -174,12 +102,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
     }
 
-    /**
-     * Handles a clip whose media file exists but is not readable, returning {@code 503 Service Unavailable}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(ClipMediaUnavailable.class)
     public ResponseEntity<APIResponse<Void>> handleClipMediaUnavailable(ClipMediaUnavailable ex) {
         logger.error("ClipMediaUnavailable (clip {}): {}", ex.getClipId(), ex.getMessage());
@@ -187,12 +109,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(response);
     }
 
-    /**
-     * Handles lookups for a non-existent VoD, returning {@code 404 Not Found}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(VodNotFound.class)
     public ResponseEntity<APIResponse<Void>> handleVodNotFound(VodNotFound ex) {
         logger.error("VodNotFound: {}", ex.getMessage());
@@ -200,12 +116,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
     }
 
-    /**
-     * Handles a VoD whose media file exists but is not readable, returning {@code 503 Service Unavailable}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(VodMediaUnavailable.class)
     public ResponseEntity<APIResponse<Void>> handleVodMediaUnavailable(VodMediaUnavailable ex) {
         logger.error("VodMediaUnavailable (vod {}): {}", ex.getVodId(), ex.getMessage());
@@ -213,12 +123,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(response);
     }
 
-    /**
-     * Handles actions that require an active stream when none exists, returning {@code 409 Conflict}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(NotStreaming.class)
     public ResponseEntity<APIResponse<Void>> handleNotStreaming(NotStreaming ex) {
         logger.error("NotStreaming: {}", ex.getMessage());
@@ -226,12 +130,6 @@ public class GlobalExceptionHandler {
         return ResponseEntity.status(HttpStatus.CONFLICT).body(response);
     }
 
-    /**
-     * Handles lookups for a non-existent marker, returning {@code 404 Not Found}.
-     *
-     * @param ex the thrown exception
-     * @return an error {@link APIResponse}
-     */
     @ExceptionHandler(MarkerNotFound.class)
     public ResponseEntity<APIResponse<Void>> handleMarkerNotFound(MarkerNotFound ex) {
         logger.error("MarkerNotFound: {}", ex.getMessage());

src/main/java/com/ddf/vodsystem/controllers/JobController.java

@@ -28,13 +28,6 @@ public class JobController {
         this.jobRegistryService = jobRegistryService;
     }
 
-    /**
-     * Retrieves the status and progress of an asynchronous job.
-     *
-     * @param uuid the UUID of the job to look up
-     * @return {@code 200 OK} wrapping the job's state as a {@link JobResponse} DTO
-     * @throws com.ddf.vodsystem.exceptions.JobNotFound if no job with {@code uuid} exists
-     */
     @GetMapping("/{uuid}")
     public ResponseEntity<APIResponse<JobResponse>> getJob(@PathVariable String uuid) {
         Job job = jobRegistryService.getJob(uuid);
@@ -54,15 +47,6 @@ public class JobController {
         ));
     }
 
-    /**
-     * Downloads the output file produced by a completed job.
-     *
-     * @param uuid the UUID of the job whose output to download
-     * @return {@code 200 OK} with the output file as a downloadable resource
-     * @throws com.ddf.vodsystem.exceptions.JobNotFound     if no job with {@code uuid} exists
-     * @throws NotReadyException if the job has not yet produced a downloadable file
-     * @throws ClipNotFound     if the job's output file no longer exists on disk
-     */
     @GetMapping("/{uuid}/download")
     public ResponseEntity<Resource> downloadJobFile(@PathVariable String uuid) {
         Job job = jobRegistryService.getJob(uuid);

src/main/java/com/ddf/vodsystem/controllers/MarkerController.java

@@ -22,11 +22,6 @@ public class MarkerController {
         this.markerService = markerService;
     }
 
-    /**
-     * Lists all markers belonging to the authenticated user.
-     *
-     * @return {@code 200 OK} wrapping the user's markers as {@link MarkerResponse} DTOs
-     */
     @GetMapping("")
     public ResponseEntity<APIResponse<List<MarkerResponse>>> getMarkers() {
         List<MarkerResponse> markers = markerService.getUserMarkers().stream()
@@ -38,12 +33,6 @@ public class MarkerController {
         );
     }
 
-    /**
-     * Retrieves a single marker owned by the authenticated user.
-     *
-     * @param id the ID of the marker to retrieve
-     * @return {@code 200 OK} wrapping the marker as a {@link MarkerResponse} DTO
-     */
     @GetMapping("/{id}")
     public ResponseEntity<APIResponse<MarkerResponse>> getMarkerById(@PathVariable Long id) {
         Marker marker = markerService.getMarkerById(id);
@@ -53,12 +42,6 @@ public class MarkerController {
         );
     }
 
-    /**
-     * Creates a marker at the current moment on the user's active stream.
-     *
-     * @param request the marker payload carrying the marker message
-     * @return {@code 200 OK} wrapping the created marker as a {@link MarkerResponse} DTO
-     */
     @PostMapping("")
     public ResponseEntity<APIResponse<MarkerResponse>> createMarker(@Valid @RequestBody MarkerCreateRequest request) {
         Marker marker = markerService.create(request.message());
@@ -68,12 +51,6 @@ public class MarkerController {
         );
     }
 
-    /**
-     * Deletes a marker owned by the authenticated user.
-     *
-     * @param id the ID of the marker to delete
-     * @return {@code 200 OK} with a confirmation message
-     */
     @DeleteMapping("/{id}")
     public ResponseEntity<APIResponse<String>> deleteMarker(@PathVariable Long id) {
         markerService.deleteMarker(id);

src/main/java/com/ddf/vodsystem/controllers/MediaController.java

@@ -26,14 +26,6 @@ public class MediaController {
         this.mediaService = mediaService;
     }
 
-    /**
-     * Starts an asynchronous job to compress an uploaded video file.
-     *
-     * @param file    the uploaded video to compress
-     * @param options trim window, resolution, fps, and target size for the output
-     * @return {@code 200 OK} wrapping the new job's UUID for polling
-     * @throws IOException if saving the upload to temporary storage fails
-     */
     @PostMapping(value = "/compress", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<APIResponse<UUIDResponse>> compress(
             @RequestParam("file")MultipartFile file,
@@ -48,13 +40,6 @@ public class MediaController {
     }
 
 
-    /**
-     * Starts an asynchronous job to save a section of the user's stream between two timestamps as a VoD.
-     *
-     * @param saveSectionRequest the start/end timestamps and optional title/description
-     * @return {@code 200 OK} wrapping the new job's UUID for polling
-     * @throws IOException if reading the stream segments fails
-     */
     @PostMapping("/save")
     public ResponseEntity<APIResponse<UUIDResponse>> save(
             @RequestBody SaveSectionRequest saveSectionRequest) throws IOException {
@@ -70,13 +55,6 @@ public class MediaController {
         ));
     }
 
-    /**
-     * Starts an asynchronous job to save the section of the user's stream between two markers as a VoD.
-     *
-     * @param saveSectionByMarkerRequest the start/end marker IDs and optional title/description
-     * @return {@code 200 OK} wrapping the new job's UUID for polling
-     * @throws IOException if reading the stream segments fails
-     */
     @PostMapping("/save/markers")
     public ResponseEntity<APIResponse<UUIDResponse>> saveByMarkers(
             @Valid @RequestBody SaveSectionByMarkerRequest saveSectionByMarkerRequest) throws IOException {
@@ -92,13 +70,6 @@ public class MediaController {
         ));
     }
 
-    /**
-     * Starts an asynchronous job to save the last few seconds of the user's stream as a clip.
-     *
-     * @param clipSectionRequest the clip duration in seconds and optional title/description
-     * @return {@code 200 OK} wrapping the new job's UUID for polling
-     * @throws IOException if reading the stream segments fails
-     */
     @PostMapping("/clip")
     public ResponseEntity<APIResponse<UUIDResponse>> clip(
             @RequestBody ClipSectionRequest clipSectionRequest) throws IOException {

src/main/java/com/ddf/vodsystem/controllers/StreamController.java

@@ -24,14 +24,6 @@ public class StreamController {
         this.streamService = streamService;
     }
 
-    /**
-     * Starts a new stream for the user owning the given stream key.
-     * <p>
-     * Called by nginx via its {@code on_publish} RTMP callback when a broadcast begins.
-     *
-     * @param streamKey the RTMP stream key identifying the broadcasting user
-     * @return {@code 200 OK} wrapping the newly started {@link Stream}
-     */
     // Called by nginx on_publish
     @PostMapping("/start")
     public ResponseEntity<APIResponse<Stream>> startStream(@RequestParam("name") String streamKey) {
@@ -40,14 +32,6 @@ public class StreamController {
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Stream started", stream));
     }
 
-    /**
-     * Ends the active stream for the user owning the given stream key.
-     * <p>
-     * Called by nginx via its {@code on_publish_done} RTMP callback when a broadcast stops.
-     *
-     * @param streamKey the RTMP stream key identifying the broadcasting user
-     * @return {@code 200 OK} confirming the stream was ended
-     */
     // Called by nginx on_publish_done
     @PostMapping("/stop")
     public ResponseEntity<APIResponse<Void>> stopStream(@RequestParam("name") String streamKey) {
@@ -56,14 +40,6 @@ public class StreamController {
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Stream ended", null));
     }
 
-    /**
-     * Records a liveness heartbeat for the active stream, keeping it from being reaped as stale.
-     * <p>
-     * Called periodically by nginx via its {@code on_update} RTMP callback.
-     *
-     * @param streamKey the RTMP stream key identifying the broadcasting user
-     * @return {@code 200 OK} confirming the heartbeat was recorded
-     */
     // Called by nginx on_update
     @PostMapping("/heartbeat")
     public ResponseEntity<APIResponse<Void>> heartbeat(@RequestParam("name") String streamKey) {
@@ -71,24 +47,12 @@ public class StreamController {
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Heartbeat recorded", null));
     }
 
-    /**
-     * Retrieves the stream history for the given user.
-     *
-     * @param userId the ID of the user whose stream history to retrieve; must be the authenticated user
-     * @return {@code 200 OK} wrapping the user's past and current {@link Stream}s
-     */
     @GetMapping("/history/{userId}")
     public ResponseEntity<APIResponse<List<Stream>>> getStreamHistory(@PathVariable Long userId) {
         List<Stream> history = streamService.getStreamHistory(userId);
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Stream history retrieved", history));
     }
 
-    /**
-     * Reports whether the authenticated user is currently streaming.
-     *
-     * @return {@code 200 OK} wrapping a {@link StreamResponse} indicating the live status and, if live,
-     *         the active stream's ID
-     */
     @GetMapping("/current")
     public ResponseEntity<APIResponse<StreamResponse>> getCurrentStream() {
         Optional<Stream> stream = streamService.getActiveStream();

src/main/java/com/ddf/vodsystem/controllers/UserController.java

@@ -27,12 +27,6 @@ public class UserController {
         this.userService = userService;
     }
 
-    /**
-     * Returns the currently authenticated user's profile.
-     *
-     * @return {@code 200 OK} wrapping the authenticated {@link User}
-     * @throws NotAuthenticated if no valid session is present
-     */
     @GetMapping("/me")
     public ResponseEntity<APIResponse<User>> user() {
         Optional<User> user = userService.getLoggedInUser();
@@ -46,17 +40,6 @@ public class UserController {
         );
     }
 
-    /**
-     * Authenticates a user from a Google ID token and issues a session JWT.
-     * <p>
-     * The JWT is set as an HttpOnly {@code token} cookie (scoped by request security) and also
-     * returned in the response body.
-     *
-     * @param token    the payload carrying the Google ID token to verify
-     * @param request  the incoming request, used to decide cookie {@code Secure}/{@code SameSite} flags
-     * @param response the response the session cookie is written to
-     * @return {@code 200 OK} wrapping the issued JWT as a {@link Token}
-     */
     @PostMapping("/login")
     public ResponseEntity<APIResponse<Token>> login(@RequestBody Token token,
 		    				    HttpServletRequest request,
@@ -78,13 +61,6 @@ public class UserController {
         );
     }
 
-    /**
-     * Logs the user out by clearing the session cookie.
-     *
-     * @param response the response the expired cookie is written to
-     * @param request  the incoming request, used to match the original cookie's {@code Secure}/{@code SameSite} flags
-     * @return {@code 200 OK} confirming logout
-     */
     @PostMapping("/logout")
     public ResponseEntity<APIResponse<Void>> logout(HttpServletResponse response,
 		    				    HttpServletRequest request) {

src/main/java/com/ddf/vodsystem/controllers/VodController.java

@@ -6,12 +6,14 @@ import com.ddf.vodsystem.dto.APIResponse;
 import com.ddf.vodsystem.entities.Vod;
 import com.ddf.vodsystem.services.VodService;
 import org.springframework.core.io.Resource;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.MediaTypeFactory;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/api/v1/vods")
@@ -24,11 +26,6 @@ public class VodController {
         this.vodService = vodService;
     }
 
-    /**
-     * Lists all VoDs belonging to the authenticated user.
-     *
-     * @return {@code 200 OK} wrapping the user's VoDs as {@link VodResponse} DTOs
-     */
     @GetMapping("")
     public ResponseEntity<APIResponse<List<VodResponse>>> getVods() {
         List<VodResponse> vods = vodService.getUserVods().stream()
@@ -38,25 +35,12 @@ public class VodController {
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Vods retrieved successfully", vods));
     }
 
-    /**
-     * Retrieves a single VoD owned by the authenticated user.
-     *
-     * @param id the ID of the VoD to retrieve
-     * @return {@code 200 OK} wrapping the VoD as a {@link VodResponse} DTO
-     */
     @GetMapping("/{id}")
     public ResponseEntity<APIResponse<VodResponse>> getVodById(@PathVariable Long id) {
         VodResponse vod = convertToDTO(vodService.getVodById(id));
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Vod retrieved successfully", vod));
     }
 
-    /**
-     * Applies a partial update to a VoD's metadata; null fields are left unchanged.
-     *
-     * @param id           the ID of the VoD to update
-     * @param updateFields the title and/or description to overwrite
-     * @return {@code 200 OK} wrapping the updated VoD as a {@link VodResponse} DTO
-     */
     @PatchMapping("/{id}")
     public ResponseEntity<APIResponse<VodResponse>> updateVod(@PathVariable Long id,
                                                               @RequestBody VodUpdateRequest updateFields) {
@@ -64,12 +48,6 @@ public class VodController {
         return ResponseEntity.ok(new APIResponse<>(SUCCESS, "Vod updated successfully", vod));
     }
 
-    /**
-     * Deletes a VoD and its associated files.
-     *
-     * @param id the ID of the VoD to delete
-     * @return {@code 200 OK} with a confirmation message
-     */
     @DeleteMapping("/{id}")
     public ResponseEntity<APIResponse<String>> deleteVod(@PathVariable Long id) {
         vodService.deleteVod(id);
@@ -77,13 +55,6 @@ public class VodController {
                 "Vod with ID " + id + " has been deleted"));
     }
 
-    /**
-     * Streams the VoD's video file inline, supporting HTTP range requests.
-     *
-     * @param id the ID of the VoD to download
-     * @return {@code 200 OK} with the video resource, or {@code 404 Not Found} if the file is missing
-     * @throws IOException if the resource's content length cannot be read
-     */
     @GetMapping(value = "/{id}/media", produces = MediaType.ALL_VALUE)
     public ResponseEntity<Resource> downloadVod(@PathVariable Long id) throws IOException {
         Resource resource = vodService.downloadVod(id);
@@ -101,15 +72,8 @@ public class VodController {
                 .body(resource);
     }
 
-    /**
-     * Streams the VoD's thumbnail image with a public cache policy.
-     *
-     * @param id the ID of the VoD whose thumbnail to download
-     * @return {@code 200 OK} with the thumbnail resource, or {@code 404 Not Found} if the file is missing
-     * @throws IOException if the resource's last-modified time cannot be read
-     */
     @GetMapping("/{id}/thumbnail")
-    public ResponseEntity<Resource> downloadThumbnail(@PathVariable Long id) throws IOException {
+    public ResponseEntity<Resource> downloadThumbnail(@PathVariable Long id) {
         Resource resource = vodService.downloadThumbnail(id);
 
         if (resource == null || !resource.exists()) {
@@ -117,8 +81,6 @@ public class VodController {
         }
 
         return ResponseEntity.ok()
-                .cacheControl(CacheControl.maxAge(2, TimeUnit.DAYS).cachePublic())
-                .lastModified(resource.lastModified())
                 .header(HttpHeaders.CONTENT_DISPOSITION, String.format(FILENAME_HEADER, resource.getFilename()))
                 .contentType(MediaTypeFactory.getMediaType(resource).orElse(MediaType.APPLICATION_OCTET_STREAM))
                 .body(resource);

src/main/java/com/ddf/vodsystem/dto/CommandOutput.java

@@ -10,11 +10,6 @@ public class CommandOutput {
     private List<String> output = new ArrayList<>();
     private int exitCode;
 
-    /**
-     * Appends a line to the captured command output.
-     *
-     * @param line the output line to append
-     */
     public void addLine(String line) {
         output.add(line);
     }

src/main/java/com/ddf/vodsystem/dto/ProgressTracker.java

@@ -4,30 +4,14 @@ public class ProgressTracker {
     private float progress = 0.0f;
     private boolean isComplete = false;
 
-    /**
-     * Returns the current progress.
-     *
-     * @return the progress as a fraction in {@code [0, 1]}
-     */
     public synchronized float getProgress() {
         return progress;
     }
 
-    /**
-     * Returns whether the tracked task has been marked complete.
-     *
-     * @return {@code true} if complete
-     */
     public synchronized boolean isComplete() {
         return isComplete;
     }
 
-    /**
-     * Updates the current progress.
-     *
-     * @param newProgress the progress as a fraction in {@code [0, 1]}
-     * @throws IllegalArgumentException if {@code newProgress} is outside {@code [0, 1]}
-     */
     public synchronized void setProgress(float newProgress) {
         if (newProgress < 0 || newProgress > 1) {
             throw new IllegalArgumentException("Progress must be between 0 and 1");
@@ -35,16 +19,10 @@ public class ProgressTracker {
         this.progress = newProgress;
     }
 
-    /**
-     * Marks the tracked task as complete.
-     */
     public synchronized void markComplete() {
         this.isComplete = true;
     }
 
-    /**
-     * Resets progress to zero and clears the complete flag.
-     */
     public synchronized void reset() {
         this.progress = 0.0f;
         this.isComplete = false;

src/main/java/com/ddf/vodsystem/exceptions/ClipMediaUnavailable.java

@@ -12,11 +12,6 @@ public class ClipMediaUnavailable extends RuntimeException {
     this.clipId = clipId;
   }
 
-  /**
-   * Returns the ID of the clip whose media was unavailable.
-   *
-   * @return the affected clip's ID
-   */
   public Long getClipId() {
     return clipId;
   }

src/main/java/com/ddf/vodsystem/exceptions/VodMediaUnavailable.java

@@ -12,11 +12,6 @@ public class VodMediaUnavailable extends RuntimeException {
     this.vodId = vodId;
   }
 
-  /**
-   * Returns the ID of the VoD whose media was unavailable.
-   *
-   * @return the affected VoD's ID
-   */
   public Long getVodId() {
     return vodId;
   }

src/main/java/com/ddf/vodsystem/repositories/ClipRepository.java

@@ -10,12 +10,6 @@ import java.util.List;
 
 @Repository
 public interface ClipRepository extends JpaRepository<Clip, Long> {
-    /**
-     * Finds all clips owned by the given user.
-     *
-     * @param user the owning user
-     * @return the user's clips
-     */
     @Query("SELECT c FROM Clip c WHERE c.user = ?1")
     List<Clip> findByUser(User user);
 }

src/main/java/com/ddf/vodsystem/repositories/MarkerRepository.java

@@ -11,21 +11,9 @@ import java.util.List;
 
 @Repository
 public interface MarkerRepository extends JpaRepository<Marker, Long> {
-    /**
-     * Finds all markers owned by the given user.
-     *
-     * @param user the owning user
-     * @return the user's markers
-     */
     @Query("SELECT m FROM Marker m WHERE m.user = ?1")
     List<Marker> findByUser(User user);
 
-    /**
-     * Finds all markers timestamped at or before the given instant.
-     *
-     * @param time the cutoff instant (inclusive)
-     * @return markers at or before {@code time}
-     */
     @Query("SELECT m FROM Marker m WHERE m.timestamp <= ?1")
     List<Marker> findAllBefore(Instant time);
 }

src/main/java/com/ddf/vodsystem/repositories/StreamRepository.java

@@ -11,27 +11,7 @@ import java.util.Optional;
 
 @Repository
 public interface StreamRepository extends JpaRepository<Stream, Long> {
-    /**
-     * Finds the user's active (not-yet-ended) stream, if any.
-     *
-     * @param user the owning user
-     * @return the active stream, or empty if none
-     */
     Optional<Stream> findByUserAndEndDateIsNull(User user);
-
-    /**
-     * Finds all streams belonging to the given user.
-     *
-     * @param user the owning user
-     * @return the user's streams
-     */
     List<Stream> findByUser(User user);
-
-    /**
-     * Finds active streams whose last heartbeat predates the given cutoff, i.e. stale streams.
-     *
-     * @param cutoff the last-seen cutoff; streams last seen before this are returned
-     * @return the stale active streams
-     */
     List<Stream> findByEndDateIsNullAndLastSeenBefore(Instant cutoff);
 }

src/main/java/com/ddf/vodsystem/repositories/UserRepository.java

@@ -9,21 +9,9 @@ import java.util.Optional;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
-    /**
-     * Finds a user by their Google account ID.
-     *
-     * @param googleId the Google subject identifier
-     * @return the matching user, or empty if none
-     */
     @Query("SELECT u FROM User u WHERE u.googleId = ?1")
     Optional<User> findByGoogleId(String googleId);
 
-    /**
-     * Finds a user by their stream key.
-     *
-     * @param streamKey the stream key to match
-     * @return the matching user, or empty if none
-     */
     @Query("SELECT u FROM User u WHERE u.streamKey = ?1")
     Optional<User> findByStreamKey(String streamKey);
 }

src/main/java/com/ddf/vodsystem/repositories/VodRepository.java

@@ -11,12 +11,6 @@ import java.util.List;
 @Repository
 public interface VodRepository extends JpaRepository<Vod, Long>
 {
-    /**
-     * Finds all VoDs owned by the given user.
-     *
-     * @param user the owning user
-     * @return the user's VoDs
-     */
     @Query("SELECT v FROM Vod v WHERE v.user = ?1")
     List<Vod> findByUser(User user);
 }

src/main/java/com/ddf/vodsystem/security/JwtService.java

@@ -26,12 +26,6 @@ public class JwtService {
         this.algorithm = Algorithm.HMAC256(jwtSecretKey);
     }
 
-    /**
-     * Generates a signed JWT carrying the given user ID, valid for the configured expiry.
-     *
-     * @param userId the user ID to embed as a claim
-     * @return the signed JWT string
-     */
     public String generateToken(Long userId) {
         return JWT.create()
                 .withClaim(USER_ID_CLAIM, userId)
@@ -40,12 +34,6 @@ public class JwtService {
                 .sign(algorithm);
     }
 
-    /**
-     * Verifies a JWT's signature, issuer, and expiry, returning the embedded user ID.
-     *
-     * @param token the JWT to validate
-     * @return the user ID claim if the token is valid and unexpired, otherwise {@code null}
-     */
     public Long validateTokenAndGetUserId(String token) {
         try {
             JWTVerifier verifier = JWT.require(algorithm)

src/main/java/com/ddf/vodsystem/services/DirectoryService.java

@@ -40,132 +40,61 @@ public class DirectoryService {
     private static final String CLIPS_DIR_NAME = "clips";
     private static final String THUMBNAIL_DIR_NAME = "thumbnails";
 
-    /**
-     * Returns the directory for temporary upload inputs.
-     *
-     * @return the configured temporary input directory path
-     */
     public Path getTempInputDir() {
         return Path.of(tempInputsDir);
     }
 
-    /**
-     * Returns the directory for temporary processing outputs.
-     *
-     * @return the configured temporary output directory path
-     */
     public Path getTempOutputDir() {
         return Path.of(tempOutputsDir);
     }
 
-    /**
-     * Returns the given user's root media directory, creating it if necessary.
-     *
-     * @param userId the ID of the user
-     * @return the user's media directory path
-     * @throws IOException if the directory cannot be created
-     */
     public Path getUserDir(Long userId) throws IOException {
         Path userDir = Path.of(usersDir + File.separator + userId);
         Files.createDirectories(userDir);
         return userDir;
     }
 
-    /**
-     * Returns the given user's VoDs directory, creating it if necessary.
-     *
-     * @param userId the ID of the user
-     * @return the user's VoDs directory path
-     * @throws IOException if the directory cannot be created
-     */
     public Path getVodsDir(Long userId) throws IOException {
         Path vodDir = getUserDir(userId).resolve(VODS_DIR_NAME);
         Files.createDirectories(vodDir);
         return vodDir;
     }
 
-    /**
-     * Returns the given user's clips directory, creating it if necessary.
-     *
-     * @param userId the ID of the user
-     * @return the user's clips directory path
-     * @throws IOException if the directory cannot be created
-     */
     public Path getClipsDir(Long userId) throws IOException {
         Path clipsDir = getUserDir(userId).resolve(CLIPS_DIR_NAME);
         Files.createDirectories(clipsDir);
         return clipsDir;
     }
 
-    /**
-     * Returns the given user's thumbnails directory, creating it if necessary.
-     *
-     * @param userId the ID of the user
-     * @return the user's thumbnails directory path
-     * @throws IOException if the directory cannot be created
-     */
     public Path getThumbnailsDir(Long userId) throws IOException {
         Path thumbnailsDir = getUserDir(userId).resolve(THUMBNAIL_DIR_NAME);
         Files.createDirectories(thumbnailsDir);
         return thumbnailsDir;
     }
 
-    /**
-     * Returns the directory holding a stream's recorded HLS segments, creating it if necessary.
-     *
-     * @param streamKey the stream key naming the segment directory
-     * @return the stream's segment directory path
-     * @throws IOException if the directory cannot be created
-     */
     public Path getStreamDir(String streamKey) throws IOException {
         Path streamFolder = Path.of(streamsDir, streamKey);
         Files.createDirectories(streamFolder);
         return streamFolder;
     }
 
-    /**
-     * Converts an absolute path into one relative to the users media root, for storage in the database.
-     *
-     * @param path the absolute path to relativise
-     * @return the path relative to the users media directory
-     */
     public Path relativisePath(Path path) {
         Path media = Path.of(usersDir).toAbsolutePath();
         Path newPath = path.toAbsolutePath();
         return media.relativize(newPath);
     }
 
-    /**
-     * Resolves a stored relative path back into an absolute path under the users media root.
-     *
-     * @param path the relative path, as stored in the database
-     * @return the absolute path on disk
-     */
     public Path resolvePath(String path) {
         Path media = Path.of(usersDir).toAbsolutePath();
         Path newPath = Path.of(path);
         return media.resolve(newPath);
     }
 
-    /**
-     * Writes an uploaded file to the given path, creating parent directories and overwriting any existing file.
-     *
-     * @param path          the destination path
-     * @param multipartFile the uploaded file to save
-     * @throws IOException if writing the file fails
-     */
     public void saveMultipartFile(Path path, MultipartFile multipartFile) throws IOException {
         Files.createDirectories(path.getParent());
         Files.copy(multipartFile.getInputStream(), path, StandardCopyOption.REPLACE_EXISTING);
     }
 
-    /**
-     * Copies a file, creating parent directories and overwriting any existing target.
-     *
-     * @param source the file to copy from
-     * @param target the destination path
-     * @throws IOException if the copy fails
-     */
     public void copyFile(Path source, Path target) throws IOException {
         Files.createDirectories(target.getParent());
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
@@ -217,12 +146,6 @@ public class DirectoryService {
         }
     }
 
-    /**
-     * Creates the temporary and users media directories on startup and verifies they are usable.
-     *
-     * @throws IOException           if a directory cannot be created
-     * @throws IllegalStateException if any required directory is not a readable, writable directory
-     */
     @PostConstruct
     public void createDirectoriesIfNotExist() throws IOException {
         Files.createDirectories(Path.of(tempInputsDir));
@@ -232,13 +155,6 @@ public class DirectoryService {
         checkDirPermissions();
     }
 
-    /**
-     * Scheduled cleanup that deletes stale files from the temporary input and output directories.
-     * <p>
-     * Runs every 30 minutes; files older than 3 hours are removed.
-     *
-     * @throws IOException if listing a temporary directory fails
-     */
     @Scheduled(fixedRate = TEMP_DIR_CLEANUP_RATE)
     public void cleanTempDirectories() throws IOException {
         cleanUpDirectory(tempInputsDir);

src/main/java/com/ddf/vodsystem/services/MarkerService.java

@@ -32,14 +32,6 @@ public class MarkerService {
         this.markerRepository = markerRepository;
     }
 
-    /**
-     * Returns the marker with the given ID, verifying ownership by the current user.
-     *
-     * @param id the ID of the marker to retrieve
-     * @return the matching {@link Marker}
-     * @throws MarkerNotFound   if no marker with {@code id} exists
-     * @throws NotAuthenticated if the current user does not own the marker
-     */
     public Marker getMarkerById(Long id) {
         Optional<Marker> marker = markerRepository.findById(id);
 
@@ -55,12 +47,6 @@ public class MarkerService {
         return marker.get();
     }
 
-    /**
-     * Returns all markers belonging to the currently authenticated user.
-     *
-     * @return list of the current user's markers
-     * @throws NotAuthenticated if no user session is present
-     */
     public List<Marker> getUserMarkers() {
         Optional<User> user = userService.getLoggedInUser();
 
@@ -71,13 +57,6 @@ public class MarkerService {
         return markerRepository.findByUser(user.get());
     }
 
-    /**
-     * Creates a marker timestamped now on the current user's active stream.
-     *
-     * @param message the marker's descriptive message
-     * @return the persisted {@link Marker}
-     * @throws NotStreaming if the user has no active stream to mark
-     */
     public Marker create(String message) {
         Optional<Stream> stream = streamService.getActiveStream();
 
@@ -93,23 +72,11 @@ public class MarkerService {
         return markerRepository.saveAndFlush(marker);
     }
 
-    /**
-     * Deletes a marker owned by the current user.
-     *
-     * @param id the ID of the marker to delete
-     * @throws MarkerNotFound   if no marker with {@code id} exists
-     * @throws NotAuthenticated if the current user does not own the marker
-     */
     public void deleteMarker(Long id) {
         Marker marker = getMarkerById(id);
         markerRepository.delete(marker);
     }
 
-    /**
-     * Scheduled cleanup that deletes markers older than the configured maximum stream length.
-     * <p>
-     * Runs periodically (every 6 minutes) to purge markers left behind by streams that have ended.
-     */
     @Scheduled(fixedDelay = 360_000)
     @Transactional
     public void deleteOldMarkers() {

src/main/java/com/ddf/vodsystem/services/StreamService.java

@@ -30,14 +30,6 @@ public class StreamService {
         this.userService = userService;
     }
 
-    /**
-     * Starts a new stream for the user identified by the given stream key.
-     *
-     * @param streamKey the stream key resolving to the broadcasting user
-     * @return the newly persisted {@link Stream}
-     * @throws KeyNotFound      if no user owns {@code streamKey}
-     * @throws AlreadyStreaming if the user already has an active stream
-     */
     public Stream startStream(String streamKey) {
         User user = resolveUser(streamKey);
 
@@ -53,13 +45,6 @@ public class StreamService {
         return streamRepository.saveAndFlush(stream);
     }
 
-    /**
-     * Ends the active stream for the user identified by the given stream key.
-     *
-     * @param streamKey the stream key resolving to the broadcasting user
-     * @throws KeyNotFound           if no user owns {@code streamKey}
-     * @throws IllegalStateException if the user has no active stream
-     */
     public void endStream(String streamKey) {
         User user = resolveUser(streamKey);
 
@@ -71,13 +56,6 @@ public class StreamService {
         streamRepository.saveAndFlush(stream);
     }
 
-    /**
-     * Records a liveness heartbeat on the active stream, refreshing its last-seen time.
-     *
-     * @param streamKey the stream key resolving to the broadcasting user
-     * @throws KeyNotFound           if no user owns {@code streamKey}
-     * @throws IllegalStateException if the user has no active stream
-     */
     public void heartbeatStream(String streamKey) {
         User user = resolveUser(streamKey);
 
@@ -89,12 +67,6 @@ public class StreamService {
         streamRepository.saveAndFlush(stream);
     }
 
-    /**
-     * Returns the current user's active (not-yet-ended) stream, if any.
-     *
-     * @return the active {@link Stream}, or empty if the user is not currently streaming
-     * @throws NotAuthenticated if no user session is present
-     */
     public Optional<Stream> getActiveStream() {
         Optional<User> user = userService.getLoggedInUser();
 
@@ -105,14 +77,6 @@ public class StreamService {
         return streamRepository.findByUserAndEndDateIsNull(user.get());
     }
 
-    /**
-     * Returns the full stream history for the given user.
-     *
-     * @param userId the ID of the user whose history to retrieve
-     * @return the user's streams, past and present
-     * @throws IllegalArgumentException if no user with {@code userId} exists
-     * @throws NotAuthenticated         if no user is authenticated, or the caller is not that user
-     */
     public List<Stream> getStreamHistory(Long userId) {
         User streamUser = userService.getUserById(userId)
                 .orElseThrow(() -> new IllegalArgumentException("User not found: " + userId));
@@ -130,12 +94,6 @@ public class StreamService {
         return streamRepository.findByUser(streamUser);
     }
 
-    /**
-     * Scheduled sweep that ends streams which have missed heartbeats past the timeout.
-     * <p>
-     * Runs every 30 seconds; any active stream whose last heartbeat is older than
-     * {@value #HEARTBEAT_TIMEOUT_SECONDS} seconds is marked ended.
-     */
     @Scheduled(fixedDelay = 30_000)
     @Transactional
     public void endStaleStreams() {

src/main/java/com/ddf/vodsystem/services/UserService.java

@@ -44,21 +44,10 @@ public class UserService {
         this.jwtService = jwtService;
     }
 
-    /**
-     * Looks up a user by their database ID.
-     *
-     * @param userId the ID of the user to find
-     * @return the matching {@link User}, or empty if none exists
-     */
     public Optional<User> getUserById(Long userId) {
         return userRepository.findById(userId);
     }
 
-    /**
-     * Returns the user backing the current Spring Security authentication, if authenticated.
-     *
-     * @return the authenticated {@link User}, or empty if no user is authenticated
-     */
     public Optional<User> getLoggedInUser() {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth != null && auth.isAuthenticated() && auth.getPrincipal() instanceof User user) {
@@ -67,13 +56,6 @@ public class UserService {
         return Optional.empty();
     }
 
-    /**
-     * Verifies a Google ID token, creating or updating the corresponding user, and issues a session JWT.
-     *
-     * @param idToken the Google ID token to verify
-     * @return a signed JWT for the authenticated user
-     * @throws NotAuthenticated if the token is invalid or its subject is missing
-     */
     public String login(String idToken) {
         GoogleIdToken googleIdToken = getGoogleIdToken(idToken);
         String googleId = googleIdToken.getPayload().getSubject();
@@ -88,12 +70,6 @@ public class UserService {
         return jwtService.generateToken(user.getId());
     }
 
-    /**
-     * Looks up a user by their stream key.
-     *
-     * @param streamKey the stream key to match
-     * @return the matching {@link User}, or empty if none exists
-     */
     public Optional<User> getUserByStreamKey(String streamKey) {
         return userRepository.findByStreamKey(streamKey);
     }

src/main/java/com/ddf/vodsystem/services/media/CommandRunner.java

@@ -16,15 +16,6 @@ import java.util.regex.Pattern;
 public class CommandRunner {
     private static final Pattern timePattern = Pattern.compile("out_time_ms=(\\d+)");
 
-    /**
-     * Runs an external command, capturing its merged stdout/stderr and streaming each line to a callback.
-     *
-     * @param command  the command and its arguments
-     * @param onOutput invoked for each output line as it is read, or {@code null} to skip streaming
-     * @return the captured output and exit code
-     * @throws IOException          if the process fails to start or exits with a non-zero code
-     * @throws InterruptedException if the current thread is interrupted while awaiting the process
-     */
     public CommandOutput run(List<String> command, Consumer<String> onOutput) throws IOException, InterruptedException {
         ProcessBuilder processBuilder = new ProcessBuilder(command);
         processBuilder.redirectErrorStream(true);
@@ -52,27 +43,10 @@ public class CommandRunner {
         return commandOutput;
     }
 
-    /**
-     * Runs an external command, capturing its output without streaming.
-     *
-     * @param command the command and its arguments
-     * @return the captured output and exit code
-     * @throws IOException          if the process fails to start or exits with a non-zero code
-     * @throws InterruptedException if the current thread is interrupted while awaiting the process
-     */
     public CommandOutput run(List<String> command) throws IOException, InterruptedException {
         return run(command, null);
     }
 
-    /**
-     * Parses an ffmpeg progress line and updates the tracker with the fraction completed.
-     * <p>
-     * Lines without an {@code out_time_ms} field are ignored.
-     *
-     * @param line     a single line of ffmpeg {@code -progress} output
-     * @param progress the tracker to update
-     * @param length   the total media length in seconds, used as the progress denominator
-     */
     public void setProgress(String line, ProgressTracker progress, float length) {
         Matcher matcher = timePattern.matcher(line);
         if (matcher.find()) {

src/main/java/com/ddf/vodsystem/services/media/CompressionService.java

@@ -27,17 +27,6 @@ public class CompressionService {
         this.commandRunner = commandRunner;
     }
 
-    /**
-     * Compresses (and optionally trims/rescales) a video with ffmpeg on a background executor.
-     * <p>
-     * Runs asynchronously; failures complete the returned future exceptionally rather than throwing.
-     *
-     * @param inputFile   the source video file
-     * @param outputFile  the destination for the compressed output
-     * @param clipOptions the trim window, target resolution/fps, and size driving the ffmpeg command
-     * @param progress    the tracker updated as encoding progresses
-     * @return a future completing with the ffmpeg output, or exceptionally on failure
-     */
     @Async("ffmpegTaskExecutor")
     public CompletableFuture<CommandOutput> compress(Path inputFile,
                                                      Path outputFile,

src/main/java/com/ddf/vodsystem/services/media/MetadataService.java

@@ -26,14 +26,6 @@ public class MetadataService {
         this.commandRunner = commandRunner;
     }
 
-    /**
-     * Probes a video file with ffprobe and returns its metadata (duration, dimensions, fps, size).
-     * <p>
-     * Runs asynchronously; failures complete the returned future exceptionally rather than throwing.
-     *
-     * @param file the video file to probe
-     * @return a future completing with the parsed {@link ClipOptions}, or exceptionally on failure
-     */
     @Async("ffmpegTaskExecutor")
     public CompletableFuture<ClipOptions> getVideoMetadata(Path file) {
         logger.info("Getting metadata for file {}", file);

src/main/java/com/ddf/vodsystem/services/media/RemuxService.java

@@ -21,17 +21,6 @@ public class RemuxService {
         this.commandRunner = commandRunner;
     }
 
-    /**
-     * Re-encodes a video to H.264/AAC in an MP4 container with ffmpeg on a background executor.
-     * <p>
-     * Runs asynchronously; failures complete the returned future exceptionally rather than throwing.
-     *
-     * @param inputFile     the source video file
-     * @param outputFile    the destination for the remuxed MP4
-     * @param remuxProgress the tracker updated as encoding progresses
-     * @param length        the media length in seconds, used to compute progress
-     * @return a future completing with the ffmpeg output, or exceptionally on failure
-     */
     @Async("ffmpegTaskExecutor")
     public CompletableFuture<CommandOutput> remux(File inputFile,
                                                   File outputFile,

src/main/java/com/ddf/vodsystem/services/media/ThumbnailService.java

@@ -20,16 +20,6 @@ public class ThumbnailService {
         this.commandRunner = commandRunner;
     }
 
-    /**
-     * Extracts a single frame from a video as a thumbnail image with ffmpeg on a background executor.
-     * <p>
-     * Runs asynchronously; failures complete the returned future exceptionally rather than throwing.
-     *
-     * @param inputFile   the source video file
-     * @param outputFile  the destination for the thumbnail image
-     * @param timeInVideo the timestamp in seconds at which to capture the frame
-     * @return a future completing with the ffmpeg output, or exceptionally on failure
-     */
     @Async("ffmpegTaskExecutor")
     public CompletableFuture<CommandOutput> createThumbnail(Path inputFile, Path outputFile, Float timeInVideo) {
         logger.info("Creating thumbnail at {} seconds", timeInVideo);