visual upgrades and bugfixes

2026-02-08 12:47:49 +00:00
parent c9a7dc4e82
commit af2572090d
4 changed files with 355 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 */__pycache__
 */__pycache__/*
+.tmp
--- a/frontend/app.js
+++ b/frontend/app.js
@@ -2,6 +2,7 @@
 let currentPage = 1;
 const perPage = 12;
 const renderedVideoIds = new Set();
+let currentQuery = "";

 // 2. Observer Definition (Must be defined before initApp uses it)
 const observer = new IntersectionObserver((entries) => {
@@ -13,6 +14,9 @@ async function InitializeLocalStorage() {
    if (!localStorage.getItem('config')) {
        localStorage.setItem('config', JSON.stringify({ servers: [{ "https://getfigleaf.com": {} }] }));
    }
+    if (!localStorage.getItem('theme')) {
+        localStorage.setItem('theme', 'dark');
+    }
    // We always run this to make sure session is fresh
    await InitializeServerStatus();
 }
@@ -49,7 +53,11 @@ async function InitializeServerStatus() {
        if (channel.options) {
            channel.options.forEach(element => {
                // Ensure the options structure matches your API expectations
-                options[element.id] = element.options[0];
+                if (element.multiSelect) {
+                    options[element.id] = element.options.length > 0 ? [element.options[0]] : [];
+                } else {
+                    options[element.id] = element.options[0];
+                }
            });
        }

@@ -70,7 +78,7 @@ async function loadVideos() {
    // Build the request body
    let body = {
        channel: session.channel.id,
-        query: "",
+        query: currentQuery,
        page: currentPage,
        perPage: perPage,
        server: session.server
@@ -78,7 +86,11 @@ async function loadVideos() {

    // Correct way to loop through the options object
    Object.entries(session.options).forEach(([key, value]) => {
-        body[key] = value.id;
+        if (Array.isArray(value)) {
+            body[key] = value.map((entry) => entry.id);
+        } else if (value && value.id) {
+            body[key] = value.id;
+        }
    });

    try {
@@ -122,6 +134,8 @@ async function initApp() {
    // localStorage.clear(); 

    await InitializeLocalStorage(); 
+    applyTheme();
+    renderMenu();
    
    const sentinel = document.getElementById('sentinel');
    if (sentinel) {
@@ -131,6 +145,13 @@ async function initApp() {
    await loadVideos();
 }

+function applyTheme() {
+    const theme = localStorage.getItem('theme') || 'dark';
+    document.body.classList.toggle('theme-light', theme === 'light');
+    const select = document.getElementById('theme-select');
+    if (select) select.value = theme;
+}
+
 function openPlayer(url) {
    const modal = document.getElementById('video-modal');
    const video = document.getElementById('player');
@@ -148,4 +169,250 @@ function closePlayer() {
    document.body.style.overflow = 'auto';
 }

+function handleSearch(value) {
+    currentQuery = value || "";
+    currentPage = 1;
+    renderedVideoIds.clear();
+    const grid = document.getElementById('video-grid');
+    if (grid) grid.innerHTML = "";
+    loadVideos();
+}
+
+function getConfig() {
+    return JSON.parse(localStorage.getItem('config')) || { servers: [] };
+}
+
+function getSession() {
+    return JSON.parse(localStorage.getItem('session')) || null;
+}
+
+function setSession(nextSession) {
+    localStorage.setItem('session', JSON.stringify(nextSession));
+}
+
+function getServerEntries() {
+    const config = getConfig();
+    if (!config.servers || !Array.isArray(config.servers)) return [];
+    return config.servers.map((serverObj) => {
+        const server = Object.keys(serverObj)[0];
+        return { url: server, data: serverObj[server] || null };
+    });
+}
+
+function buildDefaultOptions(channel) {
+    const selected = {};
+    if (!channel || !Array.isArray(channel.options)) return selected;
+    channel.options.forEach((optionGroup) => {
+        if (!optionGroup.options || optionGroup.options.length === 0) return;
+        if (optionGroup.multiSelect) {
+            selected[optionGroup.id] = [optionGroup.options[0]];
+        } else {
+            selected[optionGroup.id] = optionGroup.options[0];
+        }
+    });
+    return selected;
+}
+
+function resetAndReload() {
+    currentPage = 1;
+    renderedVideoIds.clear();
+    const grid = document.getElementById('video-grid');
+    if (grid) grid.innerHTML = "";
+    loadVideos();
+}
+
+function renderMenu() {
+    const session = getSession();
+    const serverEntries = getServerEntries();
+    const sourceSelect = document.getElementById('source-select');
+    const channelSelect = document.getElementById('channel-select');
+    const filtersContainer = document.getElementById('filters-container');
+
+    if (!sourceSelect || !channelSelect || !filtersContainer) return;
+
+    sourceSelect.innerHTML = "";
+    serverEntries.forEach((entry) => {
+        const option = document.createElement('option');
+        option.value = entry.url;
+        option.textContent = entry.url;
+        sourceSelect.appendChild(option);
+    });
+
+    if (session && session.server) {
+        sourceSelect.value = session.server;
+    }
+
+    sourceSelect.onchange = () => {
+        const selectedServerUrl = sourceSelect.value;
+        const selectedServer = serverEntries.find((entry) => entry.url === selectedServerUrl);
+        const channels = selectedServer && selectedServer.data && selectedServer.data.channels
+            ? selectedServer.data.channels
+            : [];
+        const nextChannel = channels.length > 0 ? channels[0] : null;
+        const nextSession = {
+            server: selectedServerUrl,
+            channel: nextChannel,
+            options: nextChannel ? buildDefaultOptions(nextChannel) : {}
+        };
+        setSession(nextSession);
+        renderMenu();
+        resetAndReload();
+    };
+
+    const activeServer = serverEntries.find((entry) => entry.url === (session && session.server));
+    const availableChannels = activeServer && activeServer.data && activeServer.data.channels
+        ? activeServer.data.channels
+        : [];
+
+    channelSelect.innerHTML = "";
+    availableChannels.forEach((channel) => {
+        const option = document.createElement('option');
+        option.value = channel.id;
+        option.textContent = channel.name || channel.id;
+        channelSelect.appendChild(option);
+    });
+
+    if (session && session.channel) {
+        channelSelect.value = session.channel.id;
+    }
+
+    channelSelect.onchange = () => {
+        const selectedId = channelSelect.value;
+        const nextChannel = availableChannels.find((channel) => channel.id === selectedId) || null;
+        const nextSession = {
+            server: session.server,
+            channel: nextChannel,
+            options: nextChannel ? buildDefaultOptions(nextChannel) : {}
+        };
+        setSession(nextSession);
+        renderMenu();
+        resetAndReload();
+    };
+
+    renderFilters(filtersContainer, session);
+
+    const themeSelect = document.getElementById('theme-select');
+    if (themeSelect) {
+        themeSelect.onchange = () => {
+            const nextTheme = themeSelect.value === 'light' ? 'light' : 'dark';
+            localStorage.setItem('theme', nextTheme);
+            applyTheme();
+        };
+    }
+}
+
+function renderFilters(container, session) {
+    container.innerHTML = "";
+
+    if (!session || !session.channel || !Array.isArray(session.channel.options)) {
+        const empty = document.createElement('div');
+        empty.className = 'filters-empty';
+        empty.textContent = 'No filters available for this channel.';
+        container.appendChild(empty);
+        return;
+    }
+
+    session.channel.options.forEach((optionGroup) => {
+        const wrapper = document.createElement('div');
+        wrapper.className = 'setting-item';
+
+        const label = document.createElement('label');
+        label.textContent = optionGroup.title || optionGroup.id;
+
+        const select = document.createElement('select');
+        select.multiple = Boolean(optionGroup.multiSelect);
+
+        (optionGroup.options || []).forEach((opt) => {
+            const option = document.createElement('option');
+            option.value = opt.id;
+            option.textContent = opt.title || opt.id;
+            select.appendChild(option);
+        });
+
+        const currentSelection = session.options ? session.options[optionGroup.id] : null;
+        if (Array.isArray(currentSelection)) {
+            const ids = new Set(currentSelection.map((item) => item.id));
+            Array.from(select.options).forEach((opt) => {
+                opt.selected = ids.has(opt.value);
+            });
+        } else if (currentSelection && currentSelection.id) {
+            select.value = currentSelection.id;
+        }
+
+        select.onchange = () => {
+            const nextSession = getSession();
+            if (!nextSession || !nextSession.channel) return;
+
+            const selectedOptions = optionGroup.options || [];
+            if (optionGroup.multiSelect) {
+                const selected = Array.from(select.selectedOptions).map((opt) =>
+                    selectedOptions.find((item) => item.id === opt.value)
+                ).filter(Boolean);
+                nextSession.options[optionGroup.id] = selected;
+            } else {
+                const selected = selectedOptions.find((item) => item.id === select.value);
+                if (selected) {
+                    nextSession.options[optionGroup.id] = selected;
+                }
+            }
+
+            setSession(nextSession);
+            resetAndReload();
+        };
+
+        wrapper.appendChild(label);
+        wrapper.appendChild(select);
+        container.appendChild(wrapper);
+    });
+}
+
+function closeDrawers() {
+    const menuDrawer = document.getElementById('drawer-menu');
+    const settingsDrawer = document.getElementById('drawer-settings');
+    const overlay = document.getElementById('overlay');
+    const menuBtn = document.querySelector('.menu-toggle');
+    const settingsBtn = document.querySelector('.settings-toggle');
+
+    if (menuDrawer) menuDrawer.classList.remove('open');
+    if (settingsDrawer) settingsDrawer.classList.remove('open');
+    if (overlay) overlay.classList.remove('open');
+    if (menuBtn) menuBtn.classList.remove('active');
+    if (settingsBtn) settingsBtn.classList.remove('active');
+    document.body.classList.remove('drawer-open');
+}
+
+function toggleDrawer(type) {
+    const menuDrawer = document.getElementById('drawer-menu');
+    const settingsDrawer = document.getElementById('drawer-settings');
+    const overlay = document.getElementById('overlay');
+    const menuBtn = document.querySelector('.menu-toggle');
+    const settingsBtn = document.querySelector('.settings-toggle');
+
+    const isMenu = type === 'menu';
+    const targetDrawer = isMenu ? menuDrawer : settingsDrawer;
+    const otherDrawer = isMenu ? settingsDrawer : menuDrawer;
+    const targetBtn = isMenu ? menuBtn : settingsBtn;
+    const otherBtn = isMenu ? settingsBtn : menuBtn;
+
+    if (!targetDrawer || !overlay) return;
+
+    const willOpen = !targetDrawer.classList.contains('open');
+
+    if (otherDrawer) otherDrawer.classList.remove('open');
+    if (otherBtn) otherBtn.classList.remove('active');
+
+    if (willOpen) {
+        targetDrawer.classList.add('open');
+        if (targetBtn) targetBtn.classList.add('active');
+        overlay.classList.add('open');
+        document.body.classList.add('drawer-open');
+    } else {
+        closeDrawers();
+    }
+}
+
+document.addEventListener('keydown', (event) => {
+    if (event.key === 'Escape') closeDrawers();
+});
+
 initApp();
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -29,11 +29,24 @@
            <h3>Menu</h3>
            <button class="close-btn" onclick="closeDrawers()">✕</button>
        </div>
-        <nav class="sidebar-content">
-            <a href="#" class="sidebar-item">Home</a>
-            <a href="#" class="sidebar-item">Trending</a>
-            <a href="#" class="sidebar-item">Subscriptions</a>
-        </nav>
+        <div class="sidebar-content">
+            <div class="sidebar-section">
+                <h4 class="sidebar-subtitle">Network</h4>
+                <div class="setting-item">
+                    <label for="source-select">Source</label>
+                    <select id="source-select"></select>
+                </div>
+                <div class="setting-item">
+                    <label for="channel-select">Channel</label>
+                    <select id="channel-select"></select>
+                </div>
+            </div>
+
+            <div class="sidebar-section">
+                <h4 class="sidebar-subtitle">Filters</h4>
+                <div id="filters-container" class="filters-container"></div>
+            </div>
+        </div>
    </aside>

    <aside id="drawer-settings" class="sidebar">
@@ -44,9 +57,9 @@
        <div class="sidebar-content">
            <div class="setting-item">
                <label>Theme</label>
-                <select>
-                    <option>Dark</option>
-                    <option>Light</option>
+                <select id="theme-select">
+                    <option value="dark">Dark</option>
+                    <option value="light">Light</option>
                </select>
            </div>
        </div>
--- a/frontend/style.css
+++ b/frontend/style.css
@@ -9,6 +9,7 @@
    --accent: #6366f1;
    --accent-hover: #818cf8;
    --border: #2a2f4a;
+    --shadow: rgba(0, 0, 0, 0.4);
 }

 html, body { height: 100%; }
@@ -22,6 +23,22 @@ body {
    font-size: 14px;
 }

+body.drawer-open {
+    overflow: hidden;
+}
+
+body.theme-light {
+    --bg-primary: #f6f7fb;
+    --bg-secondary: #ffffff;
+    --bg-tertiary: #eef1f7;
+    --text-primary: #0f172a;
+    --text-secondary: #475569;
+    --accent: #2563eb;
+    --accent-hover: #1d4ed8;
+    --border: #e2e8f0;
+    --shadow: rgba(15, 23, 42, 0.12);
+}
+
 /* Top Bar */
 .top-bar {
    height: 64px;
@@ -110,6 +127,14 @@ body {
    filter: none;
 }

+body.theme-light .icon-svg {
+    filter: invert(20%) saturate(0%);
+}
+
+body.theme-light .icon-btn:hover .icon-svg {
+    filter: none;
+}
+
 /* Hamburger Menu */
 .hamburger {
    display: flex;
@@ -192,6 +217,24 @@ body {
    overflow-y: auto;
 }

+.sidebar-section {
+    padding: 8px 0 4px 0;
+    border-bottom: 1px solid var(--border);
+}
+
+.sidebar-section:last-child {
+    border-bottom: none;
+}
+
+.sidebar-subtitle {
+    font-size: 12px;
+    font-weight: 600;
+    color: var(--text-secondary);
+    text-transform: uppercase;
+    letter-spacing: 0.6px;
+    padding: 8px 24px 4px 24px;
+}
+
 .sidebar-item {
    display: block;
    padding: 12px 24px;
@@ -212,6 +255,17 @@ body {
    border-bottom: 1px solid var(--border);
 }

+.filters-container .setting-item {
+    padding-top: 12px;
+    padding-bottom: 12px;
+}
+
+.filters-empty {
+    padding: 12px 24px 20px 24px;
+    color: var(--text-secondary);
+    font-size: 13px;
+}
+
 .setting-item label {
    display: block;
    font-size: 13px;
@@ -277,7 +331,7 @@ body {

 .video-card:hover {
    transform: translateY(-4px);
-    box-shadow: 0 8px 16px rgba(0, 0, 0, 0.4);
+    box-shadow: 0 8px 16px var(--shadow);
 }

 .video-card img {
@@ -317,6 +371,10 @@ body {
    z-index: 2000;
 }

+body.theme-light .modal {
+    background: #0b0b0b;
+}
+
 .modal.open {
    display: flex;
 }