From 01ea60c070a9eb97baac055a50bb9361a5e56434 Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 15:19:13 +0300
Subject: [PATCH 1/7] Add new subjects

---
 .gitignore                       |   3 +-
 astro.config.mjs                 |  17 +-
 cuza-worker/src/app.ts           | 105 ++++---
 cuza-worker/src/index.ts         |   9 +
 functions/api/[[route]].ts       |  37 ---
 public/robots.txt                |   2 +-
 src/api.ts                       |   7 +-
 src/components/Extra.astro       |  54 ++--
 src/components/Footer.astro      |   2 +-
 src/components/List.astro        | 103 ++++---
 src/components/NewNavbar.astro   |  13 +-
 src/components/NewPage.astro     |  69 ++++-
 src/config/countdown.ts          |  38 +--
 src/config/labels.ts             |   9 +-
 src/layouts/Layout.astro         |   6 +-
 src/pages/404.astro              |   7 +-
 src/pages/[subject]/[page].astro |  15 +-
 src/pages/[subject]/index.astro  |  11 +-
 src/pages/contribute.astro       |  11 +-
 src/pages/index.astro            |   2 +-
 src/pages/install.astro          |  11 +-
 src/pages/notite/info.astro      |   8 +-
 src/pages/notite/romana.astro    |   8 +-
 src/pages/upload.astro           | 506 +++++++++++++------------------
 src/paths.ts                     |  38 ---
 web-scraper/main.py              | 121 +++++---
 web-scraper/run.sh               |  45 ++-
 27 files changed, 636 insertions(+), 621 deletions(-)
 delete mode 100644 functions/api/[[route]].ts
 delete mode 100644 src/paths.ts

diff --git a/.gitignore b/.gitignore
index 5c734ff..e277443 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,5 +35,4 @@ pnpm-debug.log*
 
 # temporary files
 web-scraper/temp/
-web-scraper/files/
-web-scraper/files2/
\ No newline at end of file
+web-scraper/files*
\ No newline at end of file
diff --git a/astro.config.mjs b/astro.config.mjs
index e4f6417..8032a6b 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -7,23 +7,11 @@ import playformCompress from '@playform/compress';
 export default defineConfig({
   site: 'https://cuza.pages.dev',
   trailingSlash: 'never',
-  redirects: {
-    '/fizica': '/',
-  },
   build: {
     format: 'file',
     inlineStylesheets: 'always',
-    assets: 'file',
   },
   vite: {
-    build: {
-      chunkSizeWarningLimit: 2000,
-      rollupOptions: {
-        output: {
-          assetFileNames: `file/[name][extname]`,
-        },
-      },
-    },
     plugins: [tailwindcss()],
   },
   markdown: {
@@ -33,7 +21,10 @@ export default defineConfig({
   },
   integrations: [
     sitemap({
-      filter: (page) => !page.includes('/install') && !page.includes('/upload'),
+      filter: (page) =>
+        !page.includes('/install') &&
+        !page.includes('/upload') &&
+        !page.includes('/contribute'),
     }),
     react(),
     playformCompress(),
diff --git a/cuza-worker/src/app.ts b/cuza-worker/src/app.ts
index 31a6bde..902cc80 100644
--- a/cuza-worker/src/app.ts
+++ b/cuza-worker/src/app.ts
@@ -108,6 +108,17 @@ function getSubtree(
   return current;
 }
 
+/**
+ * Get a subtree as an object, returning {} if the path doesn't exist or is a leaf.
+ */
+function getSubtreeAsObject(
+  index: FileStructure,
+  segments: string[],
+): FileStructure {
+  const subtree = getSubtree(index, segments);
+  return subtree !== null && typeof subtree !== 'string' ? subtree : {};
+}
+
 /**
  * Set a value at a nested path, creating intermediate objects as needed.
  */
@@ -270,18 +281,34 @@ function pruneMissingIndexLeaves(
   return cleaned;
 }
 
-const VALID_PAGES = new Set(['bac', 'teste', 'sim']);
+const VALID_PAGES = new Set(['bac', 'sim']);
 const VALID_SIMULATIONS = new Set(['judetene', 'locale']);
 const VALID_TYPE2 = new Set(['var', 'bar']);
-const BAC_TITLE_TO_CODE: Record<string, string> = {
-  Model: 'SM',
-  Simulare: 'sim',
-  'Sesiunea-I': 'S1',
-  'Sesiunea-II': 'S2',
-  'Sesiune-speciala': 'SS',
-};
+const VALID_VARIANTS = new Set([
+  '01',
+  '02',
+  '03',
+  '04',
+  '05',
+  '06',
+  '07',
+  '08',
+  '09',
+  '10',
+]);
+const VARIANT_REQUIRED_TITLES = new Set([
+  'Sesiunea-I',
+  'Sesiunea-II',
+  'Sesiunea-speciala',
+]);
+const BAC_TITLES = [
+  'Model',
+  'Simulare',
+  'Sesiunea-I',
+  'Sesiunea-II',
+  'Sesiunea-speciala',
+] as const;
 const YEAR_RE = /^20[1-3]\d$/;
-const TEST_NUMBER_RE = /^\d{1,2}$/;
 const MAX_FILE_BYTES = 20 * 1024 * 1024; // 20 MB
 
 /**
@@ -319,20 +346,14 @@ function validateFormData(formData: FormData): string | null {
   // ── Page-specific validation ───────────────────────────────────────────────
   if (page === 'bac') {
     const title = formData.get('title') as string | null;
-    if (!title) {
-      return 'Lipsă titlu';
-    }
-    if (!(title in BAC_TITLE_TO_CODE)) {
-      return 'Titlu BAC invalid';
-    }
-  }
-  if (page === 'teste') {
-    const testNumber = formData.get('testNumber') as string | null;
-    if (!testNumber) {
-      return 'Lipsă număr test';
+    if (!title || !(BAC_TITLES as readonly string[]).includes(title)) {
+      return 'Lipsă tip sau tip invalid';
     }
-    if (!TEST_NUMBER_RE.test(testNumber)) {
-      return 'Număr test invalid';
+    if (VARIANT_REQUIRED_TITLES.has(title)) {
+      const variant = formData.get('variant') as string | null;
+      if (!variant || !VALID_VARIANTS.has(variant)) {
+        return 'Lipsă variantă sau variantă invalidă (01-10)';
+      }
     }
   }
   if (page === 'sim') {
@@ -358,37 +379,30 @@ interface UploadPathData {
   page: string;
   year: string;
   title: string | null;
+  variant: string | null;
   type2: string;
   reserve: boolean;
-  testNumber: string | null;
   simulation: string | null;
   county: string | null;
   local: string | null;
 }
 
 function generateUploadPath(data: UploadPathData): { r2Key: string } {
-  const { page, year, type2, testNumber, simulation, reserve } = data;
+  const { page, year, variant, simulation, reserve, type2 } = data;
   const title = sanitizePathSegment(data.title);
   const county = sanitizePathSegment(data.county);
   const local = sanitizePathSegment(data.local);
 
   if (page === 'bac') {
-    const baseCode = BAC_TITLE_TO_CODE[data.title ?? ''];
-    const code = reserve ? `${baseCode}R` : baseCode;
-    return {
-      r2Key: `fizica/pages/bac/${year}/${title}/E_d_fizica_${year}_${code}_${type2}.pdf`,
-    };
-  }
-  if (page === 'teste') {
-    const testNumberNormalized = (testNumber ?? '').padStart(2, '0');
-    const testType = type2 === 'bar' ? 'Bar' : 'Test';
+    const folderName = reserve ? `${title}-rezerva` : title;
+    const varSuffix = variant ? `_${variant}` : '_00';
     return {
-      r2Key: `fizica/pages/teste-de-antrenament/${year}/E_d_fizica_${year}_${testType}_${testNumberNormalized}.pdf`,
+      r2Key: `fizica/pages/teoretic/bac/${year}/${folderName}/E_d_fizica_teoretic_vocational_${year}_${type2}${varSuffix}.pdf`,
     };
   }
   const location = simulation === 'judetene' ? county : local;
   return {
-    r2Key: `fizica/pages/simulari-judetene/${year}/E_d_fizica_${location}_${year}_${type2}.pdf`,
+    r2Key: `fizica/pages/teoretic/simulari-judetene/${year}/E_d_fizica_${location}_${year}_${type2}.pdf`,
   };
 }
 
@@ -410,23 +424,14 @@ export function registerRoutes(app: Hono<{ Bindings: Bindings }>): void {
 
     const index = await getIndex(c.env.FILES);
     const segments = resolvePathSegments(subject, page);
-    const subtree = getSubtree(index, segments);
-    const content: FileStructure =
-      subtree !== null && typeof subtree !== 'string'
-        ? (subtree as FileStructure)
-        : {};
+    const content = getSubtreeAsObject(index, segments);
     const years = extractYears(content);
 
-    // Extra content
     const extraSegments = resolvePathSegments(
       subject,
       subject.toLowerCase() === 'admitere' ? `${page}/extra` : 'extra',
     );
-    const extraSubtree = getSubtree(index, extraSegments);
-    const extra: FileStructure =
-      extraSubtree !== null && typeof extraSubtree !== 'string'
-        ? (extraSubtree as FileStructure)
-        : {};
+    const extra = getSubtreeAsObject(index, extraSegments);
 
     return c.json({ content, extra, years });
   });
@@ -475,25 +480,25 @@ export function registerRoutes(app: Hono<{ Bindings: Bindings }>): void {
     const page = formData.get('page') as string;
     const year = formData.get('year') as string;
     const title = formData.get('title') as string | null;
-    const type2 = formData.get('type2') as string;
+    const variant = formData.get('variant') as string | null;
     const reserveRaw = formData.get('reserve') as string | null;
     const reserve = reserveRaw === 'on' || reserveRaw === 'true';
-    const testNumber = formData.get('testNumber') as string | null;
     const simulation = formData.get('simulation') as string | null;
     const county = formData.get('county') as string | null;
     const local = formData.get('local') as string | null;
+    const type2 = formData.get('type2') as string;
     const file = formData.get('file') as unknown as File;
 
     const { r2Key } = generateUploadPath({
       page,
       year,
       title,
-      type2,
+      variant,
       reserve,
-      testNumber,
       simulation,
       county,
       local,
+      type2,
     });
 
     await c.env.FILES.put(r2Key, file, {
diff --git a/cuza-worker/src/index.ts b/cuza-worker/src/index.ts
index 51b8185..211fb9c 100644
--- a/cuza-worker/src/index.ts
+++ b/cuza-worker/src/index.ts
@@ -16,6 +16,15 @@ app.use('*', async (c, next) => {
   return next();
 });
 
+app.use('*', async (c, next) => {
+  await next();
+  c.res.headers.set('X-Robots-Tag', 'noindex');
+});
+
+app.get('/robots.txt', (c) => {
+  return c.text('User-agent: *\nDisallow: /\n');
+});
+
 app.use(
   '*',
   cors({
diff --git a/functions/api/[[route]].ts b/functions/api/[[route]].ts
deleted file mode 100644
index df610dd..0000000
--- a/functions/api/[[route]].ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/// <reference types="@cloudflare/workers-types" />
-
-export const onRequest: PagesFunction<{ FILES: R2Bucket }> = async (ctx) => {
-  const url = new URL(ctx.request.url);
-  const path = url.pathname.replace(/^\/api/, '');
-
-  if (path === '/ping') {
-    return new Response('Pong!', { status: 200 });
-  }
-
-  const fileMatch = path.match(/^\/file\/(.+)$/);
-  if (fileMatch) {
-    const key = fileMatch[1];
-    const object = await ctx.env.FILES.get(key);
-    if (!object) return new Response('Not Found', { status: 404 });
-
-    const headers = new Headers();
-    object.writeHttpMetadata(headers);
-    headers.set('etag', object.httpEtag);
-    headers.set('Cache-Control', 'public, max-age=31536000, immutable');
-
-    // Ensure PDFs are served inline so Googlebot can index them
-    const contentType = headers.get('Content-Type') || '';
-    if (
-      contentType.includes('application/pdf') ||
-      key.toLowerCase().endsWith('.pdf')
-    ) {
-      headers.set('Content-Type', 'application/pdf');
-      headers.set('Content-Disposition', 'inline');
-      headers.set('X-Robots-Tag', 'index, follow');
-    }
-
-    return new Response(object.body, { headers });
-  }
-
-  return new Response('Not Found', { status: 404 });
-};
diff --git a/public/robots.txt b/public/robots.txt
index 63bd157..49ac916 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,7 +1,7 @@
 User-agent: *
 Allow: /
-Allow: /api/file/
 Disallow: /install
 Disallow: /upload
+Disallow: /contribute
 
 Sitemap: https://cuza.pages.dev/sitemap-index.xml
\ No newline at end of file
diff --git a/src/api.ts b/src/api.ts
index 98c4d4f..63b292d 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -7,8 +7,11 @@ export class ApiService {
 
   constructor(baseUrl?: string) {
     this.baseUrl =
-      (baseUrl ?? import.meta.env.PUBLIC_WORKER_URL.replace(/\/$/, '')) ||
-      DEFAULT_WORKER_URL;
+      baseUrl ??
+      (import.meta.env.PUBLIC_WORKER_URL ?? DEFAULT_WORKER_URL).replace(
+        /\/$/,
+        '',
+      );
   }
 
   private async fetchJson<T>(url: string): Promise<T | null> {
diff --git a/src/components/Extra.astro b/src/components/Extra.astro
index 963ccc6..1993563 100644
--- a/src/components/Extra.astro
+++ b/src/components/Extra.astro
@@ -14,28 +14,36 @@ interface Props {
 const { subject, page, extraData, years } = Astro.props as Props;
 
 const isAdmitere = subject === 'admitere';
----
 
-<p class="text-lg font-bold text-slate-300">Extra</p>
-{
-  (subject === 'admitere' && page === 'fizica') || subject === 'fizica' ? (
-    <a
-      class="extra-link"
-      href="https://drive.google.com/drive/folders/1RUHqNmCLyEN-FV3IXjw_aIpZEaE-qJWq?usp=sharing"
-      target="_blank"
-    >
-      Culegeri fizică
-    </a>
-  ) : null
-}
-{
-  isAdmitere ? (
-    <List subject="admitere" page={`${page}/extra`} content={extraData} />
-  ) : (
-    <List subject={subject} page="extra" content={extraData} />
-  )
-}
-
-<Shortcuts years={years} />
+const shouldFilter2007 =
+  (subject === 'fizica' && page === 'teoretic') ||
+  (subject === 'mate' && page === 'mate-info');
+const yearsfix = shouldFilter2007 ? years?.filter((y) => y !== 2007) : years;
+---
 
-<ToggleExpansion />
+<div class="bg-zinc-950/90 rounded-3xl py-3 px-4">
+  {
+    Object.keys(extraData).length > 0 && (
+      <>
+        <p class="text-lg font-bold text-slate-300">Extra</p>
+        {(subject === 'admitere' && page === 'fizica') ||
+        subject === 'fizica' ? (
+          <a
+            class="extra-link"
+            href="https://drive.google.com/drive/folders/1RUHqNmCLyEN-FV3IXjw_aIpZEaE-qJWq?usp=sharing"
+            target="_blank"
+          >
+            Culegeri fizică
+          </a>
+        ) : null}
+        {isAdmitere ? (
+          <List subject="admitere" page={`${page}/extra`} content={extraData} />
+        ) : (
+          <List subject={subject} page="extra" content={extraData} />
+        )}
+      </>
+    )
+  }
+  <Shortcuts years={yearsfix} />
+  <ToggleExpansion />
+</div>
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 77ba366..be9f753 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -6,7 +6,7 @@
       class="flex flex-col sm:flex-row justify-between items-center pt-3 gap-2"
     >
       <p class="mb-0">
-        Copyright © {new Date().getFullYear()}
+        Copyright © {new Date().getFullYear()} &nbsp;
         <a
           class="hover:text-slate-800"
           href="https://github.com/DynoW"
diff --git a/src/components/List.astro b/src/components/List.astro
index 67ed017..cafa104 100644
--- a/src/components/List.astro
+++ b/src/components/List.astro
@@ -22,7 +22,11 @@ const getFolderPriority = (key: string): number => {
     [/\bsesiunea\s*(ii|2)\b/, 3],
     [/\bsesiunea\s*(i|1)\b/, 4],
     [/(special|olimp)/, 5],
-    [/\bmodel\b/, 6],
+    [/\bbac\b/, 6],
+    [/\bmodel\b/, 7],
+    [/\bsimulari judetene\b/, 8],
+    [/\bteste de antrenament\b/, 9],
+    [/\b100 variante\b/, 10],
   ];
 
   for (const [pattern, priority] of priorityRules) {
@@ -41,52 +45,46 @@ const {
   isExtra: isExtraProp,
 } = Astro.props as Props;
 
-const workerUrl =
-  import.meta.env.PUBLIC_WORKER_URL.replace(/\/$/, '') ||
-  'https://api.my-lab.ro';
+const baseUrl = (
+  import.meta.env.PUBLIC_WORKER_URL ?? 'https://api.my-lab.ro'
+).replace(/\/$/, '');
 
 // Use explicit prop in recursive calls, derive from page name at root.
 const isExtra = isExtraProp ?? (page === 'extra' || page.endsWith('/extra'));
 const cx = isExtra ? 'extra' : 'content';
 
 const paddingLeft = `${depth}rem`;
-const sortedEntries = Object.entries(content).sort(
-  ([keyA, valA], [keyB, valB]) => {
-    const aIsYear = isYearFolder(keyA);
-    const bIsYear = isYearFolder(keyB);
-    const aIsFile = typeof valA === 'string';
-    const bIsFile = typeof valB === 'string';
+const entries = Object.entries(content);
+const sortedEntries = entries
+  .map(([key, value]) => ({
+    key,
+    value,
+    isYear: isYearFolder(key),
+    isFile: typeof value === 'string',
+    fileMatch:
+      typeof value === 'string' ? key.match(/_(var|bar)_(\d{2})/i) : null,
+    priority: typeof value === 'string' ? 100 : getFolderPriority(key),
+  }))
+  .sort((a, b) => {
+    if (a.isYear && b.isYear) return Number(b.key) - Number(a.key);
+    if (a.isYear !== b.isYear) return a.isYear ? -1 : 1;
 
-    if (aIsYear && bIsYear) {
-      return Number(keyB) - Number(keyA);
+    if (a.isFile && b.isFile && a.fileMatch && b.fileMatch) {
+      const numDiff = parseInt(a.fileMatch[2]) - parseInt(b.fileMatch[2]);
+      if (numDiff !== 0) return numDiff;
+      const typeA = a.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
+      const typeB = b.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
+      return typeA - typeB;
     }
 
-    if (aIsYear !== bIsYear) {
-      return aIsYear ? -1 : 1;
-    }
-
-    if (aIsFile && bIsFile) {
-      const matchA = keyA.match(/_(var|bar)_(\d{2})/i);
-      const matchB = keyB.match(/_(var|bar)_(\d{2})/i);
-      if (matchA && matchB) {
-        const numDiff = parseInt(matchA[2]) - parseInt(matchB[2]);
-        if (numDiff !== 0) return numDiff;
-        const typeA = matchA[1].toLowerCase() === 'var' ? 0 : 1;
-        const typeB = matchB[1].toLowerCase() === 'var' ? 0 : 1;
-        return typeA - typeB;
-      }
-    }
+    if (a.isFile !== b.isFile) return a.isFile ? 1 : -1;
 
-    if (aIsFile !== bIsFile) {
-      return aIsFile ? 1 : -1;
-    }
-
-    const priorityDiff = getFolderPriority(keyA) - getFolderPriority(keyB);
+    const priorityDiff = a.priority - b.priority;
     if (priorityDiff !== 0) return priorityDiff;
 
-    return keyB.localeCompare(keyA);
-  },
-);
+    return b.key.localeCompare(a.key);
+  })
+  .map(({ key, value }) => [key, value] as [string, FileStructure[string]]);
 ---
 
 <div class="w-full" id={`content-${subject}-${page.replace('/', '-')}`}>
@@ -95,7 +93,10 @@ const sortedEntries = Object.entries(content).sort(
       sortedEntries.length > 0 ? (
         <ul class={`${cx}-list`} style={`padding-left: ${paddingLeft}`}>
           {sortedEntries.map(([key, value], index) => {
-            const showDivider = depth === 1 && index === 0;
+            const showDivider =
+              isYearFolder(page) &&
+              index === 0 &&
+              ((depth === 2 && !isYearFolder(key)) || depth === 1);
 
             if (typeof value === 'string') {
               // It's a file
@@ -109,7 +110,7 @@ const sortedEntries = Object.entries(content).sort(
                   <li>
                     <a
                       class={`${cx}-link flex items-center break-normal`}
-                      href={`${workerUrl}/file/${value}`}
+                      href={`${baseUrl}/file/${value}`}
                       target="_blank"
                       rel="noopener"
                       aria-label={`Open ${key} in new tab`}
@@ -233,19 +234,19 @@ const sortedEntries = Object.entries(content).sort(
     eventName: string,
     eventData?: Record<string, unknown>,
   ): void {
-    if (!import.meta.env.PROD) return;
-    try {
-      const umami = (window as any).umami;
-      if (umami) {
-        if (typeof umami.track === 'function') {
-          umami.track(eventName, eventData);
-        } else if (typeof umami.trackEvent === 'function') {
-          umami.trackEvent(eventName, eventData);
+    if (import.meta.env.PROD)
+      try {
+        const umami = (window as any).umami;
+        if (umami) {
+          if (typeof umami.track === 'function') {
+            umami.track(eventName, eventData);
+          } else if (typeof umami.trackEvent === 'function') {
+            umami.trackEvent(eventName, eventData);
+          }
         }
+      } catch (e) {
+        // ignore
       }
-    } catch (e) {
-      // ignore
-    }
   }
 
   document.addEventListener('DOMContentLoaded', () => {
@@ -314,7 +315,11 @@ const sortedEntries = Object.entries(content).sort(
         .querySelectorAll<HTMLElement>('.folder-toggle')
         .forEach((toggle) => {
           const isYear = toggle.getAttribute('data-folder-type') === 'year';
-          const open = mode === 'all' || (mode === 'years' && isYear);
+          const isBac = toggle.textContent === 'bac';
+          const open =
+            mode === 'all' ||
+            (mode === 'years' && isYear) ||
+            (mode !== 'none' && isBac);
           setFolder(toggle, open);
         });
     }
diff --git a/src/components/NewNavbar.astro b/src/components/NewNavbar.astro
index fa899ff..decde21 100644
--- a/src/components/NewNavbar.astro
+++ b/src/components/NewNavbar.astro
@@ -28,8 +28,8 @@ const navEntries = Object.entries(navStructure).filter(
 );
 
 // Helper function to get the URL for a nav item
-function getNavUrl(subject: string, page: string | null): string {
-  if (page === 'bac') return subject === 'fizica' ? '/' : `/${subject}`;
+function getNavUrl(subject: string, page: string): string {
+  if (subject === 'fizica' && page === 'teoretic') return '/';
   return `/${subject}/${page}`;
 }
 
@@ -38,12 +38,9 @@ function isSubjectActive(subject: string): boolean {
   return currentPath[0] === subject || (subject === 'fizica' && isHome);
 }
 
-function isPageActive(subject: string, page: string | null = null): boolean {
-  if (page == 'bac') {
-    return (
-      (currentPath[0] === subject && currentPath.length === 1) ||
-      (subject === 'fizica' && isHome)
-    );
+function isPageActive(subject: string, page: string): boolean {
+  if (subject === 'fizica' && page === 'teoretic') {
+    return isHome;
   }
   return currentPath[0] === subject && currentPath[1] === page;
 }
diff --git a/src/components/NewPage.astro b/src/components/NewPage.astro
index 93dc7d2..bb0370a 100644
--- a/src/components/NewPage.astro
+++ b/src/components/NewPage.astro
@@ -20,33 +20,72 @@ interface Props {
 const { subject, page } = Astro.props as Props;
 
 // Single request for all page data
-const pageData = await apiService.getPageData(subject, page);
+const [pageData, structure] = await Promise.all([
+  apiService.getPageData(subject, page),
+  apiService.getStructure(),
+]);
 const content: FileStructure = pageData.content;
 const years: number[] = pageData.years;
 const extra: FileStructure = pageData.extra;
 
 // ── SEO helpers ──────────────────────────────────────────────────────────────
+const school = 'Liceul Teoretic Alexandru Ioan Cuza, București';
 const subjectLabel =
   subject === 'admitere' ? 'Admitere UPB' : getDisplayName(subject);
 const pageLabel = PAGE_DISPLAY_NAMES[page] ?? getDisplayName(page);
-const isHome = subject === 'fizica' && page === 'bac';
+const isHome = subject === 'fizica' && page === 'teoretic';
+const isBac = page === 'bac';
+const isAdmitere = subject === 'admitere';
 
 const pageTitle = isHome
   ? 'Mate-Fizică BAC | cuza.pages.dev'
   : `${subjectLabel} - ${pageLabel} | cuza.pages.dev`;
-const pageDescription = `Subiecte oficiale, variante și simulări ${pageLabel} la ${subjectLabel}. Descarcă gratuit PDF-uri pentru pregătire BAC și admitere. Liceul Teoretic Alexandru Ioan Cuza, București.`;
-const pageKeywords = `${subjectLabel.toLowerCase()}, ${pageLabel.toLowerCase()}, bacalaureat, subiecte, variante, bareme, simulare, cuza, LTAIC, UPB`;
 
-const subjectBaseUrl =
-  subject === 'fizica'
-    ? 'https://cuza.pages.dev'
-    : `https://cuza.pages.dev/${subject}`;
-const canonicalUrl =
-  page === 'bac' ? subjectBaseUrl : `https://cuza.pages.dev/${subject}/${page}`;
+function buildDescription(): string {
+  if (isHome) {
+    return `Arhivă cu subiecte oficiale BAC, variante și simulări la Fizică pentru liceeni. Include bareme și rezolvări pentru bacalaureat și admiterea UPB. ${school}.`;
+  }
+  if (isAdmitere) {
+    return `Subiecte de admitere UPB și Politehnică la ${pageLabel} — variante din anii anteriori, bareme și modele de examen pentru pregătire. ${school}.`;
+  }
+  if (isBac) {
+    return `Subiecte oficiale și variante BAC la ${subjectLabel} din sesiunile anterioare. Arhivă cu bareme și rezolvări pentru pregătirea bacalaureatului. ${school}.`;
+  }
+  return `Subiecte și variante ${pageLabel} la ${subjectLabel} pentru BAC și admitere. Arhivă cu bareme și rezolvări. ${school}.`;
+}
+
+function buildKeywords(): string {
+  const base = `cuza, LTAIC, ${school.toLowerCase()}`;
+  if (isHome) {
+    return `fizică, bacalaureat, subiecte bac, variante bac, bareme, simulări, admitere UPB, pregătire bac, liceu, cuza, LTAIC`;
+  }
+  if (isAdmitere) {
+    return `${pageLabel.toLowerCase()}, admitere UPB, politehnica, variante admitere, bareme, pregătire admitere, ${base}`;
+  }
+  if (isBac) {
+    return `${subjectLabel.toLowerCase()}, subiecte bac, variante bac, bareme bac, bacalaureat, ${base}`;
+  }
+  return `${subjectLabel.toLowerCase()}, ${pageLabel.toLowerCase()}, bacalaureat, subiecte, variante, bareme, ${base}`;
+}
+
+const pageDescription = buildDescription();
+const pageKeywords = buildKeywords();
+
+const canonicalUrl = isHome
+  ? 'https://cuza.pages.dev'
+  : `https://cuza.pages.dev/${subject}/${page}`;
+
+const subjectPages = structure?.[subject] ?? [];
+const firstPage = subjectPages[0] ?? 'bac';
+const subjectBreadcrumbUrl = isHome
+  ? 'https://cuza.pages.dev'
+  : `https://cuza.pages.dev/${subject}/${firstPage}`;
 
 const breadcrumbs = [
-  { name: subjectLabel, url: subjectBaseUrl },
-  ...(page !== 'bac' ? [{ name: pageLabel, url: canonicalUrl }] : []),
+  { name: subjectLabel, url: subjectBreadcrumbUrl },
+  ...(isHome || page === firstPage
+    ? []
+    : [{ name: pageLabel, url: canonicalUrl }]),
 ];
 ---
 
@@ -63,7 +102,7 @@ const breadcrumbs = [
       <SiteLinks wrapperClass="hidden lg:flex" />
     </aside>
     <div slot="middle" class="flex flex-col gap-2">
-      <div class="bg-gray-100/90 rounded-3xl p-5 pr-2.5 font-bold">
+      <div class="bg-gray-100/90 rounded-3xl py-5 px-2.5 font-bold">
         <List subject={subject} page={page} content={content} />
       </div>
     </div>
@@ -71,9 +110,7 @@ const breadcrumbs = [
       slot="right"
       class="flex flex-col gap-2 md:mt-2 md:mr-2 md:sticky md:top-2 md:right-2"
     >
-      <div class="bg-zinc-950/90 rounded-3xl py-3 px-4">
-        <Extra subject={subject} page={page} extraData={extra} years={years} />
-      </div>
+      <Extra subject={subject} page={page} extraData={extra} years={years} />
       <CountdownTimer />
     </aside>
   </ContentContainer>
diff --git a/src/config/countdown.ts b/src/config/countdown.ts
index 5d7005c..3ec8ac6 100644
--- a/src/config/countdown.ts
+++ b/src/config/countdown.ts
@@ -1,41 +1,35 @@
 // Configuration for CountdownTimer component
 export const countdownConfig = {
-  // Simulare admitere dates
   simulare_admitere: {
-    title: 'Simulare Admitere UPB 2026',
-    startDate: 'March 7, 2026 10:00:00',
-    endDate: 'March 7, 2026 13:00:00',
+    title: 'Simulare Admitere UPB 2027',
+    startDate: 'March 6, 2027 10:00:00',
+    endDate: 'March 6, 2027 13:00:00',
   },
 
-  // Simulare BAC dates
   simulare_bac: {
-    title: 'Simulare BAC 2026',
-    startDate: 'March 23, 2026 09:00:00',
-    endDate: 'March 25, 2026 12:00:00',
+    title: 'Simulare BAC 2027',
+    startDate: 'March 22, 2027 09:00:00',
+    endDate: 'March 24, 2027 12:00:00',
   },
 
-  // Admitere dates
   preadmitere: {
-    title: 'Preadmitere UPB 2026',
-    startDate: 'March 28, 2026 10:00:00',
-    endDate: 'March 28, 2026 13:00:00',
+    title: 'Preadmitere UPB 2027',
+    startDate: 'March 27, 2027 10:00:00',
+    endDate: 'March 27, 2027 13:00:00',
   },
 
-  // BAC dates
   bac_1: {
-    title: 'BAC iunie-iulie 2026',
-    startDate: 'June 29, 2026 09:00:00',
-    endDate: 'July 2, 2026 12:00:00',
+    title: 'BAC iunie-iulie 2027',
+    startDate: 'June 28, 2027 09:00:00',
+    endDate: 'July 1, 2027 12:00:00',
   },
 
-  // Admitere dates
   admitere: {
-    title: 'Admitere UPB 2026',
-    startDate: 'July 14, 2026 10:00:00',
-    endDate: 'July 14, 2026 13:00:00',
+    title: 'Admitere UPB 2027',
+    startDate: 'July 13, 2027 10:00:00',
+    endDate: 'July 13, 2027 13:00:00',
   },
 
-  // BAC dates
   bac_2: {
     title: 'BAC august 2026',
     startDate: 'August 10, 2026 09:00:00',
@@ -66,7 +60,7 @@ export function getCountdownConfig() {
   if (upcoming.length > 0) return countdownConfig[upcoming[0].key];
 
   const last = entries.sort((a, b) => a.endTime - b.endTime).pop();
-  return last;
+  return last ? countdownConfig[last.key] : undefined;
 }
 
 export function getForcedCountdownConfig() {
diff --git a/src/config/labels.ts b/src/config/labels.ts
index 968df7d..9d8c100 100644
--- a/src/config/labels.ts
+++ b/src/config/labels.ts
@@ -21,11 +21,10 @@ export const PAGE_DISPLAY_NAMES: Record<string, string> = {
   fizica: 'Fizică',
   info: 'Informatică',
   mate: 'Matematică',
-  'simulari-judetene': 'Simulări județene/locale',
-  'mate-info-C': 'Mate-Info (C)',
-  'mate-info-Pascal': 'Mate-Info (Pascal)',
-  'st-nat-C': 'Științe Ale Naturii (C)',
-  'st-nat-Pascal': 'Științe Ale Naturii (Pascal)',
+  'mate-info-c': 'Mate-Info (C)',
+  'mate-info-pascal': 'Mate-Info (Pascal)',
+  'st-nat-c': 'Științe Ale Naturii (C)',
+  'st-nat-pascal': 'Științe Ale Naturii (Pascal)',
 };
 
 export function formatSlugLabel(value: string): string {
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 2e43502..94f7b27 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -220,7 +220,7 @@ if (isWinterTheme) {
     </script>
 
     {
-      import.meta.env.PROD === true ? (
+      import.meta.env.PROD ? (
         <>
           {/* Umami tag */}
           <script
@@ -264,16 +264,16 @@ if (isWinterTheme) {
         type="button"
         class="bg-white font-bold p-4 rounded-full transition ease-in-out hover:scale-105 duration-200 cursor-pointer"
         style="display: none;"
-        onclick="scrollToTop()"
       >
         <UpArrow />
       </button>
       <script is:inline>
+        const button = document.getElementById('scrollToTop');
         function scrollToTop() {
           window.scrollTo({ top: 0, behavior: 'smooth' });
         }
+        button.addEventListener('click', scrollToTop);
         window.addEventListener('scroll', function () {
-          const button = document.getElementById('scrollToTop');
           if (button) {
             button.style.display = window.scrollY > 0 ? 'block' : 'none';
           }
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 2738c7d..e71fbef 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -2,7 +2,12 @@
 import Layout from '../layouts/Layout.astro';
 ---
 
-<Layout title="404 - Pagină negăsită">
+<Layout
+  title="404 - Pagină negăsită"
+  description="Pagina pe care o cauți nu a fost găsită. Revino la pagina principală pentru subiecte de bac și admitere."
+  keywords="404, pagină negăsită, eroare, cuza.pages.dev, subiecte bac"
+  noindex
+>
   <div class="flex flex-col items-center justify-center h-svh px-4 w-full">
     <div
       id="not-found-card"
diff --git a/src/pages/[subject]/[page].astro b/src/pages/[subject]/[page].astro
index 0a01730..0baee5b 100644
--- a/src/pages/[subject]/[page].astro
+++ b/src/pages/[subject]/[page].astro
@@ -1,8 +1,19 @@
 ---
 import NewPage from '../../components/NewPage.astro';
-import { subjectPagePaths } from '../../paths';
+import { apiService } from '../../api';
 
-export const getStaticPaths = subjectPagePaths;
+export async function getStaticPaths() {
+  const subjectPages = await apiService.getStructure();
+  const paths: { params: { subject: string; page: string } }[] = [];
+  for (const [subject, pages] of Object.entries(subjectPages)) {
+    for (const page of pages) {
+      // fizica/teoretic is served at /, not at its own URL
+      if (subject === 'fizica' && page === 'teoretic') continue;
+      paths.push({ params: { subject, page } });
+    }
+  }
+  return paths;
+}
 
 const subject = Astro.params?.subject;
 const page = Astro.params?.page;
diff --git a/src/pages/[subject]/index.astro b/src/pages/[subject]/index.astro
index d327fe6..9269fc2 100644
--- a/src/pages/[subject]/index.astro
+++ b/src/pages/[subject]/index.astro
@@ -1,10 +1,15 @@
 ---
 import NewPage from '../../components/NewPage.astro';
-import { subjectIndexPaths } from '../../paths';
+import { apiService } from '../../api';
 
 export async function getStaticPaths() {
-  const excludedSubjects = ['fizica', 'admitere'];
-  return subjectIndexPaths(excludedSubjects);
+  const subjectPages = await apiService.getStructure();
+  return Object.entries(subjectPages)
+    .filter(([, pages]) => pages.length === 1)
+    .map(([subject, pages]) => ({
+      params: { subject },
+      props: { firstPage: pages[0] },
+    }));
 }
 
 const { subject } = Astro.params as { subject: string };
diff --git a/src/pages/contribute.astro b/src/pages/contribute.astro
index 0cc19b8..d4c9179 100644
--- a/src/pages/contribute.astro
+++ b/src/pages/contribute.astro
@@ -6,13 +6,20 @@ import ContentContainer from '../layouts/ContentContainer.astro';
 import Content from '../../CONTRIBUTE.md';
 ---
 
-<Layout title="contribuie | cuza.pages.dev" markdown>
+<Layout
+  title="contribuie | cuza.pages.dev"
+  description="Proiect open-source — contribuie cu cursuri, subiecte și resurse pentru bacalaureat și admitere în cea mai mare arhivă pentru liceeni."
+  keywords="contribuie, open source, arhivă subiecte bac, cursuri informatică, LTAIC, cuza, GitHub"
+  nofollow
+  noindex
+  markdown
+>
   <ContentContainer>
     <aside slot="left" class="flex flex-col gap-2 lg:ml-2 lg:mt-2">
       <NewNavbar />
     </aside>
     <div slot="middle" class="flex flex-col gap-2">
-      <div class="bg-[#0d1117] rounded-3xl p-5 pr-2.5 mb-12">
+      <div class="bg-[#0d1117] rounded-3xl py-5 px-2.5 mb-12">
         <article class="markdown-body">
           <Content />
         </article>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index cc28889..307510a 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,7 +3,7 @@ import NewPage from '../components/NewPage.astro';
 
 // Set default values for home page
 const subject = 'fizica';
-const page = 'bac';
+const page = 'teoretic';
 ---
 
 <NewPage subject={subject} page={page} />
diff --git a/src/pages/install.astro b/src/pages/install.astro
index ef1d655..008786b 100644
--- a/src/pages/install.astro
+++ b/src/pages/install.astro
@@ -2,7 +2,13 @@
 import Layout from '../layouts/Layout.astro';
 ---
 
-<Layout title="Instalează | cuza.pages.dev" nofollow noindex>
+<Layout
+  title="Instalează | cuza.pages.dev"
+  description="Instalează aplicația CuzaPages ca PWA — acces rapid la subiecte BAC și admitere direct din ecranul principal, inclusiv fără conexiune la internet."
+  keywords="instalează aplicația, PWA, cuza pages, subiecte bac offline, aplicație web, LTAIC"
+  nofollow
+  noindex
+>
   <div class="flex items-center justify-center h-svh px-5 py-8">
     <div
       class="bg-[rgba(10,13,16,.85)] text-white rounded-3xl p-8 md:p-10 shadow-2xl backdrop-blur-sm border border-white/10 max-w-sm w-full text-center relative overflow-hidden"
@@ -92,7 +98,6 @@ import Layout from '../layouts/Layout.astro';
       <button
         id="installBtn"
         class="w-full bg-blue-600 hover:bg-blue-500 disabled:bg-gray-700 disabled:text-gray-400 text-white font-semibold py-3.5 px-6 rounded-xl transition-colors cursor-pointer disabled:cursor-not-allowed text-base"
-        onclick="install()"
         disabled
       >
         <span id="installBtnText">Instalează aplicația</span>
@@ -174,5 +179,7 @@ import Layout from '../layouts/Layout.astro';
     function install() {
       if (deferredPrompt) deferredPrompt.prompt();
     }
+
+    installBtn.addEventListener('click', install);
   </script>
 </Layout>
diff --git a/src/pages/notite/info.astro b/src/pages/notite/info.astro
index b88eb51..4eb9f65 100644
--- a/src/pages/notite/info.astro
+++ b/src/pages/notite/info.astro
@@ -12,7 +12,13 @@ const infoCourses = (await getCollection('info')).sort((a, b) =>
 );
 ---
 
-<Layout title="informatica | cuza.pages.dev" markdown>
+<Layout
+  title="informatica | cuza.pages.dev"
+  description="Notițe de informatică din liceu (2022-2025) - C++, algoritmi, structuri de date, programare. Subiecte bac și probleme recapitulative. Liceul Teoretic Alexandru Ioan Cuza, București."
+  keywords="informatica, notite, liceu, C++, algoritmi, structuri de date, bacalaureat, programare, cuza, LTAIC"
+  canonicalUrl="https://cuza.pages.dev/notite/info"
+  markdown
+>
   <ContentContainer>
     <aside slot="left" class="flex flex-col gap-2 lg:ml-2 lg:mt-2">
       <NewNavbar />
diff --git a/src/pages/notite/romana.astro b/src/pages/notite/romana.astro
index b7ab324..4e91d68 100644
--- a/src/pages/notite/romana.astro
+++ b/src/pages/notite/romana.astro
@@ -3,6 +3,12 @@ import Layout from '../../layouts/Layout.astro';
 import ExcalidrawWrapper from '../../components/ExcalidrawWrapper.jsx';
 ---
 
-<Layout title="Notes | Excalidraw Bac Romana" backgroundImage={false}>
+<Layout
+  title="Notes | Excalidraw Bac Romana"
+  description="Schițe și scheme vizuale pentru bacalaureatul la limba română. Opere literare, structură subiecte, eseuri și recapitulări vizuale."
+  keywords="romana, bacalaureat, excalidraw, scheme, notite vizuale, opere literare, eseu, structura subiecte, recapitulare"
+  canonicalUrl="https://cuza.pages.dev/notite/romana"
+  backgroundImage={false}
+>
   <ExcalidrawWrapper client:only="react" />
 </Layout>
diff --git a/src/pages/upload.astro b/src/pages/upload.astro
index 1a4f311..d4c590c 100644
--- a/src/pages/upload.astro
+++ b/src/pages/upload.astro
@@ -5,7 +5,14 @@ const workerUrl = import.meta.env.PUBLIC_WORKER_URL;
 const isUploadEnabled = !!workerUrl;
 ---
 
-<Layout title="Încarcă PDF by @Daniel C." nofollow noindex bodyClass="mx-4">
+<Layout
+  title="Încarcă PDF | cuza.pages.dev"
+  description="Formular pentru încărcarea de documente PDF în arhiva de subiecte BAC și admitere — variante, bareme și simulări de la elevi pentru elevi."
+  keywords="încarcă PDF, subiecte bac, contribuie, upload variante, arhivă subiecte, cuza"
+  nofollow
+  noindex
+  bodyClass="mx-4"
+>
   <div
     class="max-w-sm md:max-w-lg mx-auto bg-white p-6 rounded-lg shadow-lg absolute top-1/3 left-1/2 transform -translate-x-1/2 -translate-y-1/3"
   >
@@ -36,50 +43,76 @@ const isUploadEnabled = !!workerUrl;
           enctype="multipart/form-data"
           class="flex flex-col gap-4 mt-4"
         >
-          <label for="page" class="font-bold">
-            Pagina:
-          </label>
-          <select
-            id="page"
-            name="page"
-            required
-            class="p-2 border border-gray-300 rounded"
-          >
-            <option value="bac">Bac</option>
-            <option value="teste">Teste de antrenament</option>
-            <option value="sim">Simulări județene</option>
-          </select>
-
-          <label for="year" class="font-bold">
-            An:
-          </label>
-          <input
-            type="number"
-            id="year"
-            name="year"
-            required
-            class="p-2 border border-gray-300 rounded"
-          />
+          <div class="flex items-center gap-2">
+            <label for="page" class="font-bold whitespace-nowrap">
+              Pagina:
+            </label>
+            <select
+              id="page"
+              name="page"
+              required
+              class="p-2 border border-gray-300 rounded"
+            >
+              <option value="bac">Bac</option>
+              <option value="sim">Simulări județene</option>
+            </select>
+          </div>
+
+          <div class="flex items-center gap-2">
+            <label for="year" class="font-bold whitespace-nowrap">
+              An:
+            </label>
+            <input
+              type="number"
+              id="year"
+              name="year"
+              required
+              class="w-20 p-2 border border-gray-300 rounded"
+            />
+          </div>
 
-          <div id="titleField" class="hidden">
-            <label for="title" class="font-bold">
+          <div id="titleField" class="hidden items-center gap-2">
+            <label for="title" class="font-bold whitespace-nowrap">
               Tip:
             </label>
             <select
               id="title"
               name="title"
+              required
               class="p-2 border border-gray-300 rounded"
             >
-              <option value="Simulare">Simulare</option>
               <option value="Model">Model</option>
+              <option value="Simulare">Simulare</option>
               <option value="Sesiunea-I">Sesiunea I</option>
               <option value="Sesiunea-II">Sesiunea II</option>
-              <option value="Sesiune-speciala">Sesiunea speciala</option>
+              <option value="Sesiunea-speciala">Sesiunea Specială</option>
+            </select>
+          </div>
+
+          <div id="variantField" class="hidden items-center gap-2">
+            <label for="variant" class="font-bold whitespace-nowrap">
+              Variant:
+            </label>
+            <select
+              id="variant"
+              name="variant"
+              class="p-2 border border-gray-300 rounded"
+            >
+              <option value="01">01</option>
+              <option value="02">02</option>
+              <option value="03">03</option>
+              <option value="04">04</option>
+              <option value="05">05</option>
+              <option value="06">06</option>
+              <option value="07">07</option>
+              <option value="08">08</option>
+              <option value="09">09</option>
+              <option value="10">10</option>
             </select>
           </div>
 
           <div id="reserveField" class="hidden items-center gap-2">
-            <label for="reserve" class="font-bold">
+            <label for="reserve" class="font-bold whitespace-nowrap">
               Este rezervă?
             </label>
             <input
@@ -90,8 +123,8 @@ const isUploadEnabled = !!workerUrl;
             />
           </div>
 
-          <div id="simulationField" class="hidden">
-            <label for="simulation" class="font-bold">
+          <div id="simulationField" class="hidden items-center gap-2">
+            <label for="simulation" class="font-bold whitespace-nowrap">
               Tip simulare:
             </label>
             <select
@@ -104,8 +137,8 @@ const isUploadEnabled = !!workerUrl;
             </select>
           </div>
 
-          <div id="countyField" class="hidden">
-            <label for="county" class="font-bold">
+          <div id="countyField" class="hidden items-center gap-2">
+            <label for="county" class="font-bold whitespace-nowrap">
               Județ:
             </label>
             <select
@@ -158,33 +191,19 @@ const isUploadEnabled = !!workerUrl;
             </select>
           </div>
 
-          <div id="localField" class="hidden">
-            <label for="local" class="font-bold">
-              Localitate/Liceu (poate fi LAICUZA):
+          <div id="localField" class="hidden flex-wrap items-center gap-2">
+            <label for="local" class="font-bold whitespace-nowrap">
+              Localitate/Liceu (poate fi: LAICUZA):
             </label>
             <input
               type="text"
               id="local"
               name="local"
-              class="p-2 border border-gray-300 rounded"
-            />
-          </div>
-
-          <div id="testNumberField" class="hidden">
-            <label for="testNumber" class="font-bold">
-              Număr Test:
-            </label>
-            <input
-              type="number"
-              id="testNumber"
-              name="testNumber"
-              min="1"
-              max="99"
-              class="p-2 border border-gray-300 rounded"
+              class="p-2 border border-gray-300 rounded w-40"
             />
           </div>
 
-          <div class="flex items-center gap-1">
+          <div class="flex items-center gap-2">
             <label class="font-bold whitespace-nowrap">Variantă/Barem:</label>
             <input type="hidden" id="type2" name="type2" value="var" />
             <label class="relative inline-flex h-9.5 w-36 cursor-pointer select-none items-center rounded border border-gray-300 p-1">
@@ -199,17 +218,19 @@ const isUploadEnabled = !!workerUrl;
             </label>
           </div>
 
-          <label for="file" class="font-bold">
-            Selectează PDF:
-          </label>
-          <input
-            type="file"
-            id="file"
-            name="file"
-            accept="application/pdf"
-            required
-            class="p-2 border border-gray-300 rounded"
-          />
+          <div>
+            <label for="file" class="font-bold">
+              Selectează PDF:
+            </label>
+            <input
+              type="file"
+              id="file"
+              name="file"
+              accept="application/pdf"
+              required
+              class="w-full p-2 border border-gray-300 rounded mt-1"
+            />
+          </div>
 
           <button
             type="submit"
@@ -258,10 +279,13 @@ const isUploadEnabled = !!workerUrl;
       >
         <div class="modal-content bg-white p-6 rounded-lg shadow-lg w-80">
           <div class="modal-content-heading flex justify-between items-center">
-            <label for="passwordInput" class="passwordInputText font-bold">
+            <label for="passwordInput" class="font-bold">
               Introdu parola
             </label>
-            <span class="close cursor-pointer text-gray-500 text-2xl font-bold">
+            <span
+              id="closeModalBtn"
+              class="cursor-pointer text-gray-500 text-2xl font-bold"
+            >
               &times;
             </span>
           </div>
@@ -286,181 +310,121 @@ const isUploadEnabled = !!workerUrl;
   }
 
   <script>
-    const pageSelect = document.getElementById(
-      'page',
-    ) as HTMLSelectElement | null;
-    let page = pageSelect ? pageSelect.value : '';
-    const simulationSelect = document.getElementById(
-      'simulation',
-    ) as HTMLSelectElement | null;
-    let simulation = simulationSelect ? simulationSelect.value : '';
-    const simulationField = document.getElementById('simulationField');
-    const countyField = document.getElementById('countyField');
-    const localField = document.getElementById('localField');
-    const testNumberField = document.getElementById('testNumberField');
-    const titleField = document.getElementById('titleField');
-    const reserveField = document.getElementById('reserveField');
-    const reserveInput = document.getElementById(
-      'reserve',
-    ) as HTMLInputElement | null;
-    const testNumberInput = document.getElementById(
-      'testNumber',
-    ) as HTMLInputElement | null;
-    const type2Toggle = document.getElementById(
-      'type2Toggle',
-    ) as HTMLInputElement | null;
-    const type2Input = document.getElementById(
-      'type2',
-    ) as HTMLInputElement | null;
-
-    function toggleFields(page: string, simulation: string) {
+    const $ = (id: string): HTMLElement | null => document.getElementById(id);
+
+    const setField = (container: HTMLElement | null, show: boolean): void => {
+      if (!container) return;
+      container.classList.toggle('hidden', !show);
+      container.classList.toggle('flex', show);
+    };
+
+    const pageSelect = $('page') as HTMLSelectElement | null;
+    let page = pageSelect?.value ?? '';
+    const simulationSelect = $('simulation') as HTMLSelectElement | null;
+    let simulation = simulationSelect?.value ?? '';
+    const titleSelect = $('title') as HTMLSelectElement | null;
+    let title = titleSelect?.value ?? '';
+
+    const simulationField = $('simulationField');
+    const countyField = $('countyField');
+    const localField = $('localField');
+    const titleField = $('titleField');
+    const variantField = $('variantField');
+    const reserveField = $('reserveField');
+    const reserveInput = $('reserve') as HTMLInputElement | null;
+    const type2Toggle = $('type2Toggle') as HTMLInputElement | null;
+    const type2Input = $('type2') as HTMLInputElement | null;
+    const yearInput = $('year') as HTMLInputElement | null;
+
+    const VARIANT_TITLES = new Set([
+      'Sesiunea-I',
+      'Sesiunea-II',
+      'Sesiunea-speciala',
+    ]);
+
+    function toggleFields(
+      page: string,
+      simulation: string,
+      title?: string,
+    ): void {
       if (page === 'bac') {
-        titleField?.classList.remove('hidden');
-        titleField?.querySelector('select')?.setAttribute('required', 'true');
-        reserveField?.classList.remove('hidden');
-        reserveField?.classList.add('flex');
-        simulationField?.classList.add('hidden');
-        simulationField?.querySelector('select')?.removeAttribute('required');
-        testNumberField?.classList.add('hidden');
-        testNumberField?.querySelector('input')?.removeAttribute('required');
-        countyField?.classList.add('hidden');
-        countyField?.querySelector('select')?.removeAttribute('required');
-        localField?.classList.add('hidden');
-        localField?.querySelector('input')?.removeAttribute('required');
-      } else if (page === 'teste') {
-        titleField?.classList.add('hidden');
-        titleField?.querySelector('select')?.removeAttribute('required');
-        reserveField?.classList.add('hidden');
-        reserveField?.classList.remove('flex');
-        if (reserveInput) reserveInput.checked = false;
-        simulationField?.classList.add('hidden');
-        simulationField?.querySelector('select')?.removeAttribute('required');
-        testNumberField?.classList.remove('hidden');
-        testNumberField
-          ?.querySelector('input')
-          ?.setAttribute('required', 'true');
-        countyField?.classList.add('hidden');
-        countyField?.querySelector('select')?.removeAttribute('required');
-        localField?.classList.add('hidden');
-        localField?.querySelector('input')?.removeAttribute('required');
-      } else if (page === 'sim') {
-        titleField?.classList.add('hidden');
-        titleField?.querySelector('select')?.removeAttribute('required');
-        reserveField?.classList.add('hidden');
-        reserveField?.classList.remove('flex');
-        if (reserveInput) reserveInput.checked = false;
-        simulationField?.classList.remove('hidden');
-        simulationField
-          ?.querySelector('select')
-          ?.setAttribute('required', 'true');
-        testNumberField?.classList.add('hidden');
-        testNumberField?.querySelector('input')?.removeAttribute('required');
-        if (simulation === 'judetene') {
-          countyField?.classList.remove('hidden');
-          countyField
-            ?.querySelector('select')
-            ?.setAttribute('required', 'true');
-          localField?.classList.add('hidden');
-          localField?.querySelector('input')?.removeAttribute('required');
-        } else {
-          countyField?.classList.add('hidden');
-          countyField?.querySelector('select')?.removeAttribute('required');
-          localField?.classList.remove('hidden');
-          localField?.querySelector('input')?.setAttribute('required', 'true');
-        }
+        setField(titleField, true);
+        const showVariant = title ? VARIANT_TITLES.has(title) : false;
+        setField(variantField, showVariant);
+        setField(reserveField, true);
+        setField(simulationField, false);
+        setField(countyField, false);
+        setField(localField, false);
+        return;
+      }
+
+      setField(titleField, false);
+      setField(variantField, false);
+      setField(reserveField, false);
+      if (reserveInput) reserveInput.checked = false;
+      setField(simulationField, true);
+
+      if (simulation === 'judetene') {
+        setField(countyField, true);
+        setField(localField, false);
       } else {
-        titleField?.classList.add('hidden');
-        titleField?.querySelector('select')?.removeAttribute('required');
-        reserveField?.classList.add('hidden');
-        reserveField?.classList.remove('flex');
-        if (reserveInput) reserveInput.checked = false;
-        simulationField?.classList.add('hidden');
-        simulationField?.querySelector('select')?.removeAttribute('required');
-        testNumberField?.classList.add('hidden');
-        testNumberField?.querySelector('input')?.removeAttribute('required');
-        countyField?.classList.add('hidden');
-        countyField?.querySelector('select')?.removeAttribute('required');
-        localField?.classList.add('hidden');
-        localField?.querySelector('input')?.removeAttribute('required');
+        setField(countyField, false);
+        setField(localField, true);
+        localField?.querySelector('input')?.setAttribute('required', 'true');
       }
     }
 
-    function onDOMContentLoaded() {
-      const yearInput = document.getElementById(
-        'year',
-      ) as HTMLInputElement | null;
+    document.addEventListener('DOMContentLoaded', () => {
       if (yearInput && !yearInput.value) {
         yearInput.value = new Date().getFullYear().toString();
       }
-      if (testNumberInput && !testNumberInput.value) {
-        testNumberInput.value = '01';
-      }
-
-      syncType2Value();
-      toggleFields(page, simulation);
-    }
-    document.addEventListener('DOMContentLoaded', onDOMContentLoaded);
-
-    function onPageChange(event: Event) {
-      const target = event.target as HTMLSelectElement;
-      page = target.value;
-      toggleFields(page, simulation);
-      if (page === 'teste' && testNumberInput && !testNumberInput.value) {
-        testNumberInput.value = '01';
+      if (type2Toggle && type2Input) {
+        type2Input.value = type2Toggle.checked ? 'bar' : 'var';
       }
-    }
-    pageSelect?.addEventListener('change', onPageChange);
-
-    function onTestNumberInput() {
-      if (
-        testNumberInput &&
-        testNumberInput.value &&
-        testNumberInput.value.length === 1
-      ) {
-        testNumberInput.value = testNumberInput.value.padStart(2, '0');
+      toggleFields(page, simulation, title);
+    });
+
+    pageSelect?.addEventListener('change', (e: Event) => {
+      page = (e.target as HTMLSelectElement).value;
+      toggleFields(page, simulation, title);
+    });
+
+    titleSelect?.addEventListener('change', (e: Event) => {
+      title = (e.target as HTMLSelectElement).value;
+      toggleFields(page, simulation, title);
+    });
+
+    type2Toggle?.addEventListener('change', () => {
+      if (type2Toggle && type2Input) {
+        type2Input.value = type2Toggle.checked ? 'bar' : 'var';
       }
-    }
-
-    testNumberInput?.addEventListener('input', onTestNumberInput);
-
-    const syncType2Value = () => {
-      if (!type2Toggle || !type2Input) return;
-      type2Input.value = type2Toggle.checked ? 'bar' : 'var';
-    };
+    });
 
-    type2Toggle?.addEventListener('change', syncType2Value);
+    simulationSelect?.addEventListener('change', (e: Event) => {
+      simulation = (e.target as HTMLSelectElement).value;
+      toggleFields(page, simulation, title);
+    });
 
-    function onSimulationChange(event: Event) {
-      const target = event.target as HTMLSelectElement;
-      simulation = target.value;
-      toggleFields(page, simulation);
-    }
-    simulationSelect?.addEventListener('change', onSimulationChange);
-
-    const form = document.getElementById('uploadForm');
-    const messageDiv = document.getElementById('message');
-    const modal = document.getElementById('passwordModal');
-    const closeModal = document.getElementsByClassName('close')[0];
-    const submitPasswordBtn = document.getElementById('submitPassword');
+    const form = $('uploadForm') as HTMLFormElement | null;
+    const messageDiv = $('message');
+    const modal = $('passwordModal');
+    const closeModal = $('closeModalBtn');
+    const submitPasswordBtn = $('submitPassword') as HTMLButtonElement | null;
 
     if (form && messageDiv && modal && closeModal && submitPasswordBtn) {
-      const passwordInput = document.getElementById(
-        'passwordInput',
-      ) as HTMLInputElement | null;
-      const submitPasswordButton = submitPasswordBtn as HTMLButtonElement;
-      const defaultSubmitPasswordLabel =
-        submitPasswordButton.textContent || 'Trimite';
-
-      const setSubmitPasswordLoading = (isLoading: boolean) => {
-        submitPasswordButton.disabled = isLoading;
-        submitPasswordButton.textContent = isLoading
+      const passwordInput = $('passwordInput') as HTMLInputElement | null;
+      const defaultLabel = submitPasswordBtn.textContent || 'Trimite';
+
+      const setLoading = (loading: boolean): void => {
+        submitPasswordBtn.disabled = loading;
+        submitPasswordBtn.textContent = loading
           ? 'Se trimite...'
-          : defaultSubmitPasswordLabel;
-        submitPasswordButton.classList.toggle('opacity-60', isLoading);
-        submitPasswordButton.classList.toggle('cursor-not-allowed', isLoading);
+          : defaultLabel;
+        submitPasswordBtn.classList.toggle('opacity-60', loading);
+        submitPasswordBtn.classList.toggle('cursor-not-allowed', loading);
       };
 
-      const hideModalAndClearPassword = () => {
+      const hideModal = (): void => {
         if (passwordInput) {
           passwordInput.value = '';
           passwordInput.blur();
@@ -469,8 +433,8 @@ const isUploadEnabled = !!workerUrl;
         modal.classList.remove('flex');
       };
 
-      form.addEventListener('submit', async (event) => {
-        event.preventDefault();
+      form.addEventListener('submit', async (e: Event) => {
+        e.preventDefault();
         modal.classList.remove('hidden');
         modal.classList.add('flex');
         if (passwordInput) {
@@ -479,106 +443,74 @@ const isUploadEnabled = !!workerUrl;
         }
       });
 
-      (closeModal as HTMLElement).onclick = function () {
-        hideModalAndClearPassword();
-      };
+      closeModal.addEventListener('click', hideModal);
 
-      window.addEventListener('click', function (event) {
-        if (event.target == modal) {
-          hideModalAndClearPassword();
-        }
+      window.addEventListener('click', (e: MouseEvent) => {
+        if (e.target === modal) hideModal();
       });
 
-      window.addEventListener('keydown', function (event) {
-        if (event.key === 'Escape' && !modal.classList.contains('hidden')) {
-          hideModalAndClearPassword();
+      window.addEventListener('keydown', (e: KeyboardEvent) => {
+        if (e.key === 'Escape' && !modal.classList.contains('hidden')) {
+          hideModal();
         }
       });
 
-      submitPasswordBtn.onclick = async function () {
-        if (submitPasswordButton.disabled) {
-          return;
-        }
-        setSubmitPasswordLoading(true);
+      submitPasswordBtn.addEventListener('click', async () => {
+        if (submitPasswordBtn.disabled) return;
+        setLoading(true);
 
-        let password = '';
-        if (passwordInput) {
-          password = passwordInput.value;
-        }
-        hideModalAndClearPassword();
+        const password = passwordInput?.value ?? '';
 
         if (!password) {
           messageDiv.textContent = 'Introdu parola pentru a continua.';
           messageDiv.className = 'text-red-500';
-          setSubmitPasswordLoading(false);
+          setLoading(false);
           return;
         }
 
+        hideModal();
+
         messageDiv.textContent = 'Se încarcă...';
         messageDiv.className = 'text-blue-500';
 
-        const formData = new FormData(form as HTMLFormElement);
-
+        const formData = new FormData(form);
         if (page === 'bac') {
           formData.delete('simulation');
           formData.delete('county');
           formData.delete('local');
-          formData.delete('testNumber');
-        } else if (page === 'teste') {
-          formData.delete('title');
-          formData.delete('reserve');
-          formData.delete('simulation');
-          formData.delete('county');
-          formData.delete('local');
-        } else if (page === 'sim') {
+        } else {
           formData.delete('title');
+          formData.delete('variant');
           formData.delete('reserve');
-          formData.delete('testNumber');
-          if (simulation === 'judetene') {
-            formData.delete('local');
-          } else {
-            formData.delete('county');
-          }
+          formData.delete(simulation === 'judetene' ? 'local' : 'county');
         }
 
-        const username = 'admin';
-        const toBase64 = (value: string) => {
-          const bytes = new TextEncoder().encode(value);
-          let binary = '';
-          bytes.forEach((b) => {
-            binary += String.fromCharCode(b);
-          });
-          return btoa(binary);
-        };
-        const authHeader = 'Bearer ' + toBase64(`${username}:${password}`);
-        const workerUrl =
-          import.meta.env.PUBLIC_WORKER_URL.replace(/\/$/, '') ||
-          'https://api.my-lab.ro';
+        const toBase64 = (s: string): string =>
+          btoa(String.fromCharCode(...new TextEncoder().encode(s)));
+        const auth = 'Bearer ' + toBase64('admin:' + password);
+
+        const baseUrl = import.meta.env.PUBLIC_WORKER_URL.replace(/\/$/, '');
 
         try {
-          const response = await fetch(`${workerUrl}/upload`, {
+          const res = await fetch(baseUrl + '/upload', {
             method: 'POST',
-            headers: {
-              Authorization: authHeader,
-            },
+            headers: { Authorization: auth },
             body: formData,
           });
-
-          if (response.ok) {
+          if (res.ok) {
             messageDiv.textContent = 'Fișierul a fost încărcat cu succes!';
             messageDiv.className = 'text-green-500';
           } else {
-            const result = await response.text();
-            messageDiv.textContent = `Eroare: ${result}`;
+            messageDiv.textContent = 'Eroare: ' + (await res.text());
             messageDiv.className = 'text-red-500';
           }
-        } catch (error) {
+        } catch {
           messageDiv.textContent = 'A apărut o eroare în timpul încărcării.';
           messageDiv.className = 'text-red-500';
         } finally {
-          setSubmitPasswordLoading(false);
+          setLoading(false);
         }
-      };
+      });
     }
   </script>
 </Layout>
diff --git a/src/paths.ts b/src/paths.ts
deleted file mode 100644
index d7fedaa..0000000
--- a/src/paths.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { apiService } from './api';
-
-interface StaticPathParams {
-  subject: string;
-  page?: string;
-}
-
-interface StaticPath {
-  params: StaticPathParams;
-  props?: Record<string, unknown>;
-}
-
-/** Generates static paths for subject index pages (e.g. `/fizica`), optionally excluding specific subjects. */
-export async function subjectIndexPaths(
-  excludedSubjects: string[] = [],
-): Promise<StaticPath[]> {
-  const subjectPages = await apiService.getStructure();
-  return Object.entries(subjectPages)
-    .filter(([subject]) => !excludedSubjects.includes(subject))
-    .map(([subject, pages]) => ({
-      params: { subject },
-      props: { firstPage: pages[0] ?? 'bac' },
-    }));
-}
-
-/** Generates static paths for all subject sub-pages (e.g. `/fizica/simulari-judetene`), excluding `bac` since that is handled by the index page. */
-export async function subjectPagePaths(): Promise<StaticPath[]> {
-  const subjectPages = await apiService.getStructure();
-  const paths: StaticPath[] = [];
-  for (const [subject, pages] of Object.entries(subjectPages)) {
-    for (const page of pages) {
-      if (page !== 'bac') {
-        paths.push({ params: { subject, page } });
-      }
-    }
-  }
-  return paths;
-}
diff --git a/web-scraper/main.py b/web-scraper/main.py
index a65f403..101ecf0 100755
--- a/web-scraper/main.py
+++ b/web-scraper/main.py
@@ -19,8 +19,13 @@
 from utils import build_bearer_auth_header, create_retry_session, load_local_env
 
 
+_RE_IUN = re.compile(r'(?:^|[_-])iun')
+_RE_IUL = re.compile(r'(?:^|[_-])iul')
+_RE_AUG = re.compile(r'(?:^|[_-])aug')
+
+
 class BacExamScraper:
-    def __init__(self, worker_url: str, upload_password: str, year: int | None = None, upload_enabled: bool = False):
+    def __init__(self, worker_url: str, upload_password: str, year: int | None = None, upload_enabled: bool = False, force_archive: bool | None = None):
         self.worker_url = worker_url.rstrip('/')
         self.upload_password = upload_password
         self.upload_enabled = upload_enabled
@@ -32,15 +37,19 @@ def __init__(self, worker_url: str, upload_password: str, year: int | None = Non
         self.session = create_retry_session()
         
         self.current_year = str(year) if year else str(datetime.now().year)
-        
-        # URL patterns for the current year
-        self.archive_on = False
-        self.set_archive = self.current_year if self.archive_on else ""
+
+        now_year = str(datetime.now().year)
+        if force_archive is True:
+            self.archive = self.current_year
+        elif force_archive is False:
+            self.archive = ""
+        else:
+            self.archive = self.current_year if self.current_year != now_year else ""
 
         self.urls = [
-            f"https://subiecte{self.set_archive}.edu.ro/{self.current_year}/bacalaureat/modeledesubiecte/probescrise/",
-            f"https://subiecte{self.set_archive}.edu.ro/{self.current_year}/simulare/simulare_bac_XII/",
-            f"https://subiecte{self.set_archive}.edu.ro/{self.current_year}/bacalaureat/Subiecte_si_bareme/"
+            f"https://subiecte{self.archive}.edu.ro/{self.current_year}/bacalaureat/modeledesubiecte/probescrise/",
+            f"https://subiecte{self.archive}.edu.ro/{self.current_year}/simulare/simulare_bac_XII/",
+            f"https://subiecte{self.archive}.edu.ro/{self.current_year}/bacalaureat/Subiecte_si_bareme/"
         ]
         
         # Load previously seen URLs
@@ -59,15 +68,15 @@ def save_seen_urls(self):
             for url in sorted(self.seen_urls):
                 f.write(url + '\n')
     
-    def fetch_page(self, url: str) -> str:
-        """Fetch webpage content."""
+    def fetch_page(self, url: str) -> tuple[str, str]:
+        """Fetch webpage content. Returns (html_content, actual_url)."""
         headers = {
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
         }
         try:
             response = self.session.get(url, headers=headers, timeout=30)
             response.raise_for_status()
-            return response.text
+            return response.text, url
         except requests.RequestException as e:
             if url.startswith('https://'):
                 http_url = url.replace('https://', 'http://', 1)
@@ -75,12 +84,12 @@ def fetch_page(self, url: str) -> str:
                 try:
                     response = self.session.get(http_url, headers=headers, timeout=30)
                     response.raise_for_status()
-                    return response.text
+                    return response.text, http_url
                 except requests.RequestException as e2:
                     print(f"Error fetching {http_url}: {e2}")
-                    return ""
+                    return "", url
             print(f"Error fetching {url}: {e}")
-            return ""
+            return "", url
     
     def extract_links(self, html_content: str, base_url: str) -> list:
         """Extract ZIP file links matching the exam pattern."""
@@ -114,29 +123,27 @@ def determine_exam_type(self, url: str, zip_filename: str = "") -> str:
         url_lower = url.lower()
         filename_lower = zip_filename.lower()
         
-        # Check url for exam type indicators first
-        if 'simulare' in url_lower or 'sim' in filename_lower:
-            return 'Simulare'
-        
-        if 'modeledesubiecte' in url_lower or 'model' in filename_lower:
-            return 'Model'
-        
-        # For regular bac URL, determine based on filename patterns
-        if 'rezerva' in filename_lower:
+        if 'rezerv' in filename_lower:
             if 'speciala' in filename_lower:
-                return 'Sesiune-olimpici-rezerva'
-            if 'iun' in filename_lower or 'iul' in filename_lower:
+                return 'Sesiunea-speciala-rezerva'
+            if _RE_IUN.search(filename_lower) or _RE_IUL.search(filename_lower):
                 return 'Sesiunea-I-rezerva'
-            if 'aug' in filename_lower:
+            if _RE_AUG.search(filename_lower):
                 return 'Sesiunea-II-rezerva'
         if 'speciala' in filename_lower:
-            return 'Sesiune-olimpici'
-        if '_iun' in filename_lower or '_iul' in filename_lower:
-            return 'Sesiunea-I'  # June session
-        if '_aug' in filename_lower:
-            return 'Sesiunea-II'  # August session
+            return 'Sesiunea-speciala'
+        if _RE_IUN.search(filename_lower) or _RE_IUL.search(filename_lower):
+            return 'Sesiunea-I'
+        if _RE_AUG.search(filename_lower):
+            return 'Sesiunea-II'
+        
+        if 'simulare' in url_lower or 'sim' in filename_lower:
+            if 'simulare_ii' in filename_lower:
+                return '-'
+            return 'Simulare'
+        if 'modeledesubiecte' in url_lower or 'model' in filename_lower:
+            return 'Model'
         
-        # Default fallback
         return '-'
     
     def download_file(self, url: str, target_path: Path) -> bool:
@@ -209,12 +216,10 @@ def extract_subcategory_from_pdf_name(self, pdf_filename: str) -> str:
             'organica': 'organica',
             'tehnologic': 'tehnologic',
             'teoretic_vocational': 'teoretic',
-            'sp_mi_c': 'mate-info-C',
-            'sp_mi_p': 'mate-info-Pascal',
-            'sp_mi_pascal': 'mate-info-Pascal',
-            'sp_sn_c': 'st-nat-C',
-            'sp_sn_p': 'st-nat-Pascal',
-            'sp_sn_pascal': 'st-nat-Pascal',
+            'sp_mi_c': 'mate-info-c',
+            'sp_mi_p': 'mate-info-pascal',
+            'sp_sn_c': 'st-nat-c',
+            'sp_sn_p': 'st-nat-pascal',
             'sp_mi_bar': 'mate-info-bareme',
             'sp_sn_bar': 'st-nat-bareme',
         }
@@ -232,7 +237,7 @@ def build_r2_key(self, pdf_filename: str, exam_type: str, year: str) -> tuple[st
         filename = pdf_filename
         # Clean up filename by removing language suffixes
         clean_filename = filename
-        language_suffixes = ['_LRO', '_LMA', '_LGE', '_LSK', '_LSR', '_LUA']
+        language_suffixes = ['_LRO', '_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT']
         for suffix in language_suffixes:
             if suffix + '.pdf' in clean_filename:
                 clean_filename = clean_filename.replace(suffix + '.pdf', '.pdf')
@@ -297,8 +302,8 @@ def upload_pdf(self, pdf_path: Path, exam_type: str, year: str) -> bool:
         # Handle bareme files that need to go to both C and Pascal
         if subcategory in ('mate-info-bareme', 'st-nat-bareme'):
             new_sub = subcategory.replace('bareme', '')
-            c_key = r2_key.replace(subcategory, new_sub + 'C')
-            pascal_key = r2_key.replace(subcategory, new_sub + 'Pascal')
+            c_key = r2_key.replace(subcategory, new_sub + 'c')
+            pascal_key = r2_key.replace(subcategory, new_sub + 'pascal')
             if self.upload_enabled:
                 ok_c = self.upload_to_r2(pdf_path, c_key)
                 ok_p = self.upload_to_r2(pdf_path, pascal_key)
@@ -338,7 +343,7 @@ def extract_zip_file(self, zip_path: Path, target_temp_dir: Path, exam_type: str
                 
                 # Filter for LRO (Romanian) files only
                 lro_files = [f for f in pdf_files if 
-                           ('_LRO.pdf' in f.name or (not any(lang in f.name for lang in ['_LMA', '_LGE', '_LSK', '_LSR', '_LUA']) and f.name.endswith('.pdf'))) 
+                           ('_LRO.pdf' in f.name or (not any(lang in f.name for lang in ['_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT']) and f.name.endswith('.pdf'))) 
                            and 'pentru_minoritatea' not in f.name.lower() 
                            and 'minoritatea' not in f.name.lower()]
                 print(f"Processing {len(lro_files)} LRO files")
@@ -403,12 +408,12 @@ def run(self):
             print(f"\nProcessing URL: {url}")
             
             # Fetch webpage
-            html_content = self.fetch_page(url)
+            html_content, actual_url = self.fetch_page(url)
             if not html_content:
                 continue
-            
-            # Extract ZIP links
-            zip_links = self.extract_links(html_content, url)
+
+            # Extract ZIP links using the actual URL (may be HTTP fallback)
+            zip_links = self.extract_links(html_content, actual_url)
             print(f"Found {len(zip_links)} ZIP files")
             
             # Process each ZIP link
@@ -463,6 +468,18 @@ def main():
         action='store_true',
         help='Upload files to R2 (default: save files locally in ./files)'
     )
+    parser.add_argument(
+        '--force-archive',
+        action='store_true',
+        default=None,
+        help='Force archive subdomain (subiecte{year}.edu.ro) even for current year'
+    )
+    parser.add_argument(
+        '--no-archive',
+        action='store_true',
+        default=None,
+        help='Force no archive subdomain (subiecte.edu.ro) even for past years'
+    )
     
     args = parser.parse_args()
     
@@ -471,12 +488,24 @@ def main():
         import sys
         sys.exit(1)
     
+    if args.force_archive and args.no_archive:
+        print("Error: --force-archive and --no-archive cannot be used together.")
+        import sys
+        sys.exit(1)
+    
+    force_archive: bool | None = None
+    if args.force_archive:
+        force_archive = True
+    elif args.no_archive:
+        force_archive = False
+    
     try:
         scraper = BacExamScraper(
             worker_url=args.worker_url,
             upload_password=args.password,
             year=args.year,
             upload_enabled=args.upload,
+            force_archive=force_archive,
         )
         zips_count = scraper.run()
         
diff --git a/web-scraper/run.sh b/web-scraper/run.sh
index cbd3ae9..2424f96 100755
--- a/web-scraper/run.sh
+++ b/web-scraper/run.sh
@@ -36,6 +36,8 @@ Scrape options:
     -u, --upload                       Upload to R2 (default: save in ./files)
     -w, --worker-url URL               Override worker URL
     -p, --password PASS                Override upload password
+    --force-archive                    Force archive subdomain (subiecte{year}.edu.ro)
+    --no-archive                       Force no archive subdomain (subiecte.edu.ro)
 
 Upload options:
     --files PATH [PATH...]             Files or folders to upload (default: ./files)
@@ -130,6 +132,12 @@ run_scrape() {
   if [[ "$SCRAPE_UPLOAD" -eq 1 ]]; then
     cmd+=(--upload)
   fi
+  if [[ "$SCRAPE_FORCE_ARCHIVE" -eq 1 ]]; then
+    cmd+=(--force-archive)
+  fi
+  if [[ "$SCRAPE_NO_ARCHIVE" -eq 1 ]]; then
+    cmd+=(--no-archive)
+  fi
   if [[ -n "$SCRAPE_WORKER_URL" ]]; then
     cmd+=(--worker-url "$SCRAPE_WORKER_URL")
   fi
@@ -298,11 +306,8 @@ run_preview() {
 
   export PUBLIC_WORKER_URL="http://127.0.0.1:$api_port"
 
-  echo "Building site with local preview data..."
-  (cd "$project_root" && pnpm build)
-
-  echo "Starting site preview..."
-  (cd "$project_root" && pnpm preview)
+  echo "Starting site preview (dev mode)..."
+  (cd "$project_root" && pnpm dev)
 }
 
 run_download() {
@@ -381,6 +386,9 @@ interactive_scrape_options() {
   local current_year
   current_year="$(date +%Y)"
 
+  SCRAPE_FORCE_ARCHIVE=0
+  SCRAPE_NO_ARCHIVE=0
+
   read -r -p "Year [$current_year]: " input_year
   SCRAPE_YEAR="${input_year:-$current_year}"
 
@@ -389,6 +397,21 @@ interactive_scrape_options() {
     SCRAPE_UPLOAD=1
   fi
 
+  read -r -p "Force archive subdomain? (subiecte{year}.edu.ro) [y/N]: " input_force
+  if [[ "${input_force,,}" =~ ^(y|yes)$ ]]; then
+    SCRAPE_FORCE_ARCHIVE=1
+  fi
+
+  read -r -p "Force no archive subdomain? (subiecte.edu.ro) [y/N]: " input_no_archive
+  if [[ "${input_no_archive,,}" =~ ^(y|yes)$ ]]; then
+    SCRAPE_NO_ARCHIVE=1
+  fi
+
+  if [[ "$SCRAPE_FORCE_ARCHIVE" -eq 1 && "$SCRAPE_NO_ARCHIVE" -eq 1 ]]; then
+    echo "Error: --force-archive and --no-archive cannot be used together."
+    exit 1
+  fi
+
   interactive_worker_and_password SCRAPE_WORKER_URL SCRAPE_PASSWORD
 }
 
@@ -465,6 +488,8 @@ SKIP_INSTALL=0
 
 SCRAPE_YEAR="$(date +%Y)"
 SCRAPE_UPLOAD=0
+SCRAPE_FORCE_ARCHIVE=0
+SCRAPE_NO_ARCHIVE=0
 SCRAPE_WORKER_URL=""
 SCRAPE_PASSWORD=""
 
@@ -542,6 +567,14 @@ while [[ $# -gt 0 ]]; do
       SCRAPE_UPLOAD=1
       shift
       ;;
+    --force-archive)
+      SCRAPE_FORCE_ARCHIVE=1
+      shift
+      ;;
+    --no-archive)
+      SCRAPE_NO_ARCHIVE=1
+      shift
+      ;;
 
     # Shared — dispatched by current mode
     -w | --worker-url)
@@ -673,6 +706,8 @@ fi
 case "$MODE" in
   scrape)
     echo "Year: $SCRAPE_YEAR"
+    echo "Force archive: $([ "$SCRAPE_FORCE_ARCHIVE" -eq 1 ] && echo yes || echo no)"
+    echo "No archive: $([ "$SCRAPE_NO_ARCHIVE" -eq 1 ] && echo yes || echo no)"
     run_scrape
     ;;
   upload) run_upload ;;

From 727556c307bf200cb36e140261f84bed57c95c11 Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 15:19:47 +0300
Subject: [PATCH 2/7] Add shortcuts for folders

---
 src/components/Extra.astro     | 11 ++++-
 src/components/List.astro      | 79 ++++++++++++++++---------------
 src/components/NewPage.astro   | 24 +++++++++-
 src/components/Shortcuts.astro | 33 +++++++++++--
 src/config/labels.ts           | 86 +++++++++++++++++++++++++++++++++-
 5 files changed, 185 insertions(+), 48 deletions(-)

diff --git a/src/components/Extra.astro b/src/components/Extra.astro
index 1993563..bad86bc 100644
--- a/src/components/Extra.astro
+++ b/src/components/Extra.astro
@@ -9,9 +9,16 @@ interface Props {
   page: string;
   extraData: FileStructure;
   years?: number[];
+  contentFolders?: { key: string; label: string }[];
 }
 
-const { subject, page, extraData, years } = Astro.props as Props;
+const {
+  subject,
+  page,
+  extraData,
+  years,
+  contentFolders = [],
+} = Astro.props as Props;
 
 const isAdmitere = subject === 'admitere';
 
@@ -44,6 +51,6 @@ const yearsfix = shouldFilter2007 ? years?.filter((y) => y !== 2007) : years;
       </>
     )
   }
-  <Shortcuts years={yearsfix} />
+  <Shortcuts years={yearsfix} folders={contentFolders} />
   <ToggleExpansion />
 </div>
diff --git a/src/components/List.astro b/src/components/List.astro
index cafa104..9993b10 100644
--- a/src/components/List.astro
+++ b/src/components/List.astro
@@ -1,5 +1,6 @@
 ---
 import type { FileStructure } from '../types';
+import { formatFileName, getFolderPriority } from '../config/labels';
 
 interface Props {
   subject: string;
@@ -11,30 +12,7 @@ interface Props {
 }
 
 const isYearFolder = (key: string): boolean => /^20\d{2}$/.test(key);
-const formatKey = (key: string): string => key.replace(/_/g, ' ');
-const getFolderPriority = (key: string): number => {
-  const normalized = key.toLowerCase().replace(/[-_]+/g, ' ');
-
-  const priorityRules: Array<[RegExp, number]> = [
-    [/\badmitere\b/, 0],
-    [/\bpreadmitere\b/, 1],
-    [/\bsimululare\b/, 2],
-    [/\bsesiunea\s*(ii|2)\b/, 3],
-    [/\bsesiunea\s*(i|1)\b/, 4],
-    [/(special|olimp)/, 5],
-    [/\bbac\b/, 6],
-    [/\bmodel\b/, 7],
-    [/\bsimulari judetene\b/, 8],
-    [/\bteste de antrenament\b/, 9],
-    [/\b100 variante\b/, 10],
-  ];
-
-  for (const [pattern, priority] of priorityRules) {
-    if (pattern.test(normalized)) return priority;
-  }
-
-  return 100;
-};
+const formatKey = (key: string): string => key.replace(/_/g, '-');
 
 const {
   subject,
@@ -69,12 +47,37 @@ const sortedEntries = entries
     if (a.isYear && b.isYear) return Number(b.key) - Number(a.key);
     if (a.isYear !== b.isYear) return a.isYear ? -1 : 1;
 
-    if (a.isFile && b.isFile && a.fileMatch && b.fileMatch) {
-      const numDiff = parseInt(a.fileMatch[2]) - parseInt(b.fileMatch[2]);
-      if (numDiff !== 0) return numDiff;
-      const typeA = a.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
-      const typeB = b.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
-      return typeA - typeB;
+    if (a.isFile && b.isFile) {
+      const aLow = /laicuza|hulubei/i.test(a.key);
+      const bLow = /laicuza|hulubei/i.test(b.key);
+      if (aLow !== bLow) return aLow ? 1 : -1;
+
+      const aBase = a.key.replace(/_rasp\.pdf$/, '.pdf');
+      const bBase = b.key.replace(/_rasp\.pdf$/, '.pdf');
+      if (aBase === b.key) return 1;
+      if (bBase === a.key) return -1;
+
+      const aParts = a.key.match(/^(.+?)_(var|bar|rasp)(.*)$/i);
+      const bParts = b.key.match(/^(.+?)_(var|bar|rasp)(.*)$/i);
+      if (
+        aParts &&
+        bParts &&
+        aParts[1].toLowerCase() === bParts[1].toLowerCase()
+      ) {
+        const order: Record<string, number> = { var: 0, bar: 1, rasp: 2 };
+        const aType = aParts[2].toLowerCase();
+        const bType = bParts[2].toLowerCase();
+        const diff = (order[aType] ?? 0) - (order[bType] ?? 0);
+        if (diff !== 0) return diff;
+      }
+
+      if (a.fileMatch && b.fileMatch) {
+        const numDiff = parseInt(a.fileMatch[2]) - parseInt(b.fileMatch[2]);
+        if (numDiff !== 0) return numDiff;
+        const typeA = a.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
+        const typeB = b.fileMatch[1].toLowerCase() === 'var' ? 0 : 1;
+        return typeA - typeB;
+      }
     }
 
     if (a.isFile !== b.isFile) return a.isFile ? 1 : -1;
@@ -82,7 +85,7 @@ const sortedEntries = entries
     const priorityDiff = a.priority - b.priority;
     if (priorityDiff !== 0) return priorityDiff;
 
-    return b.key.localeCompare(a.key);
+    return a.key.localeCompare(b.key);
   })
   .map(({ key, value }) => [key, value] as [string, FileStructure[string]]);
 ---
@@ -113,7 +116,7 @@ const sortedEntries = entries
                       href={`${baseUrl}/file/${value}`}
                       target="_blank"
                       rel="noopener"
-                      aria-label={`Open ${key} in new tab`}
+                      aria-label={`Open ${formatFileName(key)} in new tab`}
                       data-umami-event="download_file"
                       data-umami-file-path={value}
                       data-umami-subject={subject}
@@ -132,12 +135,7 @@ const sortedEntries = entries
                           />
                         </svg>
                       )}
-                      {key.split('_').map((part, i, arr) => (
-                        <Fragment>
-                          {part}
-                          {i < arr.length - 1 && <>&#8203;_</>}
-                        </Fragment>
-                      ))}
+                      {formatFileName(key)}
                     </a>
                   </li>
                 </Fragment>
@@ -165,7 +163,10 @@ const sortedEntries = entries
                       <hr class="border-black m-2" />
                     </li>
                   )}
-                  <li class="space-y-2" id={isYear ? key : undefined}>
+                  <li
+                    class="space-y-2"
+                    id={isYear || depth === 0 ? key : undefined}
+                  >
                     {/* dark-reader: border-zinc-400 */}
                     <div class="folder-container">
                       <div
diff --git a/src/components/NewPage.astro b/src/components/NewPage.astro
index bb0370a..48faae1 100644
--- a/src/components/NewPage.astro
+++ b/src/components/NewPage.astro
@@ -8,9 +8,16 @@ import Footer from '../components/Footer.astro';
 import CountdownTimer from './CountdownTimer.astro';
 import SiteLinks from './SiteLinks.astro';
 import { apiService } from '../api';
-import { getDisplayName, PAGE_DISPLAY_NAMES } from '../config/labels';
+import {
+  getDisplayName,
+  getFolderPriority,
+  PAGE_DISPLAY_NAMES,
+} from '../config/labels';
 import type { FileStructure } from '../types';
 
+// Helper to match List.astro folder display format
+const formatFolderKey = (key: string): string => key.replace(/_/g, '-');
+
 // Props for the component
 interface Props {
   subject: string;
@@ -28,6 +35,13 @@ const content: FileStructure = pageData.content;
 const years: number[] = pageData.years;
 const extra: FileStructure = pageData.extra;
 
+// Top-level non-year folder keys for sidebar shortcuts
+const contentFolders = Object.entries(content)
+  .filter(([, v]) => typeof v === 'object' && v !== null)
+  .filter(([k]) => !/^20\d{2}$/.test(k))
+  .map(([k]) => ({ key: k, label: formatFolderKey(k) }))
+  .sort((a, b) => getFolderPriority(a.key) - getFolderPriority(b.key));
+
 // ── SEO helpers ──────────────────────────────────────────────────────────────
 const school = 'Liceul Teoretic Alexandru Ioan Cuza, București';
 const subjectLabel =
@@ -110,7 +124,13 @@ const breadcrumbs = [
       slot="right"
       class="flex flex-col gap-2 md:mt-2 md:mr-2 md:sticky md:top-2 md:right-2"
     >
-      <Extra subject={subject} page={page} extraData={extra} years={years} />
+      <Extra
+        subject={subject}
+        page={page}
+        extraData={extra}
+        years={years}
+        contentFolders={contentFolders}
+      />
       <CountdownTimer />
     </aside>
   </ContentContainer>
diff --git a/src/components/Shortcuts.astro b/src/components/Shortcuts.astro
index b875202..a2d3ccf 100644
--- a/src/components/Shortcuts.astro
+++ b/src/components/Shortcuts.astro
@@ -1,16 +1,43 @@
 ---
+interface FolderShortcut {
+  key: string;
+  label: string;
+}
+
 interface Props {
   years?: number[];
+  folders?: FolderShortcut[];
 }
 
-const { years = [] } = Astro.props;
+const { years = [], folders = [] } = Astro.props;
+const hasYears = years.length > 0;
+const hasFolders = folders.length > 0;
 ---
 
 <div class="shortcuts-container">
   <p class="text-lg font-bold text-slate-300">Accesare rapidă</p>
 
   {
-    years.length > 0 ? (
+    hasFolders && (
+      <>
+        <div class="shortcuts-grid">
+          {folders.map((f) => (
+            <a
+              href={`#${f.key}`}
+              class="shortcut-button"
+              title={`Salt la secțiunea ${f.label}`}
+            >
+              {f.label}
+            </a>
+          ))}
+        </div>
+        {hasYears && <hr class="border-white/10 my-2" />}
+      </>
+    )
+  }
+
+  {
+    hasYears ? (
       <div class="shortcuts-grid">
         {years.map((year) => (
           <a
@@ -23,7 +50,7 @@ const { years = [] } = Astro.props;
         ))}
       </div>
     ) : (
-      <p class="text-slate-400">Niciun an disponibil</p>
+      !hasFolders && <p class="text-slate-400">Niciun an disponibil</p>
     )
   }
 </div>
diff --git a/src/config/labels.ts b/src/config/labels.ts
index 9d8c100..a91f5ce 100644
--- a/src/config/labels.ts
+++ b/src/config/labels.ts
@@ -23,8 +23,8 @@ export const PAGE_DISPLAY_NAMES: Record<string, string> = {
   mate: 'Matematică',
   'mate-info-c': 'Mate-Info (C)',
   'mate-info-pascal': 'Mate-Info (Pascal)',
-  'st-nat-c': 'Științe Ale Naturii (C)',
-  'st-nat-pascal': 'Științe Ale Naturii (Pascal)',
+  'st-nat-c': 'Științe ale Naturii (C)',
+  'st-nat-pascal': 'Științe ale Naturii (Pascal)',
 };
 
 export function formatSlugLabel(value: string): string {
@@ -39,3 +39,85 @@ export function getDisplayName(value: string): string {
     formatSlugLabel(value)
   );
 }
+
+const FOLDER_PRIORITY_RULES: Array<[RegExp, number]> = [
+  [/\badmitere\b/, 0],
+  [/\bpreadmitere\b/, 1],
+  [/\bsesiunea\s*(ii|2)\s*rezerva\b/, 2],
+  [/\bsesiunea\s*(ii|2)\b/, 3],
+  [/\bsesiunea\s*(i|1)\s*rezerva\b/, 4],
+  [/\bsesiunea\s*(i|1)\b/, 5],
+  [/(special|olimp)/, 6],
+  [/\bbac\b/, 7],
+  [/\bsimulare xii\b/, 8],
+  [/\bsimulare xi\b/, 9],
+  [/\bsimulare\b/, 10],
+  [/\bmodel\b/, 11],
+  [/\bsimulari judetene\b/, 12],
+  [/\bteste de antrenament\b/, 13],
+  [/\b100 variante\b/, 14],
+  [/\b-\b/, 15],
+];
+
+export function getFolderPriority(key: string): number {
+  const normalized = key.toLowerCase().replace(/[-_]+/g, ' ');
+
+  for (const [pattern, priority] of FOLDER_PRIORITY_RULES) {
+    if (pattern.test(normalized)) return priority;
+  }
+
+  return 100;
+}
+
+function extractProfile(key: string): string | null {
+  const m = key.match(/_([A-Za-z0-9]{2,4})_(20\d{2})_/);
+  return m ? m[1] : null;
+}
+
+export function formatFileName(key: string): string {
+  const fizicaMatch = key.match(
+    /^E_d_fizica_([A-Za-z\u00C0-\u024F]+)_(\d{4})(?:_(\d+))?_(var|bar)\.pdf$/i,
+  );
+  if (fizicaMatch) {
+    const location = fizicaMatch[1];
+    const num = fizicaMatch[3];
+    const isVar = fizicaMatch[4].toLowerCase() === 'var';
+    const type = isVar ? 'Varianta' : 'Barem';
+    const prefix = num ? `${location} ${num}` : location;
+    return `${prefix} - ${type}`;
+  }
+
+  const hMatch = key.match(
+    /^(H_Hulubei_regionala(?:_[A-Za-z]+)*)_(\d{4})_(var|bar)\.pdf$/i,
+  );
+  if (hMatch) {
+    const name = hMatch[1].replace(/_/g, ' ');
+    const isVar = hMatch[3].toLowerCase() === 'var';
+    return `${name} - ${isVar ? 'Varianta' : 'Barem'}`;
+  }
+
+  const testMatch = key.match(/_(Test)_(\d{2})\.pdf$/i);
+  if (testMatch) {
+    return `Test ${testMatch[2]}`;
+  }
+
+  const match = key.match(/_(var|bar)(?:_([a-z0-9]+))?(?:_rasp)?\.pdf$/i);
+  if (match) {
+    const isVar = match[1].toLowerCase() === 'var';
+    const hasRasp = key.includes('_rasp');
+    const type = hasRasp || !isVar ? 'Barem' : 'Varianta';
+    const suffix = match[2];
+    const showSuffix = suffix && !/^(model|simulare)$/i.test(suffix);
+    const profile = /^E_d_anat|^E_d_bio/i.test(key)
+      ? null
+      : extractProfile(key);
+    const display = showSuffix ? `${type} ${suffix}` : type;
+    return profile ? `${profile} ${display}` : display;
+  }
+
+  if (/_(?:rasp)\.pdf$/i.test(key)) {
+    return 'Barem';
+  }
+
+  return key;
+}

From 8c3bdb42ca9d0f6a4cc29a1ba7e87a7e252d0865 Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 15:39:22 +0300
Subject: [PATCH 3/7] Remove missing years text in shortcuts

---
 src/components/Extra.astro           | 4 +++-
 src/components/Shortcuts.astro       | 9 ++-------
 src/components/ToggleExpansion.astro | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/Extra.astro b/src/components/Extra.astro
index bad86bc..7fd7ce7 100644
--- a/src/components/Extra.astro
+++ b/src/components/Extra.astro
@@ -28,7 +28,8 @@ const shouldFilter2007 =
 const yearsfix = shouldFilter2007 ? years?.filter((y) => y !== 2007) : years;
 ---
 
-<div class="bg-zinc-950/90 rounded-3xl py-3 px-4">
+<div class="bg-zinc-950/90 rounded-3xl py-3 px-4 flex flex-col">
+  <div>
   {
     Object.keys(extraData).length > 0 && (
       <>
@@ -51,6 +52,7 @@ const yearsfix = shouldFilter2007 ? years?.filter((y) => y !== 2007) : years;
       </>
     )
   }
+  </div>
   <Shortcuts years={yearsfix} folders={contentFolders} />
   <ToggleExpansion />
 </div>
diff --git a/src/components/Shortcuts.astro b/src/components/Shortcuts.astro
index a2d3ccf..41a589b 100644
--- a/src/components/Shortcuts.astro
+++ b/src/components/Shortcuts.astro
@@ -12,6 +12,7 @@ interface Props {
 const { years = [], folders = [] } = Astro.props;
 const hasYears = years.length > 0;
 const hasFolders = folders.length > 0;
+if (!hasYears && !hasFolders) return;
 ---
 
 <div class="shortcuts-container">
@@ -37,7 +38,7 @@ const hasFolders = folders.length > 0;
   }
 
   {
-    hasYears ? (
+    hasYears && (
       <div class="shortcuts-grid">
         {years.map((year) => (
           <a
@@ -49,17 +50,11 @@ const hasFolders = folders.length > 0;
           </a>
         ))}
       </div>
-    ) : (
-      !hasFolders && <p class="text-slate-400">Niciun an disponibil</p>
     )
   }
 </div>
 
 <style>
-  .shortcuts-container {
-    margin-bottom: 1rem;
-  }
-
   .shortcuts-grid {
     display: flex;
     flex-wrap: wrap;
diff --git a/src/components/ToggleExpansion.astro b/src/components/ToggleExpansion.astro
index 3ddb1e7..ec12672 100644
--- a/src/components/ToggleExpansion.astro
+++ b/src/components/ToggleExpansion.astro
@@ -1,4 +1,4 @@
-<div class="bg-slate-800 p-3 rounded-lg">
+<div class="bg-slate-800 p-3 rounded-lg mt-3">
   <div
     class="flex items-center justify-between flex-row gap-2 md:flex-col lg:flex-row lg:gap-0"
   >

From 1db8a0c994b7222655843adfb7c48dbc53fdddb6 Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 16:36:22 +0300
Subject: [PATCH 4/7] Clean cache

---
 public/sw.js        | 2 +-
 web-scraper/main.py | 4 ++--
 web-scraper/run.sh  | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/sw.js b/public/sw.js
index bdb648c..f6b4eed 100644
--- a/public/sw.js
+++ b/public/sw.js
@@ -1,4 +1,4 @@
-var CACHE = 'cuza-pages-v3';
+var CACHE = 'cuza-pages-v4';
 
 self.addEventListener('install', function (_event) {
   self.skipWaiting();
diff --git a/web-scraper/main.py b/web-scraper/main.py
index 101ecf0..d69de34 100755
--- a/web-scraper/main.py
+++ b/web-scraper/main.py
@@ -237,7 +237,7 @@ def build_r2_key(self, pdf_filename: str, exam_type: str, year: str) -> tuple[st
         filename = pdf_filename
         # Clean up filename by removing language suffixes
         clean_filename = filename
-        language_suffixes = ['_LRO', '_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT']
+        language_suffixes = ['_LRO', '_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT', '_GER']
         for suffix in language_suffixes:
             if suffix + '.pdf' in clean_filename:
                 clean_filename = clean_filename.replace(suffix + '.pdf', '.pdf')
@@ -343,7 +343,7 @@ def extract_zip_file(self, zip_path: Path, target_temp_dir: Path, exam_type: str
                 
                 # Filter for LRO (Romanian) files only
                 lro_files = [f for f in pdf_files if 
-                           ('_LRO.pdf' in f.name or (not any(lang in f.name for lang in ['_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT']) and f.name.endswith('.pdf'))) 
+                           ('_LRO.pdf' in f.name or (not any(lang in f.name for lang in ['_LMA', '_LGE', '_LSK', '_LSR', '_LUA', '_LIT', '_GER']) and f.name.endswith('.pdf'))) 
                            and 'pentru_minoritatea' not in f.name.lower() 
                            and 'minoritatea' not in f.name.lower()]
                 print(f"Processing {len(lro_files)} LRO files")
diff --git a/web-scraper/run.sh b/web-scraper/run.sh
index 2424f96..dce3efb 100755
--- a/web-scraper/run.sh
+++ b/web-scraper/run.sh
@@ -420,7 +420,7 @@ interactive_upload_options() {
   local files_text="${input_files:-./files}"
   IFS=' ' read -r -a UPLOAD_FILES <<< "$files_text"
 
-  read -r -p "Base dir [./files]: " input_base_dir
+  read -r -p "Base dir in R2 [./files]: " input_base_dir
   UPLOAD_BASE_DIR="${input_base_dir:-./files}"
 
   read -r -p "Explicit key (optional): " input_key
@@ -721,5 +721,4 @@ case "$MODE" in
     ;;
 esac
 
-echo
 echo "Done."

From b866cb29edf5d1776b97b201cf8ef958faed3c4a Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 16:51:18 +0300
Subject: [PATCH 5/7] Add CORS for worker

---
 cuza-worker/src/index.ts | 2 +-
 src/pages/upload.astro   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuza-worker/src/index.ts b/cuza-worker/src/index.ts
index 211fb9c..89b48ee 100644
--- a/cuza-worker/src/index.ts
+++ b/cuza-worker/src/index.ts
@@ -29,7 +29,7 @@ app.use(
   '*',
   cors({
     origin: (origin) => {
-      const allowed = ['https://cuza.pages.dev', 'http://localhost:4321'];
+      const allowed = ['https://cuza.pages.dev', 'https://dev.cuza.pages.dev'];
       return allowed.includes(origin) ? origin : null;
     },
     allowMethods: ['GET', 'POST', 'DELETE', 'OPTIONS'],
diff --git a/src/pages/upload.astro b/src/pages/upload.astro
index d4c590c..a80ae36 100644
--- a/src/pages/upload.astro
+++ b/src/pages/upload.astro
@@ -91,7 +91,7 @@ const isUploadEnabled = !!workerUrl;
 
           <div id="variantField" class="hidden items-center gap-2">
             <label for="variant" class="font-bold whitespace-nowrap">
-              Variant:
+              Varianta:
             </label>
             <select
               id="variant"

From 2e12eefcdaf82e6477f9ad7328fe5301aa983d86 Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 16:59:52 +0300
Subject: [PATCH 6/7] Revert "Add CORS for worker"

This reverts commit b866cb29edf5d1776b97b201cf8ef958faed3c4a.
---
 cuza-worker/src/index.ts | 2 +-
 src/pages/upload.astro   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cuza-worker/src/index.ts b/cuza-worker/src/index.ts
index 89b48ee..211fb9c 100644
--- a/cuza-worker/src/index.ts
+++ b/cuza-worker/src/index.ts
@@ -29,7 +29,7 @@ app.use(
   '*',
   cors({
     origin: (origin) => {
-      const allowed = ['https://cuza.pages.dev', 'https://dev.cuza.pages.dev'];
+      const allowed = ['https://cuza.pages.dev', 'http://localhost:4321'];
       return allowed.includes(origin) ? origin : null;
     },
     allowMethods: ['GET', 'POST', 'DELETE', 'OPTIONS'],
diff --git a/src/pages/upload.astro b/src/pages/upload.astro
index a80ae36..d4c590c 100644
--- a/src/pages/upload.astro
+++ b/src/pages/upload.astro
@@ -91,7 +91,7 @@ const isUploadEnabled = !!workerUrl;
 
           <div id="variantField" class="hidden items-center gap-2">
             <label for="variant" class="font-bold whitespace-nowrap">
-              Varianta:
+              Variant:
             </label>
             <select
               id="variant"

From a30c2b6f5cc0d61df6a770c94d66ec8de08124be Mon Sep 17 00:00:00 2001
From: DynoW <104089032+DynoW@users.noreply.github.com>
Date: Sun, 9 Aug 2026 17:03:23 +0300
Subject: [PATCH 7/7] Fix typo

---
 src/pages/upload.astro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/upload.astro b/src/pages/upload.astro
index d4c590c..a80ae36 100644
--- a/src/pages/upload.astro
+++ b/src/pages/upload.astro
@@ -91,7 +91,7 @@ const isUploadEnabled = !!workerUrl;
 
           <div id="variantField" class="hidden items-center gap-2">
             <label for="variant" class="font-bold whitespace-nowrap">
-              Variant:
+              Varianta:
             </label>
             <select
               id="variant"