diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 3fed3135..00000000
--- a/.prettierrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "printWidth": 80,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "es5",
-  "bracketSpacing": true,
-  "arrowParens": "avoid",
-  "proseWrap": "always"
-}
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
index 3fed3135..e6e05952 100644
--- a/frontend/.prettierrc
+++ b/frontend/.prettierrc
@@ -6,5 +6,8 @@
   "trailingComma": "es5",
   "bracketSpacing": true,
   "arrowParens": "avoid",
-  "proseWrap": "always"
+  "proseWrap": "always",
+
+  "plugins": ["prettier-plugin-tailwindcss"],
+  "tailwindFunctions": ["clsx", "cn"]
 }
diff --git a/frontend/README.md b/frontend/README.md
index e215bc4c..0a7fac56 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,4 +1,5 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+This is a [Next.js](https://nextjs.org) project bootstrapped with
+[`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
 
 ## Getting Started
 
@@ -14,23 +15,35 @@ pnpm dev
 bun dev
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the
+result.
 
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+You can start editing the page by modifying `app/page.tsx`. The page
+auto-updates as you edit the file.
 
-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+This project uses
+[`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts)
+to automatically optimize and load [Geist](https://vercel.com/font), a new font
+family for Vercel.
 
 ## Learn More
 
 To learn more about Next.js, take a look at the following resources:
 
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js
+  features and API.
 - [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
 
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+You can check out
+[the Next.js GitHub repository](https://github.com/vercel/next.js) - your
+feedback and contributions are welcome!
 
 ## Deploy on Vercel
 
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+The easiest way to deploy your Next.js app is to use the
+[Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme)
+from the creators of Next.js.
 
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
+Check out our
+[Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying)
+for more details.
diff --git a/frontend/actions/quiz.ts b/frontend/actions/quiz.ts
index 85724b50..58ef6432 100644
--- a/frontend/actions/quiz.ts
+++ b/frontend/actions/quiz.ts
@@ -1,15 +1,16 @@
 'use server';
 
+import { eq, inArray } from 'drizzle-orm';
+
 import { db } from '@/db';
+import { awardQuizPoints, calculateQuizPoints } from '@/db/queries/points';
 import {
-  quizAttempts,
-  quizAttemptAnswers,
   quizAnswers,
+  quizAttemptAnswers,
+  quizAttempts,
   quizQuestions,
 } from '@/db/schema/quiz';
-import { awardQuizPoints,calculateQuizPoints  } from '@/db/queries/points';
 import { getCurrentUser } from '@/lib/auth';
-import { eq, inArray, and } from 'drizzle-orm';
 
 export interface UserAnswer {
   questionId: string;
@@ -93,7 +94,8 @@ export async function submitQuizAttempt(
       return { success: false, error: 'Unauthorized' };
     }
 
-    const { userId, quizId, answers, violations, startedAt, completedAt } = input;
+    const { userId, quizId, answers, violations, startedAt, completedAt } =
+      input;
 
     if (userId && userId !== session.id) {
       return { success: false, error: 'User mismatch' };
@@ -186,9 +188,10 @@ export async function submitQuizAttempt(
       };
     }
 
-    const percentage = ((correctAnswersCount / questionIds.length) * 100).toFixed(
-      2
-    );
+    const percentage = (
+      (correctAnswersCount / questionIds.length) *
+      100
+    ).toFixed(2);
     const integrityScore = calculateIntegrityScore(violations);
     const timeSpentSeconds = Math.floor(
       (completedAtDate.getTime() - startedAtDate.getTime()) / 1000
@@ -252,3 +255,22 @@ export async function submitQuizAttempt(
     };
   }
 }
+
+export async function initializeQuizCache(
+  quizId: string
+): Promise<{ success: boolean; error?: string }> {
+  try {
+    const { getOrCreateQuizAnswersCache } =
+      await import('@/lib/quiz/quiz-answers-redis');
+    const success = await getOrCreateQuizAnswersCache(quizId);
+
+    if (!success) {
+      return { success: false, error: 'Quiz not found' };
+    }
+
+    return { success: true };
+  } catch (error) {
+    console.error('Failed to initialize quiz cache:', error);
+    return { success: false, error: 'Internal server error' };
+  }
+}
diff --git a/frontend/app/[locale]/about/page.tsx b/frontend/app/[locale]/about/page.tsx
index 57c93a75..e4313412 100644
--- a/frontend/app/[locale]/about/page.tsx
+++ b/frontend/app/[locale]/about/page.tsx
@@ -1,38 +1,34 @@
-import { getTranslations } from "next-intl/server"
-import { getPlatformStats } from "@/lib/about/stats"
-import { getSponsors } from "@/lib/about/github-sponsors"
+import { getTranslations } from 'next-intl/server';
 
-import { HeroSection } from "@/components/about/HeroSection"
-import { TopicsSection } from "@/components/about/TopicsSection"
-import { FeaturesSection } from "@/components/about/FeaturesSection"
-import { PricingSection } from "@/components/about/PricingSection"
-import { CommunitySection } from "@/components/about/CommunitySection"
+import { CommunitySection } from '@/components/about/CommunitySection';
+import { FeaturesSection } from '@/components/about/FeaturesSection';
+import { HeroSection } from '@/components/about/HeroSection';
+import { PricingSection } from '@/components/about/PricingSection';
+import { TopicsSection } from '@/components/about/TopicsSection';
+import { getSponsors } from '@/lib/about/github-sponsors';
+import { getPlatformStats } from '@/lib/about/stats';
 
 export async function generateMetadata() {
-  const t = await getTranslations("about")
+  const t = await getTranslations('about');
   return {
-    title: t("metaTitle"),
-    description: t("metaDescription"),
-  }
+    title: t('metaTitle'),
+    description: t('metaDescription'),
+  };
 }
 
 export default async function AboutPage() {
   const [stats, sponsors] = await Promise.all([
     getPlatformStats(),
-    getSponsors()
-  ])
+    getSponsors(),
+  ]);
 
   return (
-    <main className="min-h-screen bg-gray-50 dark:bg-black overflow-hidden text-gray-900 dark:text-white
-      w-[100vw] relative left-[50%] right-[50%] -ml-[50vw] -mr-[50vw]"
-    >
-
+    <main className="relative right-[50%] left-[50%] -mr-[50vw] -ml-[50vw] min-h-screen w-[100vw] overflow-hidden bg-gray-50 text-gray-900 dark:bg-black dark:text-white">
       <HeroSection stats={stats} />
       <TopicsSection />
       <FeaturesSection />
       <PricingSection sponsors={sponsors} />
       <CommunitySection />
-
     </main>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/frontend/app/[locale]/blog/[slug]/PostDetails.tsx b/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
index 7ce07d19..f16b593a 100644
--- a/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
+++ b/frontend/app/[locale]/blog/[slug]/PostDetails.tsx
@@ -1,11 +1,12 @@
+import groq from 'groq';
 import Image from 'next/image';
 import { notFound } from 'next/navigation';
-import groq from 'groq';
 import { getTranslations } from 'next-intl/server';
+
 import { client } from '@/client';
+import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
 import { Link } from '@/i18n/routing';
 import { formatBlogDate } from '@/lib/blog/date';
-import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
 
 export const revalidate = 0;
 
@@ -189,7 +190,7 @@ function renderPortableTextBlock(block: any, index: number): React.ReactNode {
     return (
       <h6
         key={block._key || `block-${index}`}
-        className="mt-6 mb-2 text-sm font-semibold uppercase tracking-wide text-gray-700 dark:text-gray-300"
+        className="mt-6 mb-2 text-sm font-semibold tracking-wide text-gray-700 uppercase dark:text-gray-300"
       >
         {children}
       </h6>
@@ -209,7 +210,7 @@ function renderPortableTextBlock(block: any, index: number): React.ReactNode {
   return (
     <p
       key={block._key || `block-${index}`}
-      className="mb-4 whitespace-pre-line text-base leading-relaxed text-gray-700 dark:text-gray-300"
+      className="mb-4 text-base leading-relaxed whitespace-pre-line text-gray-700 dark:text-gray-300"
     >
       {children}
     </p>
@@ -283,7 +284,7 @@ function renderPortableText(
           key={block._key || `image-${i}`}
           src={block.url}
           alt={postTitle || 'Post image'}
-          className="rounded-xl border border-gray-200 my-6"
+          className="my-6 rounded-xl border border-gray-200"
         />
       );
       i += 1;
@@ -482,7 +483,7 @@ export default async function PostDetails({
     : null;
 
   return (
-    <DynamicGridBackground className="bg-gray-50 transition-colors duration-300 dark:bg-transparent py-10">
+    <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
       <main className="relative z-10 mx-auto max-w-7xl px-4 py-12 sm:px-6 lg:px-8">
         {breadcrumbsJsonLd && (
           <script
@@ -512,7 +513,7 @@ export default async function PostDetails({
                   {!isLast && item.href ? (
                     <Link
                       href={item.href}
-                      className="transition hover:text-[var(--accent-primary)] hover:underline underline-offset-4"
+                      className="underline-offset-4 transition hover:text-[var(--accent-primary)] hover:underline"
                     >
                       {item.name}
                     </Link>
@@ -533,7 +534,7 @@ export default async function PostDetails({
 
         <div className="mx-auto w-full max-w-3xl">
           {categoryLabel && (
-            <div className="text-sm font-medium text-gray-500 dark:text-gray-400 text-center">
+            <div className="text-center text-sm font-medium text-gray-500 dark:text-gray-400">
               <Link
                 href={categoryHref || '/blog'}
                 className="inline-flex items-center gap-1 text-[var(--accent-primary)] transition"
@@ -542,7 +543,7 @@ export default async function PostDetails({
               </Link>
             </div>
           )}
-          <h1 className="mt-3 text-4xl font-bold text-gray-900 dark:text-gray-100 text-center">
+          <h1 className="mt-3 text-center text-4xl font-bold text-gray-900 dark:text-gray-100">
             {post.title}
           </h1>
 
@@ -569,7 +570,7 @@ export default async function PostDetails({
         {(post.tags?.length || 0) > 0 && null}
 
         {post.mainImage && (
-          <div className="relative w-full h-[520px] rounded-2xl overflow-hidden my-8">
+          <div className="relative my-8 h-[520px] w-full overflow-hidden rounded-2xl">
             <Image
               src={post.mainImage}
               alt={post.title || 'Post image'}
@@ -596,7 +597,7 @@ export default async function PostDetails({
                 <h2 className="text-2xl font-semibold text-gray-900 dark:text-gray-100">
                   {t('recommendedPosts')}
                 </h2>
-                <div className="mt-6 grid gap-6 auto-rows-fr sm:grid-cols-2 lg:grid-cols-3">
+                <div className="mt-6 grid auto-rows-fr gap-6 sm:grid-cols-2 lg:grid-cols-3">
                   {recommendedPosts.map(item => {
                     const itemCategory = item.categories?.[0];
                     const itemCategoryDisplay = itemCategory
@@ -619,18 +620,18 @@ export default async function PostDetails({
                             />
                           </div>
                         )}
-                        <h3 className="mt-4 text-lg font-semibold text-gray-900 transition group-hover:underline underline-offset-4 dark:text-gray-100">
+                        <h3 className="mt-4 text-lg font-semibold text-gray-900 underline-offset-4 transition group-hover:underline dark:text-gray-100">
                           {item.title}
                         </h3>
                         {item.body && (
-                          <p className="mt-2 text-sm leading-relaxed text-gray-600 dark:text-gray-400 line-clamp-2">
+                          <p className="mt-2 line-clamp-2 text-sm leading-relaxed text-gray-600 dark:text-gray-400">
                             {plainTextFromPortableText(item.body)}
                           </p>
                         )}
                         {(item.author?.name ||
                           itemCategoryDisplay ||
                           item.publishedAt) && (
-                          <div className="mt-auto pt-3 flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400">
+                          <div className="mt-auto flex flex-wrap items-center gap-2 pt-3 text-sm text-gray-500 dark:text-gray-400">
                             {item.author?.image && (
                               <span className="relative h-5 w-5 overflow-hidden rounded-full">
                                 <Image
diff --git a/frontend/app/[locale]/blog/[slug]/page.tsx b/frontend/app/[locale]/blog/[slug]/page.tsx
index c4721b0f..1b8be81f 100644
--- a/frontend/app/[locale]/blog/[slug]/page.tsx
+++ b/frontend/app/[locale]/blog/[slug]/page.tsx
@@ -1,7 +1,9 @@
-import PostDetails from './PostDetails';
-import { client } from '@/client';
 import groq from 'groq';
 
+import { client } from '@/client';
+
+import PostDetails from './PostDetails';
+
 export async function generateStaticParams() {
   const slugs = await client.fetch<string[]>(
     groq`*[_type == "post" && defined(slug.current)][].slug.current`
diff --git a/frontend/app/[locale]/blog/category/[category]/page.tsx b/frontend/app/[locale]/blog/category/[category]/page.tsx
index ce23cd29..ea470ee9 100644
--- a/frontend/app/[locale]/blog/category/[category]/page.tsx
+++ b/frontend/app/[locale]/blog/category/[category]/page.tsx
@@ -1,13 +1,14 @@
 import groq from 'groq';
+import Image from 'next/image';
 import { notFound } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
-import Image from 'next/image';
+
 import { client } from '@/client';
-import { Link } from '@/i18n/routing';
 import { BlogCategoryGrid } from '@/components/blog/BlogCategoryGrid';
-import { formatBlogDate } from '@/lib/blog/date';
-import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
 import { FeaturedPostCtaButton } from '@/components/blog/FeaturedPostCtaButton';
+import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
+import { Link } from '@/i18n/routing';
+import { formatBlogDate } from '@/lib/blog/date';
 
 export const revalidate = 0;
 
@@ -87,33 +88,34 @@ export default async function BlogCategoryPage({
   const featuredDate = formatBlogDate(featuredPost?.publishedAt);
 
   return (
-    <DynamicGridBackground className="bg-gray-50 transition-colors duration-300 dark:bg-transparent py-10">
+    <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
       <main className="relative z-10 mx-auto max-w-7xl px-4 py-12 sm:px-6 lg:px-8">
         <nav className="mb-6" aria-label="Breadcrumb">
           <ol className="flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400">
             <li className="flex items-center gap-2">
               <Link
                 href="/blog"
-                className="transition hover:text-[var(--accent-primary)] hover:underline underline-offset-4"
+                className="underline-offset-4 transition hover:text-[var(--accent-primary)] hover:underline"
               >
                 {tNav('blog')}
               </Link>
               <span>&gt;</span>
             </li>
             <li className="flex items-center gap-2">
-              <span className="text-[var(--accent-primary)]" aria-current="page">
+              <span
+                className="text-[var(--accent-primary)]"
+                aria-current="page"
+              >
                 {categoryDisplay}
               </span>
             </li>
           </ol>
         </nav>
-        <h1 className="text-4xl font-bold mb-4 text-left">
-          {categoryDisplay}
-        </h1>
+        <h1 className="mb-4 text-left text-4xl font-bold">{categoryDisplay}</h1>
         {featuredPost?.mainImage && (
           <section className="mt-10">
             <article className="group relative overflow-hidden rounded-3xl bg-white dark:bg-black">
-              <div className="h-[320px] w-full overflow-hidden sm:h-[380px] md:h-[450px] lg:h-[618px] max-h-[65vh]">
+              <div className="h-[320px] max-h-[65vh] w-full overflow-hidden sm:h-[380px] md:h-[450px] lg:h-[618px]">
                 <Image
                   src={featuredPost.mainImage}
                   alt={featuredPost.title}
@@ -123,14 +125,14 @@ export default async function BlogCategoryPage({
                   priority={false}
                 />
               </div>
-              <div className="pointer-events-none absolute inset-x-0 bottom-0 h-56 bg-gradient-to-t from-white/95 via-white/70 to-transparent dark:from-black/90 dark:via-black/60 sm:h-64" />
+              <div className="pointer-events-none absolute inset-x-0 bottom-0 h-56 bg-gradient-to-t from-white/95 via-white/70 to-transparent sm:h-64 dark:from-black/90 dark:via-black/60" />
               <div className="absolute inset-x-0 bottom-0 p-6 sm:p-8">
                 {featuredPost.categories?.[0] && (
                   <div className="text-sm font-medium text-gray-900 dark:text-gray-100">
                     {featuredPost.categories[0]}
                   </div>
                 )}
-                <h2 className="mt-2 text-3xl font-semibold text-gray-900 transition group-hover:text-[var(--accent-primary)] dark:text-white dark:group-hover:text-[var(--accent-primary)] sm:text-4xl">
+                <h2 className="mt-2 text-3xl font-semibold text-gray-900 transition group-hover:text-[var(--accent-primary)] sm:text-4xl dark:text-white dark:group-hover:text-[var(--accent-primary)]">
                   {featuredPost.title}
                 </h2>
                 <div className="mt-3 flex items-center gap-3 text-sm text-gray-800 dark:text-gray-200">
@@ -157,7 +159,7 @@ export default async function BlogCategoryPage({
               <FeaturedPostCtaButton
                 href={`/blog/${featuredPost.slug.current}`}
                 label={featuredPost.title || 'Read more'}
-                className="!absolute !bottom-6 !right-6 z-10 h-11 w-11 rounded-full bg-[var(--accent-primary)] text-white opacity-0 shadow-sm transition group-hover:opacity-100 focus-visible:opacity-100 group-focus-within:opacity-100"
+                className="!absolute !right-6 !bottom-6 z-10 h-11 w-11 rounded-full bg-[var(--accent-primary)] text-white opacity-0 shadow-sm transition group-focus-within:opacity-100 group-hover:opacity-100 focus-visible:opacity-100"
               />
             </article>
           </section>
@@ -166,7 +168,7 @@ export default async function BlogCategoryPage({
           <BlogCategoryGrid posts={restPosts} />
         </div>
         {!posts.length && (
-          <p className="text-center text-gray-500 mt-10">{t('noPosts')}</p>
+          <p className="mt-10 text-center text-gray-500">{t('noPosts')}</p>
         )}
       </main>
     </DynamicGridBackground>
diff --git a/frontend/app/[locale]/blog/page.tsx b/frontend/app/[locale]/blog/page.tsx
index 8e393a19..e24a0808 100644
--- a/frontend/app/[locale]/blog/page.tsx
+++ b/frontend/app/[locale]/blog/page.tsx
@@ -1,6 +1,7 @@
 import groq from 'groq';
 import { unstable_noStore as noStore } from 'next/cache';
 import { getTranslations } from 'next-intl/server';
+
 import { client } from '@/client';
 import BlogFilters from '@/components/blog/BlogFilters';
 import { BlogPageHeader } from '@/components/blog/BlogPageHeader';
@@ -33,8 +34,7 @@ export default async function BlogPage({
   const { locale } = await params;
   const t = await getTranslations({ locale, namespace: 'blog' });
   const sp = searchParams ? await searchParams : undefined;
-  const authorParam =
-    typeof sp?.author === 'string' ? sp.author.trim() : '';
+  const authorParam = typeof sp?.author === 'string' ? sp.author.trim() : '';
   const hasAuthorFilter = authorParam.length > 0;
 
   const posts = await client.withConfig({ useCdn: false }).fetch(
@@ -85,8 +85,8 @@ export default async function BlogPage({
   const featuredPost = posts?.[0];
 
   return (
-    <DynamicGridBackground className="bg-gray-50 transition-colors duration-300 dark:bg-transparent py-10">
-      <main className="relative z-10 mx-auto max-w-7xl px-4 pt-6 pb-12 sm:px-6 lg:px-8">
+    <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
+      <main className="relative z-10 mx-auto max-w-7xl pt-6 pb-12">
         {!hasAuthorFilter && (
           <BlogPageHeader title={t('title')} subtitle={t('subtitle')} />
         )}
diff --git a/frontend/app/[locale]/dashboard/page.tsx b/frontend/app/[locale]/dashboard/page.tsx
index 1153fc2d..3e5a23a3 100644
--- a/frontend/app/[locale]/dashboard/page.tsx
+++ b/frontend/app/[locale]/dashboard/page.tsx
@@ -1,14 +1,13 @@
-import { redirect } from '@/i18n/routing';
-import { Link } from '@/i18n/routing'
 import { getTranslations } from 'next-intl/server';
-import { getCurrentUser } from '@/lib/auth';
-import { getUserProfile } from '@/db/queries/users';
-import { getUserQuizStats } from '@/db/queries/quiz';
 
+import { PostAuthQuizSync } from '@/components/auth/PostAuthQuizSync';
 import { ProfileCard } from '@/components/dashboard/ProfileCard';
-import { StatsCard } from '@/components/dashboard/StatsCard';
 import { QuizSavedBanner } from '@/components/dashboard/QuizSavedBanner';
-import { PostAuthQuizSync } from "@/components/auth/PostAuthQuizSync";
+import { StatsCard } from '@/components/dashboard/StatsCard';
+import { getUserQuizStats } from '@/db/queries/quiz';
+import { getUserProfile } from '@/db/queries/users';
+import { redirect } from '@/i18n/routing';
+import { getCurrentUser } from '@/lib/auth';
 
 export async function generateMetadata({
   params,
@@ -24,13 +23,23 @@ export async function generateMetadata({
   };
 }
 
-export default async function DashboardPage({ params }: { params: Promise<{ locale: string }> }) {
+export default async function DashboardPage({
+  params,
+}: {
+  params: Promise<{ locale: string }>;
+}) {
   const session = await getCurrentUser();
   const { locale } = await params;
-  if (!session) { redirect({ href: '/login', locale }); return; }
+  if (!session) {
+    redirect({ href: '/login', locale });
+    return;
+  }
 
   const user = await getUserProfile(session.id);
-  if (!user) { redirect({ href: '/login', locale }); return; }
+  if (!user) {
+    redirect({ href: '/login', locale });
+    return;
+  }
 
   const t = await getTranslations('dashboard');
 
@@ -41,9 +50,9 @@ export default async function DashboardPage({ params }: { params: Promise<{ loca
   const averageScore =
     totalAttempts > 0
       ? Math.round(
-        attempts.reduce((acc, curr) => acc + Number(curr.percentage), 0) /
-        totalAttempts
-      )
+          attempts.reduce((acc, curr) => acc + Number(curr.percentage), 0) /
+            totalAttempts
+        )
       : 0;
 
   const lastActiveDate =
@@ -72,24 +81,24 @@ export default async function DashboardPage({ params }: { params: Promise<{ loca
     <main className="relative min-h-[calc(100vh-80px)] overflow-hidden">
       <PostAuthQuizSync />
       <div
-        className="absolute inset-0 pointer-events-none -z-10"
+        className="pointer-events-none absolute inset-0 -z-10"
         aria-hidden="true"
       >
-        <div className="absolute inset-0 bg-gradient-to-b from-sky-50 via-white to-rose-50 dark:from-slate-950 dark:via-slate-950 dark:to-black" />
-        <div className="absolute top-0 left-1/4 h-96 w-[36rem] -translate-x-1/2 rounded-full bg-sky-300/20 blur-3xl dark:bg-sky-500/10" />
-        <div className="absolute bottom-0 right-0 h-[26rem] w-[26rem] rounded-full bg-violet-300/30 blur-3xl dark:bg-violet-500/10" />
-        <div className="absolute bottom-10 left-10 h-[20rem] w-[20rem] rounded-full bg-pink-300/20 blur-3xl dark:bg-fuchsia-500/10" />
+        <div className="absolute inset-0 bg-linear-to-b from-sky-50 via-white to-rose-50 dark:from-slate-950 dark:via-slate-950 dark:to-black" />
+        <div className="absolute top-0 left-1/4 h-96 w-xl -translate-x-1/2 rounded-full bg-sky-300/20 blur-3xl dark:bg-sky-500/10" />
+        <div className="absolute right-0 bottom-0 h-104 w-104 rounded-full bg-violet-300/30 blur-3xl dark:bg-violet-500/10" />
+        <div className="absolute bottom-10 left-10 h-80 w-[20rem] rounded-full bg-pink-300/20 blur-3xl dark:bg-fuchsia-500/10" />
       </div>
 
-      <div className="relative z-10 max-w-5xl mx-auto py-12 px-6">
-        <header className="flex flex-col md:flex-row md:items-center justify-between mb-12 gap-6">
+      <div className="relative z-10 mx-auto max-w-5xl px-6 py-12">
+        <header className="mb-12 flex flex-col justify-between gap-6 md:flex-row md:items-center">
           <div>
-            <h1 className="text-4xl md:text-5xl font-black tracking-tight drop-shadow-sm">
-              <span className="bg-gradient-to-r from-sky-400 via-violet-400 to-pink-400 dark:from-sky-400 dark:via-indigo-400 dark:to-fuchsia-500 bg-clip-text text-transparent">
+            <h1 className="text-4xl font-black tracking-tight drop-shadow-sm md:text-5xl">
+              <span className="bg-linear-to-r from-sky-400 via-violet-400 to-pink-400 bg-clip-text text-transparent dark:from-sky-400 dark:via-indigo-400 dark:to-fuchsia-500">
                 {t('title')}
               </span>
             </h1>
-            <p className="mt-2 text-slate-600 dark:text-slate-400 text-lg">
+            <p className="mt-2 text-lg text-slate-600 dark:text-slate-400">
               {t('subtitle')}
             </p>
           </div>
diff --git a/frontend/app/[locale]/forgot-password/page.tsx b/frontend/app/[locale]/forgot-password/page.tsx
index 90be6e32..125d4f1d 100644
--- a/frontend/app/[locale]/forgot-password/page.tsx
+++ b/frontend/app/[locale]/forgot-password/page.tsx
@@ -1,7 +1,7 @@
-"use client";
+'use client';
 
-import { ForgotPasswordForm } from "@/components/auth/ForgotPasswordForm";
+import { ForgotPasswordForm } from '@/components/auth/ForgotPasswordForm';
 
 export default function ForgotPasswordPage() {
-    return <ForgotPasswordForm />;
-}
\ No newline at end of file
+  return <ForgotPasswordForm />;
+}
diff --git a/frontend/app/[locale]/layout.tsx b/frontend/app/[locale]/layout.tsx
index dddb6391..cd9cafba 100644
--- a/frontend/app/[locale]/layout.tsx
+++ b/frontend/app/[locale]/layout.tsx
@@ -1,21 +1,19 @@
-import type React from 'react';
-import { Toaster } from 'sonner';
+import groq from 'groq';
+import { notFound } from 'next/navigation';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages } from 'next-intl/server';
-import { notFound } from 'next/navigation';
-import groq from 'groq';
+import type React from 'react';
+import { Toaster } from 'sonner';
 
-import { locales } from '@/i18n/config';
-import Footer from '@/components/shared/Footer';
-import { ThemeProvider } from '@/components/theme/ThemeProvider';
-import { getCurrentUser } from '@/lib/auth';
 import { client } from '@/client';
-
-import { MainSwitcher } from '@/components/header/MainSwitcher';
 import { AppChrome } from '@/components/header/AppChrome';
-
+import { MainSwitcher } from '@/components/header/MainSwitcher';
 import { CookieBanner } from '@/components/shared/CookieBanner';
+import Footer from '@/components/shared/Footer';
 import { OnlineCounterPopup } from '@/components/shared/OnlineCounterPopup';
+import { ThemeProvider } from '@/components/theme/ThemeProvider';
+import { locales } from '@/i18n/config';
+import { getCurrentUser } from '@/lib/auth';
 
 export const dynamic = 'force-dynamic';
 
diff --git a/frontend/app/[locale]/leaderboard/page.tsx b/frontend/app/[locale]/leaderboard/page.tsx
index 2bde255c..06eccc66 100644
--- a/frontend/app/[locale]/leaderboard/page.tsx
+++ b/frontend/app/[locale]/leaderboard/page.tsx
@@ -1,7 +1,8 @@
-import { getLeaderboardData } from '@/db/queries/leaderboard';
+import { Metadata } from 'next';
+
 import LeaderboardClient from '@/components/leaderboard/LeaderboardClient';
+import { getLeaderboardData } from '@/db/queries/leaderboard';
 import { getCurrentUser } from '@/lib/auth';
-import { Metadata } from 'next';
 
 export const metadata: Metadata = {
   title: 'Leaderboard | DevLovers',
diff --git a/frontend/app/[locale]/login/page.tsx b/frontend/app/[locale]/login/page.tsx
index 0f3509c6..f8cea2ed 100644
--- a/frontend/app/[locale]/login/page.tsx
+++ b/frontend/app/[locale]/login/page.tsx
@@ -1,22 +1,16 @@
-"use client";
+'use client';
 
-import { useLocale } from "next-intl";
-import { useSearchParams } from "next/navigation";
-import { LoginForm } from "@/components/auth/LoginForm";
-import { getSafeRedirect } from "@/lib/auth/safe-redirect";
+import { useSearchParams } from 'next/navigation';
+import { useLocale } from 'next-intl';
+
+import { LoginForm } from '@/components/auth/LoginForm';
+import { getSafeRedirect } from '@/lib/auth/safe-redirect';
 
 export default function LoginPage() {
   const locale = useLocale();
   const searchParams = useSearchParams();
 
-  const returnTo = getSafeRedirect(
-    searchParams.get("returnTo")
-  );
+  const returnTo = getSafeRedirect(searchParams.get('returnTo'));
 
-  return (
-    <LoginForm
-      locale={locale}
-      returnTo={returnTo}
-    />
-  );
-}
\ No newline at end of file
+  return <LoginForm locale={locale} returnTo={returnTo} />;
+}
diff --git a/frontend/app/[locale]/page.tsx b/frontend/app/[locale]/page.tsx
index 072e55c3..06fa98a6 100644
--- a/frontend/app/[locale]/page.tsx
+++ b/frontend/app/[locale]/page.tsx
@@ -1,4 +1,5 @@
 import { getTranslations } from 'next-intl/server';
+
 import HeroSection from '@/components/home/HeroSection';
 
 export async function generateMetadata({
diff --git a/frontend/app/[locale]/privacy-policy/page.tsx b/frontend/app/[locale]/privacy-policy/page.tsx
index c717baf8..05f74f57 100644
--- a/frontend/app/[locale]/privacy-policy/page.tsx
+++ b/frontend/app/[locale]/privacy-policy/page.tsx
@@ -1,4 +1,5 @@
 import { getTranslations } from 'next-intl/server';
+
 import LegalPageShell from '@/components/legal/LegalPageShell';
 import PrivacyPolicyContent, {
   PRIVACY_LAST_UPDATED,
diff --git a/frontend/app/[locale]/q&a/page.tsx b/frontend/app/[locale]/q&a/page.tsx
index 935361cb..69513907 100644
--- a/frontend/app/[locale]/q&a/page.tsx
+++ b/frontend/app/[locale]/q&a/page.tsx
@@ -1,5 +1,6 @@
-import { Suspense } from 'react';
 import { getTranslations } from 'next-intl/server';
+import { Suspense } from 'react';
+
 import QaSection from '@/components/q&a/QaSection';
 import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
 
@@ -26,16 +27,14 @@ export default async function QAPage({
   const t = await getTranslations({ locale, namespace: 'qa' });
 
   return (
-    <DynamicGridBackground className="bg-gray-50 transition-colors duration-300 dark:bg-transparent py-10">
+    <DynamicGridBackground className="bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
       <main className="relative z-10 mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
         <div className="mb-8">
-          <p className="text-sm text-[var(--accent-primary)] font-semibold">
+          <p className="text-sm font-semibold text-(--accent-primary)">
             {t('pretitle')}
           </p>
           <h1 className="text-3xl font-bold">{t('title')}</h1>
-          <p className="text-gray-600 dark:text-gray-400">
-            {t('subtitle')}
-          </p>
+          <p className="text-gray-600 dark:text-gray-400">{t('subtitle')}</p>
         </div>
         <Suspense fallback={<>...</>}>
           <QaSection />
diff --git a/frontend/app/[locale]/quiz/[slug]/page.tsx b/frontend/app/[locale]/quiz/[slug]/page.tsx
index 87f32baf..092ccc0d 100644
--- a/frontend/app/[locale]/quiz/[slug]/page.tsx
+++ b/frontend/app/[locale]/quiz/[slug]/page.tsx
@@ -1,19 +1,20 @@
-import { createEncryptedAnswersBlob } from '@/lib/quiz/quiz-crypto';
-import { stripCorrectAnswers } from '@/db/queries/quiz';
-import { getQuizBySlug, getQuizQuestionsRandomized } from '@/db/queries/quiz';
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
-import { QuizContainer } from '@/components/quiz/QuizContainer';
-import { PendingResultHandler } from '@/components/quiz/PendingResultHandler';
 
+import { QuizContainer } from '@/components/quiz/QuizContainer';
+import { stripCorrectAnswers } from '@/db/queries/quiz';
+import { getQuizBySlug, getQuizQuestionsRandomized } from '@/db/queries/quiz';
 import { getCurrentUser } from '@/lib/auth';
 
 interface QuizPageProps {
   params: Promise<{ locale: string; slug: string }>;
-  searchParams: Promise<{seed?: string}>;
+  searchParams: Promise<{ seed?: string }>;
 }
 
-export default async function QuizPage({ params, searchParams }: QuizPageProps) {
+export default async function QuizPage({
+  params,
+  searchParams,
+}: QuizPageProps) {
   const { locale, slug } = await params;
   const t = await getTranslations({ locale, namespace: 'quiz.page' });
   const { seed: seedParam } = await searchParams;
@@ -26,15 +27,24 @@ export default async function QuizPage({ params, searchParams }: QuizPageProps)
     notFound();
   }
 
-  const seed = seedParam ? parseInt(seedParam, 10) : Date.now();
+  if (!seedParam) {
+    // eslint-disable-next-line react-hooks/purity -- redirect throws, value never used in render
+    redirect(`/${locale}/quiz/${slug}?seed=${Date.now()}`);
+  }
+
+  const seed = Number.parseInt(seedParam, 10);
+  if (Number.isNaN(seed)) {
+     // eslint-disable-next-line react-hooks/purity -- redirect throws, value never used in render
+    redirect(`/${locale}/quiz/${slug}?seed=${Date.now()}`);
+  }
+  
   const questions = await getQuizQuestionsRandomized(quiz.id, locale, seed);
 
-  const encryptedAnswers = createEncryptedAnswersBlob(questions);
   const clientQuestions = stripCorrectAnswers(questions);
 
   if (!questions.length) {
     return (
-      <div className="min-h-screen flex items-center justify-center">
+      <div className="flex min-h-screen items-center justify-center">
         <p className="text-gray-600">{t('noQuestions')}</p>
       </div>
     );
@@ -42,9 +52,9 @@ export default async function QuizPage({ params, searchParams }: QuizPageProps)
 
   return (
     <div className="min-h-screen bg-white dark:bg-black">
-      <div className="max-w-3xl mx-auto px-4 py-8">
+      <div className="mx-auto max-w-3xl px-4 py-8">
         <div className="mb-8">
-          <h1 className="text-3xl font-bold text-gray-900 dark:text-gray-100 mb-2">
+          <h1 className="mb-2 text-3xl font-bold text-gray-900 dark:text-gray-100">
             {quiz.title}
           </h1>
           {quiz.description && (
@@ -53,9 +63,15 @@ export default async function QuizPage({ params, searchParams }: QuizPageProps)
             </p>
           )}
           <div className="mt-4 flex gap-4 text-sm text-gray-500">
-            <span>{t('questionsLabel')}: {quiz.questionsCount}</span>
             <span>
-              {t('timeLabel')}: {Math.floor((quiz.timeLimitSeconds ?? questions.length * 30) / 60)} {t('minutes')}
+              {t('questionsLabel')}: {quiz.questionsCount}
+            </span>
+            <span>
+              {t('timeLabel')}:{' '}
+              {Math.floor(
+                (quiz.timeLimitSeconds ?? questions.length * 30) / 60
+              )}{' '}
+              {t('minutes')}
             </span>
           </div>
         </div>
@@ -64,13 +80,11 @@ export default async function QuizPage({ params, searchParams }: QuizPageProps)
           quizSlug={slug}
           quizId={quiz.id}
           questions={clientQuestions}
-          encryptedAnswers={encryptedAnswers}
           userId={user?.id ?? null}
           timeLimitSeconds={quiz.timeLimitSeconds ?? questions.length * 30}
           seed={seed}
-          categorySlug={quiz.categorySlug} 
+          categorySlug={quiz.categorySlug}
         />
-        {user && <PendingResultHandler userId={user.id} />}
       </div>
     </div>
   );
diff --git a/frontend/app/[locale]/quizzes/page.tsx b/frontend/app/[locale]/quizzes/page.tsx
index a060320b..1c49ac32 100644
--- a/frontend/app/[locale]/quizzes/page.tsx
+++ b/frontend/app/[locale]/quizzes/page.tsx
@@ -1,8 +1,9 @@
-import { getActiveQuizzes, getUserQuizzesProgress } from '@/db/queries/quiz';
-import { getCurrentUser } from '@/lib/auth';
 import { getTranslations } from 'next-intl/server';
+
 import QuizzesSection from '@/components/quiz/QuizzesSection';
 import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
+import { getActiveQuizzes, getUserQuizzesProgress } from '@/db/queries/quiz';
+import { getCurrentUser } from '@/lib/auth';
 
 type PageProps = { params: Promise<{ locale: string }> };
 
@@ -24,30 +25,26 @@ export default async function QuizzesPage({ params }: PageProps) {
 
   if (!quizzes.length) {
     return (
-      <div className="mx-auto max-w-7xl py-12 px-4 sm:px-6 lg:px-8">
-        <h1 className="text-3xl font-bold mb-4">{t('title')}</h1>
-        <p className="text-gray-600 dark:text-gray-400">
-          {t('noQuizzes')}
-        </p>
+      <div className="mx-auto max-w-7xl px-4 py-12 sm:px-6 lg:px-8">
+        <h1 className="mb-4 text-3xl font-bold">{t('title')}</h1>
+        <p className="text-gray-600 dark:text-gray-400">{t('noQuizzes')}</p>
       </div>
     );
   }
 
   return (
-    <DynamicGridBackground className="min-h-screen bg-gray-50 transition-colors duration-300 dark:bg-transparent py-10">
-  <main className="relative z-10 mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
-      <div className="mb-8">
-        <p className="text-sm text-[var(--accent-primary)] font-semibold">
-          {t('practice')}
-        </p>
-        <h1 className="text-3xl font-bold">{t('title')}</h1>
-        <p className="text-gray-600 dark:text-gray-400">
-          {t('subtitle')}
-        </p>
-      </div>
-
-      <QuizzesSection quizzes={quizzes} userProgressMap={userProgressMap} />
-    </main>
-</DynamicGridBackground>
+    <DynamicGridBackground className="min-h-screen bg-gray-50 py-10 transition-colors duration-300 dark:bg-transparent">
+      <main className="relative z-10 mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
+        <div className="mb-8">
+          <p className="text-sm font-semibold text-(--accent-primary)">
+            {t('practice')}
+          </p>
+          <h1 className="text-3xl font-bold">{t('title')}</h1>
+          <p className="text-gray-600 dark:text-gray-400">{t('subtitle')}</p>
+        </div>
+
+        <QuizzesSection quizzes={quizzes} userProgressMap={userProgressMap} />
+      </main>
+    </DynamicGridBackground>
   );
 }
diff --git a/frontend/app/[locale]/reset-password/page.tsx b/frontend/app/[locale]/reset-password/page.tsx
index a9cfbb79..068942ed 100644
--- a/frontend/app/[locale]/reset-password/page.tsx
+++ b/frontend/app/[locale]/reset-password/page.tsx
@@ -1,11 +1,12 @@
-"use client";
+'use client';
 
-import { useSearchParams } from "next/navigation";
-import { ResetPasswordForm } from "@/components/auth/ResetPasswordForm";
+import { useSearchParams } from 'next/navigation';
+
+import { ResetPasswordForm } from '@/components/auth/ResetPasswordForm';
 
 export default function ResetPasswordPage() {
-    const searchParams = useSearchParams();
-    const token = searchParams.get("token") ?? "";
+  const searchParams = useSearchParams();
+  const token = searchParams.get('token') ?? '';
 
-    return <ResetPasswordForm token={token} />;
-}
\ No newline at end of file
+  return <ResetPasswordForm token={token} />;
+}
diff --git a/frontend/app/[locale]/shop/admin/orders/[id]/RefundButton.tsx b/frontend/app/[locale]/shop/admin/orders/[id]/RefundButton.tsx
index 1f00101b..52cfe22a 100644
--- a/frontend/app/[locale]/shop/admin/orders/[id]/RefundButton.tsx
+++ b/frontend/app/[locale]/shop/admin/orders/[id]/RefundButton.tsx
@@ -1,8 +1,8 @@
 'use client';
 
 import { useRouter } from 'next/navigation';
-import { useId, useState, useTransition } from 'react';
 import { useTranslations } from 'next-intl';
+import { useId, useState, useTransition } from 'react';
 
 type Props = {
   orderId: string;
@@ -60,14 +60,14 @@ export function RefundButton({ orderId, disabled }: Props) {
         disabled={isDisabled}
         aria-busy={isPending}
         aria-describedby={error ? errorId : undefined}
-        className="rounded-md border border-border px-3 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-secondary disabled:cursor-not-allowed disabled:opacity-50"
+        className="border-border text-foreground hover:bg-secondary rounded-md border px-3 py-1.5 text-sm font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50"
         title={disabled ? t('onlyForPaid') : undefined}
       >
         {isPending ? t('refunding') : t('refund')}
       </button>
 
       {error ? (
-        <span id={errorId} role="alert" className="text-xs text-destructive">
+        <span id={errorId} role="alert" className="text-destructive text-xs">
           {error}
         </span>
       ) : null}
diff --git a/frontend/app/[locale]/shop/admin/orders/[id]/page.tsx b/frontend/app/[locale]/shop/admin/orders/[id]/page.tsx
index af75a718..c64f58d5 100644
--- a/frontend/app/[locale]/shop/admin/orders/[id]/page.tsx
+++ b/frontend/app/[locale]/shop/admin/orders/[id]/page.tsx
@@ -1,18 +1,18 @@
+import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
 
-import { Link } from '@/i18n/routing';
-import { RefundButton } from './RefundButton';
-
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
 import { getAdminOrderDetail } from '@/db/queries/shop/admin-orders';
+import { Link } from '@/i18n/routing';
+import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
 import {
+  type CurrencyCode,
   formatMoney,
   resolveCurrencyFromLocale,
-  type CurrencyCode,
 } from '@/lib/shop/currency';
 import { fromDbMoney } from '@/lib/shop/money';
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
-import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
-import { Metadata } from 'next';
+
+import { RefundButton } from './RefundButton';
 
 export const metadata: Metadata = {
   title: 'Admin Order | DevLovers',
@@ -76,10 +76,10 @@ export default async function AdminOrderDetailPage({
       >
         <header className="flex items-start justify-between gap-4">
           <div className="min-w-0">
-            <h1 id="order-title" className="text-2xl font-bold text-foreground">
+            <h1 id="order-title" className="text-foreground text-2xl font-bold">
               Order
             </h1>
-            <p className="mt-1 font-mono text-xs text-muted-foreground break-all">
+            <p className="text-muted-foreground mt-1 font-mono text-xs break-all">
               {order.id}
             </p>
           </div>
@@ -87,7 +87,7 @@ export default async function AdminOrderDetailPage({
           <div className="flex shrink-0 flex-wrap items-center gap-2">
             <Link
               href="/shop/admin/orders"
-              className="rounded-md border border-border px-3 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-secondary"
+              className="border-border text-foreground hover:bg-secondary rounded-md border px-3 py-1.5 text-sm font-medium transition-colors"
             >
               Back
             </Link>
@@ -101,12 +101,12 @@ export default async function AdminOrderDetailPage({
           aria-label="Order details"
         >
           <article
-            className="rounded-lg border border-border p-4"
+            className="border-border rounded-lg border p-4"
             aria-labelledby="summary-title"
           >
             <h2
               id="summary-title"
-              className="text-sm font-semibold text-foreground"
+              className="text-foreground text-sm font-semibold"
             >
               Summary
             </h2>
@@ -129,14 +129,14 @@ export default async function AdminOrderDetailPage({
 
               <div className="flex justify-between gap-4">
                 <dt className="text-muted-foreground">Payment intent</dt>
-                <dd className="font-mono text-xs text-muted-foreground break-all">
+                <dd className="text-muted-foreground font-mono text-xs break-all">
                   {order.paymentIntentId ?? '-'}
                 </dd>
               </div>
 
               <div className="flex justify-between gap-4">
                 <dt className="text-muted-foreground">Idempotency key</dt>
-                <dd className="font-mono text-xs text-muted-foreground break-all">
+                <dd className="text-muted-foreground font-mono text-xs break-all">
                   {order.idempotencyKey}
                 </dd>
               </div>
@@ -144,12 +144,12 @@ export default async function AdminOrderDetailPage({
           </article>
 
           <article
-            className="rounded-lg border border-border p-4"
+            className="border-border rounded-lg border p-4"
             aria-labelledby="stock-title"
           >
             <h2
               id="stock-title"
-              className="text-sm font-semibold text-foreground"
+              className="text-foreground text-sm font-semibold"
             >
               Stock / timestamps
             </h2>
@@ -191,40 +191,40 @@ export default async function AdminOrderDetailPage({
             Order items
           </h2>
 
-          <div className="overflow-x-auto rounded-lg border border-border">
-            <table className="min-w-full divide-y divide-border text-sm">
+          <div className="border-border overflow-x-auto rounded-lg border">
+            <table className="divide-border min-w-full divide-y text-sm">
               <caption className="sr-only">Line items for this order</caption>
 
               <thead className="bg-muted/50">
                 <tr>
                   <th
                     scope="col"
-                    className="px-3 py-2 text-left font-semibold text-foreground"
+                    className="text-foreground px-3 py-2 text-left font-semibold"
                   >
                     Product
                   </th>
                   <th
                     scope="col"
-                    className="px-3 py-2 text-left font-semibold text-foreground"
+                    className="text-foreground px-3 py-2 text-left font-semibold"
                   >
                     Qty
                   </th>
                   <th
                     scope="col"
-                    className="px-3 py-2 text-left font-semibold text-foreground"
+                    className="text-foreground px-3 py-2 text-left font-semibold"
                   >
                     Unit
                   </th>
                   <th
                     scope="col"
-                    className="px-3 py-2 text-left font-semibold text-foreground"
+                    className="text-foreground px-3 py-2 text-left font-semibold"
                   >
                     Line total
                   </th>
                 </tr>
               </thead>
 
-              <tbody className="divide-y divide-border">
+              <tbody className="divide-border divide-y">
                 {order.items.map(item => {
                   const unitMinor = pickMinor(
                     item.unitPriceMinor,
@@ -248,10 +248,10 @@ export default async function AdminOrderDetailPage({
                   return (
                     <tr key={item.id} className="hover:bg-muted/50">
                       <td className="px-3 py-2">
-                        <div className="font-medium text-foreground">
+                        <div className="text-foreground font-medium">
                           {item.productTitle ?? '-'}
                         </div>
-                        <div className="text-xs text-muted-foreground">
+                        <div className="text-muted-foreground text-xs">
                           <span className="font-mono">
                             {item.productSlug ?? '-'}
                           </span>
@@ -261,15 +261,15 @@ export default async function AdminOrderDetailPage({
                         </div>
                       </td>
 
-                      <td className="px-3 py-2 text-muted-foreground">
+                      <td className="text-muted-foreground px-3 py-2">
                         {item.quantity}
                       </td>
 
-                      <td className="px-3 py-2 text-foreground">
+                      <td className="text-foreground px-3 py-2">
                         {unitFormatted}
                       </td>
 
-                      <td className="px-3 py-2 text-foreground">
+                      <td className="text-foreground px-3 py-2">
                         {lineFormatted}
                       </td>
                     </tr>
@@ -278,7 +278,7 @@ export default async function AdminOrderDetailPage({
 
                 {order.items.length === 0 ? (
                   <tr>
-                    <td className="px-3 py-6 text-muted-foreground" colSpan={4}>
+                    <td className="text-muted-foreground px-3 py-6" colSpan={4}>
                       No items found for this order.
                     </td>
                   </tr>
diff --git a/frontend/app/[locale]/shop/admin/orders/page.tsx b/frontend/app/[locale]/shop/admin/orders/page.tsx
index 460f55a6..2ba4a570 100644
--- a/frontend/app/[locale]/shop/admin/orders/page.tsx
+++ b/frontend/app/[locale]/shop/admin/orders/page.tsx
@@ -1,19 +1,19 @@
-import { Link } from '@/i18n/routing';
+import { Metadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 
+import { AdminPagination } from '@/components/shop/admin/AdminPagination';
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
 import { getAdminOrdersPage } from '@/db/queries/shop/admin-orders';
+import { Link } from '@/i18n/routing';
+import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
+import { parsePage } from '@/lib/pagination';
+import { CSRF_FORM_FIELD, issueCsrfToken } from '@/lib/security/csrf';
 import {
+  type CurrencyCode,
   formatMoney,
   resolveCurrencyFromLocale,
-  type CurrencyCode,
 } from '@/lib/shop/currency';
 import { fromDbMoney } from '@/lib/shop/money';
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
-import { AdminPagination } from '@/components/shop/admin/admin-pagination';
-import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
-import { CSRF_FORM_FIELD, issueCsrfToken } from '@/lib/security/csrf';
-import { parsePage } from '@/lib/pagination';
-import { Metadata } from 'next';
 
 export const metadata: Metadata = {
   title: 'Admin Orders | DevLovers',
@@ -96,7 +96,7 @@ export default async function AdminOrdersPage({
         <header className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
           <h1
             id="admin-orders-title"
-            className="text-2xl font-bold text-foreground"
+            className="text-foreground text-2xl font-bold"
           >
             {t('title')}
           </h1>
@@ -105,7 +105,7 @@ export default async function AdminOrdersPage({
             <input type="hidden" name={CSRF_FORM_FIELD} value={csrfToken} />
             <button
               type="submit"
-              className="inline-flex w-full items-center justify-center rounded-md border border-border px-3 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-secondary sm:w-auto"
+              className="border-border text-foreground hover:bg-secondary inline-flex w-full items-center justify-center rounded-md border px-3 py-1.5 text-sm font-medium transition-colors sm:w-auto"
             >
               {t('reconcileStale')}
             </button>
@@ -116,7 +116,7 @@ export default async function AdminOrdersPage({
           {/* Mobile cards */}
           <div className="md:hidden">
             {viewModels.length === 0 ? (
-              <div className="rounded-md border border-border p-4 text-sm text-muted-foreground">
+              <div className="border-border text-muted-foreground rounded-md border p-4 text-sm">
                 {t('empty')}
               </div>
             ) : (
@@ -124,21 +124,21 @@ export default async function AdminOrdersPage({
                 {viewModels.map(vm => (
                   <li
                     key={vm.id}
-                    className="rounded-lg border border-border bg-background p-4"
+                    className="border-border bg-background rounded-lg border p-4"
                   >
                     <div className="flex items-start justify-between gap-3">
                       <div className="min-w-0">
-                        <div className="text-xs text-muted-foreground">
+                        <div className="text-muted-foreground text-xs">
                           {vm.createdAt}
                         </div>
                         <div className="mt-1">
-                          <span className="inline-flex rounded-full bg-muted px-2 py-1 text-xs font-medium text-foreground">
+                          <span className="bg-muted text-foreground inline-flex rounded-full px-2 py-1 text-xs font-medium">
                             {vm.paymentStatus}
                           </span>
                         </div>
                       </div>
 
-                      <div className="shrink-0 whitespace-nowrap text-right text-sm font-medium text-foreground">
+                      <div className="text-foreground shrink-0 text-right text-sm font-medium whitespace-nowrap">
                         {vm.totalFormatted}
                       </div>
                     </div>
@@ -156,7 +156,7 @@ export default async function AdminOrdersPage({
                           {t('table.provider')}
                         </dt>
                         <dd
-                          className="truncate text-foreground"
+                          className="text-foreground truncate"
                           title={vm.paymentProvider}
                         >
                           {vm.paymentProvider}
@@ -168,7 +168,7 @@ export default async function AdminOrdersPage({
                           {t('table.orderId')}
                         </dt>
                         <dd
-                          className="break-all font-mono text-[11px] text-muted-foreground"
+                          className="text-muted-foreground font-mono text-[11px] break-all"
                           title={vm.id}
                         >
                           {vm.id}
@@ -179,7 +179,7 @@ export default async function AdminOrdersPage({
                     <div className="mt-3">
                       <Link
                         href={vm.viewHref}
-                        className="inline-flex items-center justify-center rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary"
+                        className="border-border text-foreground hover:bg-secondary inline-flex items-center justify-center rounded-md border px-2 py-1 text-xs font-medium transition-colors"
                         aria-label={vm.viewAriaLabel}
                       >
                         {t('actions.view')}
@@ -194,61 +194,61 @@ export default async function AdminOrdersPage({
           {/* Desktop table */}
           <div className="hidden md:block">
             <div className="overflow-x-auto">
-              <table className="min-w-full divide-y divide-border text-sm">
+              <table className="divide-border min-w-full divide-y text-sm">
                 <caption className="sr-only">{t('listCaption')}</caption>
 
                 <thead className="bg-muted/50">
                   <tr>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.created')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.status')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.total')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.items')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.provider')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.orderId')}
                     </th>
                     <th
                       scope="col"
-                      className="px-3 py-2 text-left font-semibold text-foreground"
+                      className="text-foreground px-3 py-2 text-left font-semibold"
                     >
                       {t('table.actions')}
                     </th>
                   </tr>
                 </thead>
 
-                <tbody className="divide-y divide-border">
+                <tbody className="divide-border divide-y">
                   {viewModels.length === 0 ? (
                     <tr>
                       <td
-                        className="px-3 py-6 text-muted-foreground"
+                        className="text-muted-foreground px-3 py-6"
                         colSpan={7}
                       >
                         {t('empty')}
@@ -257,36 +257,36 @@ export default async function AdminOrdersPage({
                   ) : (
                     viewModels.map(vm => (
                       <tr key={vm.id} className="hover:bg-muted/50">
-                        <td className="px-3 py-2 text-muted-foreground whitespace-nowrap">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {vm.createdAt}
                         </td>
 
                         <td className="px-3 py-2 whitespace-nowrap">
-                          <span className="inline-flex rounded-full bg-muted px-2 py-1 text-xs font-medium text-foreground">
+                          <span className="bg-muted text-foreground inline-flex rounded-full px-2 py-1 text-xs font-medium">
                             {vm.paymentStatus}
                           </span>
                         </td>
 
-                        <td className="px-3 py-2 text-foreground whitespace-nowrap">
+                        <td className="text-foreground px-3 py-2 whitespace-nowrap">
                           {vm.totalFormatted}
                         </td>
 
-                        <td className="px-3 py-2 text-muted-foreground whitespace-nowrap">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {vm.itemCount}
                         </td>
 
-                        <td className="px-3 py-2 text-muted-foreground whitespace-nowrap">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {vm.paymentProvider}
                         </td>
 
-                        <td className="px-3 py-2 font-mono text-xs text-muted-foreground break-all">
+                        <td className="text-muted-foreground px-3 py-2 font-mono text-xs break-all">
                           {vm.id}
                         </td>
 
                         <td className="px-3 py-2 whitespace-nowrap">
                           <Link
                             href={vm.viewHref}
-                            className="rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary"
+                            className="border-border text-foreground hover:bg-secondary rounded-md border px-2 py-1 text-xs font-medium transition-colors"
                             aria-label={vm.viewAriaLabel}
                           >
                             {t('actions.view')}
diff --git a/frontend/app/[locale]/shop/admin/page.tsx b/frontend/app/[locale]/shop/admin/page.tsx
index 4c8a3fb9..4b02af21 100644
--- a/frontend/app/[locale]/shop/admin/page.tsx
+++ b/frontend/app/[locale]/shop/admin/page.tsx
@@ -1,9 +1,9 @@
-import { Link } from '@/i18n/routing';
+import { Metadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
+import { Link } from '@/i18n/routing';
 import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
-import { Metadata } from 'next';
 
 export const metadata: Metadata = {
   title: 'Shop Admin | DevLovers',
@@ -27,11 +27,11 @@ export default async function ShopAdminHomePage() {
         <header>
           <h1
             id="shop-admin-title"
-            className="text-2xl font-bold text-foreground"
+            className="text-foreground text-2xl font-bold"
           >
             {t('title')}
           </h1>
-          <p className="mt-2 text-sm text-muted-foreground">
+          <p className="text-muted-foreground mt-2 text-sm">
             {t('description')}
           </p>
         </header>
@@ -41,12 +41,12 @@ export default async function ShopAdminHomePage() {
             <li>
               <Link
                 href="/shop/admin/products"
-                className="block rounded-lg border border-border p-4 transition-colors hover:bg-muted/50"
+                className="border-border hover:bg-muted/50 block rounded-lg border p-4 transition-colors"
               >
-                <div className="text-base font-semibold text-foreground">
+                <div className="text-foreground text-base font-semibold">
                   {t('productsSection.title')}
                 </div>
-                <div className="mt-1 text-sm text-muted-foreground">
+                <div className="text-muted-foreground mt-1 text-sm">
                   {t('productsSection.description')}
                 </div>
               </Link>
@@ -55,12 +55,12 @@ export default async function ShopAdminHomePage() {
             <li>
               <Link
                 href="/shop/admin/orders"
-                className="block rounded-lg border border-border p-4 transition-colors hover:bg-muted/50"
+                className="border-border hover:bg-muted/50 block rounded-lg border p-4 transition-colors"
               >
-                <div className="text-base font-semibold text-foreground">
+                <div className="text-foreground text-base font-semibold">
                   {t('ordersSection.title')}
                 </div>
-                <div className="mt-1 text-sm text-muted-foreground">
+                <div className="text-muted-foreground mt-1 text-sm">
                   {t('ordersSection.description')}
                 </div>
               </Link>
diff --git a/frontend/app/[locale]/shop/admin/products/[id]/edit/page.tsx b/frontend/app/[locale]/shop/admin/products/[id]/edit/page.tsx
index 32c71ae8..8d51f7c9 100644
--- a/frontend/app/[locale]/shop/admin/products/[id]/edit/page.tsx
+++ b/frontend/app/[locale]/shop/admin/products/[id]/edit/page.tsx
@@ -1,24 +1,23 @@
-import { notFound } from 'next/navigation';
 import { eq } from 'drizzle-orm';
+import { Metadata } from 'next';
+import { notFound } from 'next/navigation';
 import { z } from 'zod';
 
-import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
-
-import { ProductForm } from '../../_components/product-form';
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
+import { productPrices, products } from '@/db/schema';
+import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
+import { issueCsrfToken } from '@/lib/security/csrf';
 import type { CurrencyCode } from '@/lib/shop/currency';
 import { currencyValues } from '@/lib/shop/currency';
-import { issueCsrfToken } from '@/lib/security/csrf';
-import { Metadata } from 'next';
+
+import { ProductForm } from '../../_components/ProductForm';
 
 export const metadata: Metadata = {
   title: 'Edit Product | DevLovers',
   description: 'Edit an existing product in the DevLovers shop catalog.',
 };
 
-
 export const dynamic = 'force-dynamic';
 
 const paramsSchema = z.object({ id: z.string().uuid() });
diff --git a/frontend/app/[locale]/shop/admin/products/_components/product-form.tsx b/frontend/app/[locale]/shop/admin/products/_components/ProductForm.tsx
similarity index 88%
rename from frontend/app/[locale]/shop/admin/products/_components/product-form.tsx
rename to frontend/app/[locale]/shop/admin/products/_components/ProductForm.tsx
index 050dcdc1..6f413ac4 100644
--- a/frontend/app/[locale]/shop/admin/products/_components/product-form.tsx
+++ b/frontend/app/[locale]/shop/admin/products/_components/ProductForm.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import { useEffect, useMemo, useRef, useState } from 'react';
 import { useRouter } from 'next/navigation';
+import { useEffect, useMemo, useRef, useState } from 'react';
 
 import { CATEGORIES, COLORS, PRODUCT_TYPES, SIZES } from '@/lib/config/catalog';
-import type { ProductAdminInput } from '@/lib/validation/shop';
 import { logError } from '@/lib/logging';
+import type { ProductAdminInput } from '@/lib/validation/shop';
 
 const localSlugify = (input: string): string => {
   return input
@@ -460,7 +460,7 @@ export function ProductForm({
       aria-labelledby={headingId}
     >
       <header>
-        <h1 id={headingId} className="text-2xl font-bold text-foreground">
+        <h1 id={headingId} className="text-foreground text-2xl font-bold">
           {mode === 'create' ? 'Create new product' : 'Edit product'}
         </h1>
       </header>
@@ -485,7 +485,7 @@ export function ProductForm({
         <section className="grid gap-4 sm:grid-cols-2" aria-label="Basic info">
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="title"
             >
               Title
@@ -493,7 +493,7 @@ export function ProductForm({
             <input
               id="title"
               name="title"
-              className="w-full rounded-md border border-border px-3 py-2 text-sm"
+              className="border-border w-full rounded-md border px-3 py-2 text-sm"
               type="text"
               value={title}
               onChange={event => setTitle(event.target.value)}
@@ -504,19 +504,19 @@ export function ProductForm({
           <div>
             <div className="flex items-center justify-between">
               <label
-                className="block text-sm font-medium text-foreground"
+                className="text-foreground block text-sm font-medium"
                 htmlFor="slug"
               >
                 Slug
               </label>
-              <span id={slugHelpId} className="text-xs text-muted-foreground">
+              <span id={slugHelpId} className="text-muted-foreground text-xs">
                 Auto-generated from title
               </span>
             </div>
             <input
               id="slug"
               name="slug"
-              className="w-full rounded-md border border-border bg-muted px-3 py-2 text-sm"
+              className="border-border bg-muted w-full rounded-md border px-3 py-2 text-sm"
               type="text"
               value={slugValue}
               readOnly
@@ -536,20 +536,20 @@ export function ProductForm({
           </div>
         </section>
 
-        <fieldset className="rounded-md border border-border p-3">
-          <legend className="px-1 text-sm font-semibold text-foreground">
+        <fieldset className="border-border rounded-md border p-3">
+          <legend className="text-foreground px-1 text-sm font-semibold">
             Prices
           </legend>
 
           <div className="mt-3 grid gap-4 sm:grid-cols-2">
             <fieldset className="space-y-2">
-              <legend className="text-xs font-medium text-muted-foreground">
+              <legend className="text-muted-foreground text-xs font-medium">
                 USD (required)
               </legend>
 
               <div>
                 <label
-                  className="block text-sm font-medium text-foreground"
+                  className="text-foreground block text-sm font-medium"
                   htmlFor="price-usd"
                 >
                   Price (USD)
@@ -557,7 +557,7 @@ export function ProductForm({
                 <input
                   id="price-usd"
                   name="price-usd"
-                  className="w-full rounded-md border border-border px-3 py-2 text-sm"
+                  className="border-border w-full rounded-md border px-3 py-2 text-sm"
                   type="text"
                   inputMode="decimal"
                   placeholder="59.00"
@@ -569,7 +569,7 @@ export function ProductForm({
 
               <div>
                 <label
-                  className="block text-sm font-medium text-foreground"
+                  className="text-foreground block text-sm font-medium"
                   htmlFor="original-usd"
                 >
                   Original price (USD)
@@ -605,13 +605,13 @@ export function ProductForm({
             </fieldset>
 
             <fieldset className="space-y-2">
-              <legend className="text-xs font-medium text-muted-foreground">
+              <legend className="text-muted-foreground text-xs font-medium">
                 UAH (optional)
               </legend>
 
               <div>
                 <label
-                  className="block text-sm font-medium text-foreground"
+                  className="text-foreground block text-sm font-medium"
                   htmlFor="price-uah"
                 >
                   Price (UAH)
@@ -619,7 +619,7 @@ export function ProductForm({
                 <input
                   id="price-uah"
                   name="price-uah"
-                  className="w-full rounded-md border border-border px-3 py-2 text-sm"
+                  className="border-border w-full rounded-md border px-3 py-2 text-sm"
                   type="text"
                   inputMode="decimal"
                   placeholder="1999.00"
@@ -630,7 +630,7 @@ export function ProductForm({
 
               <div>
                 <label
-                  className="block text-sm font-medium text-foreground"
+                  className="text-foreground block text-sm font-medium"
                   htmlFor="original-uah"
                 >
                   Original price (UAH)
@@ -666,7 +666,7 @@ export function ProductForm({
             </fieldset>
           </div>
 
-          <p className="mt-3 text-xs text-muted-foreground">
+          <p className="text-muted-foreground mt-3 text-xs">
             Checkout currency is server-selected by locale. Prices must exist in{' '}
             <span className="font-mono">product_prices</span> for that currency,
             or checkout fails.
@@ -679,7 +679,7 @@ export function ProductForm({
         >
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="stock"
             >
               Stock
@@ -687,7 +687,7 @@ export function ProductForm({
             <input
               id="stock"
               name="stock"
-              className="w-full rounded-md border border-border px-3 py-2 text-sm"
+              className="border-border w-full rounded-md border px-3 py-2 text-sm"
               type="number"
               value={stock}
               onChange={event => setStock(event.target.value)}
@@ -698,7 +698,7 @@ export function ProductForm({
 
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="sku"
             >
               SKU
@@ -706,7 +706,7 @@ export function ProductForm({
             <input
               id="sku"
               name="sku"
-              className="w-full rounded-md border border-border px-3 py-2 text-sm"
+              className="border-border w-full rounded-md border px-3 py-2 text-sm"
               type="text"
               value={sku}
               onChange={event => setSku(event.target.value)}
@@ -720,7 +720,7 @@ export function ProductForm({
         >
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="category"
             >
               Category
@@ -728,7 +728,7 @@ export function ProductForm({
             <select
               id="category"
               name="category"
-              className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm text-foreground focus:outline-none focus:ring-2 focus:ring-accent"
+              className="border-border bg-background text-foreground focus:ring-accent w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
               value={category}
               onChange={event => setCategory(event.target.value)}
             >
@@ -745,7 +745,7 @@ export function ProductForm({
 
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="type"
             >
               Type
@@ -753,7 +753,7 @@ export function ProductForm({
             <select
               id="type"
               name="type"
-              className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm text-foreground focus:outline-none focus:ring-2 focus:ring-accent"
+              className="border-border bg-background text-foreground focus:ring-accent w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
               value={type}
               onChange={event => setType(event.target.value)}
             >
@@ -769,14 +769,14 @@ export function ProductForm({
 
         <section className="grid gap-4 sm:grid-cols-2" aria-label="Variants">
           <fieldset>
-            <legend className="block text-sm font-medium text-foreground">
+            <legend className="text-foreground block text-sm font-medium">
               Colors
             </legend>
-            <div className="mt-2 flex flex-col gap-2 rounded-md border border-border px-3 py-2">
+            <div className="border-border mt-2 flex flex-col gap-2 rounded-md border px-3 py-2">
               {COLORS.map(color => (
                 <label
                   key={color.slug}
-                  className="flex items-center gap-2 text-sm text-foreground"
+                  className="text-foreground flex items-center gap-2 text-sm"
                 >
                   <input
                     type="checkbox"
@@ -801,14 +801,14 @@ export function ProductForm({
           </fieldset>
 
           <fieldset>
-            <legend className="block text-sm font-medium text-foreground">
+            <legend className="text-foreground block text-sm font-medium">
               Sizes
             </legend>
-            <div className="mt-2 flex flex-col gap-2 rounded-md border border-border px-3 py-2">
+            <div className="border-border mt-2 flex flex-col gap-2 rounded-md border px-3 py-2">
               {SIZES.map(size => (
                 <label
                   key={size}
-                  className="flex items-center gap-2 text-sm text-foreground"
+                  className="text-foreground flex items-center gap-2 text-sm"
                 >
                   <input
                     type="checkbox"
@@ -837,7 +837,7 @@ export function ProductForm({
         >
           <div>
             <label
-              className="block text-sm font-medium text-foreground"
+              className="text-foreground block text-sm font-medium"
               htmlFor="badge"
             >
               Badge
@@ -845,7 +845,7 @@ export function ProductForm({
             <select
               id="badge"
               name="badge"
-              className="w-full rounded-md border border-border bg-background px-3 py-2 text-sm text-foreground focus:outline-none focus:ring-2 focus:ring-accent"
+              className="border-border bg-background text-foreground focus:ring-accent w-full rounded-md border px-3 py-2 text-sm focus:ring-2 focus:outline-none"
               value={badge}
               onChange={event => {
                 const next = event.target.value as ProductAdminInput['badge'];
@@ -870,10 +870,10 @@ export function ProductForm({
                 type="checkbox"
                 checked={isActive}
                 onChange={event => setIsActive(event.target.checked)}
-                className="h-4 w-4 rounded border-border text-accent focus:ring-accent"
+                className="border-border text-accent focus:ring-accent h-4 w-4 rounded"
               />
               <label
-                className="text-sm font-medium text-foreground"
+                className="text-foreground text-sm font-medium"
                 htmlFor="isActive"
               >
                 Is Active
@@ -887,10 +887,10 @@ export function ProductForm({
                 type="checkbox"
                 checked={isFeatured}
                 onChange={event => setIsFeatured(event.target.checked)}
-                className="h-4 w-4 rounded border-border text-accent focus:ring-accent"
+                className="border-border text-accent focus:ring-accent h-4 w-4 rounded"
               />
               <label
-                className="text-sm font-medium text-foreground"
+                className="text-foreground text-sm font-medium"
                 htmlFor="isFeatured"
               >
                 Is Featured
@@ -901,7 +901,7 @@ export function ProductForm({
 
         <section aria-label="Description">
           <label
-            className="block text-sm font-medium text-foreground"
+            className="text-foreground block text-sm font-medium"
             htmlFor="description"
           >
             Description
@@ -909,7 +909,7 @@ export function ProductForm({
           <textarea
             id="description"
             name="description"
-            className="w-full rounded-md border border-border px-3 py-2 text-sm"
+            className="border-border w-full rounded-md border px-3 py-2 text-sm"
             rows={4}
             value={description}
             onChange={event => setDescription(event.target.value)}
@@ -918,7 +918,7 @@ export function ProductForm({
 
         <section aria-label="Image upload">
           <label
-            className="block text-sm font-medium text-foreground"
+            className="text-foreground block text-sm font-medium"
             htmlFor="image"
           >
             Image
@@ -926,7 +926,7 @@ export function ProductForm({
           <input
             id="image"
             name="image"
-            className="w-full rounded-md border border-border px-3 py-2 text-sm"
+            className="border-border w-full rounded-md border px-3 py-2 text-sm"
             type="file"
             accept="image/*"
             onChange={handleImageChange}
@@ -935,7 +935,7 @@ export function ProductForm({
             aria-describedby={imageError ? imageErrorId : undefined}
           />
           {existingImageUrl && !imageFile ? (
-            <p className="mt-2 text-sm text-muted-foreground">
+            <p className="text-muted-foreground mt-2 text-sm">
               Current image will be kept unless you upload a new one.
             </p>
           ) : null}
@@ -952,7 +952,7 @@ export function ProductForm({
 
         <button
           type="submit"
-          className="mt-6 w-full rounded-md bg-accent px-4 py-2 text-sm font-semibold text-accent-foreground transition-colors hover:bg-accent/90 disabled:opacity-60"
+          className="bg-accent text-accent-foreground hover:bg-accent/90 mt-6 w-full rounded-md px-4 py-2 text-sm font-semibold transition-colors disabled:opacity-60"
           disabled={isSubmitting}
           aria-disabled={isSubmitting}
           aria-busy={isSubmitting}
diff --git a/frontend/app/[locale]/shop/admin/products/new/page.tsx b/frontend/app/[locale]/shop/admin/products/new/page.tsx
index 89cc4de4..82046807 100644
--- a/frontend/app/[locale]/shop/admin/products/new/page.tsx
+++ b/frontend/app/[locale]/shop/admin/products/new/page.tsx
@@ -1,9 +1,10 @@
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
+import { Metadata } from 'next';
+
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
 import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
 import { issueCsrfToken } from '@/lib/security/csrf';
 
-import { ProductForm } from '../_components/product-form';
-import { Metadata } from 'next';
+import { ProductForm } from '../_components/ProductForm';
 
 export const metadata: Metadata = {
   title: 'New Product | DevLovers',
diff --git a/frontend/app/[locale]/shop/admin/products/page.tsx b/frontend/app/[locale]/shop/admin/products/page.tsx
index ed1dccf1..cbb2578f 100644
--- a/frontend/app/[locale]/shop/admin/products/page.tsx
+++ b/frontend/app/[locale]/shop/admin/products/page.tsx
@@ -1,22 +1,23 @@
-import { Link } from '@/i18n/routing';
 import { and, desc, eq, sql } from 'drizzle-orm';
-import { issueCsrfToken } from '@/lib/security/csrf';
-import { ShopAdminTopbar } from '@/components/shop/admin/shop-admin-topbar';
-import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
-import { AdminProductDeleteButton } from '@/components/shop/admin/admin-product-delete-button';
-import { AdminProductStatusToggle } from '@/components/shop/admin/admin-product-status-toggle';
-import { AdminPagination } from '@/components/shop/admin/admin-pagination';
+import { Metadata } from 'next';
+import { getTranslations } from 'next-intl/server';
+
+import { AdminPagination } from '@/components/shop/admin/AdminPagination';
+import { AdminProductDeleteButton } from '@/components/shop/admin/AdminProductDeleteButton';
+import { AdminProductStatusToggle } from '@/components/shop/admin/AdminProductStatusToggle';
+import { ShopAdminTopbar } from '@/components/shop/admin/ShopAdminTopbar';
 import { db } from '@/db';
 import {
   inventoryMoves,
   orderItems,
-  products,
   productPrices,
+  products,
 } from '@/db/schema';
-import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
+import { Link } from '@/i18n/routing';
+import { guardShopAdminPage } from '@/lib/auth/guard-shop-admin-page';
 import { parsePage } from '@/lib/pagination';
-import { getTranslations } from 'next-intl/server';
-import { Metadata } from 'next';
+import { issueCsrfToken } from '@/lib/security/csrf';
+import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
 
 export const metadata: Metadata = {
   title: 'Admin Products | DevLovers',
@@ -108,14 +109,14 @@ export default async function AdminProductsPage({
         <header className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
           <h1
             id="admin-products-title"
-            className="text-2xl font-bold text-foreground"
+            className="text-foreground text-2xl font-bold"
           >
             {t('title')}
           </h1>
 
           <Link
             href="/shop/admin/products/new"
-            className="inline-flex items-center justify-center whitespace-nowrap rounded-md border border-border px-3 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-secondary"
+            className="border-border text-foreground hover:bg-secondary inline-flex items-center justify-center rounded-md border px-3 py-1.5 text-sm font-medium whitespace-nowrap transition-colors"
           >
             {t('newProduct')}
           </Link>
@@ -125,7 +126,7 @@ export default async function AdminProductsPage({
           {/* Mobile cards */}
           <div className="md:hidden">
             {rows.length === 0 ? (
-              <div className="rounded-md border border-border p-4 text-sm text-muted-foreground">
+              <div className="border-border text-muted-foreground rounded-md border p-4 text-sm">
                 {t('empty')}
               </div>
             ) : (
@@ -138,25 +139,25 @@ export default async function AdminProductsPage({
                   return (
                     <li
                       key={row.id}
-                      className="rounded-lg border border-border bg-background p-4"
+                      className="border-border bg-background rounded-lg border p-4"
                     >
                       <div className="flex items-start justify-between gap-3">
                         <div className="min-w-0">
                           <div
-                            className="truncate text-sm font-semibold text-foreground"
+                            className="text-foreground truncate text-sm font-semibold"
                             title={row.title}
                           >
                             {row.title}
                           </div>
                           <div
-                            className="mt-0.5 truncate text-xs text-muted-foreground"
+                            className="text-muted-foreground mt-0.5 truncate text-xs"
                             title={row.slug}
                           >
                             {row.slug}
                           </div>
                         </div>
 
-                        <div className="shrink-0 whitespace-nowrap text-right text-sm text-foreground">
+                        <div className="text-foreground shrink-0 text-right text-sm whitespace-nowrap">
                           {priceMinor == null
                             ? '-'
                             : formatMoney(priceMinor, displayCurrency, locale)}
@@ -169,7 +170,7 @@ export default async function AdminProductsPage({
                             {t('table.category')}
                           </dt>
                           <dd
-                            className="truncate text-foreground"
+                            className="text-foreground truncate"
                             title={row.category ?? '-'}
                           >
                             {row.category ?? '-'}
@@ -181,7 +182,7 @@ export default async function AdminProductsPage({
                             {t('table.type')}
                           </dt>
                           <dd
-                            className="truncate text-foreground"
+                            className="text-foreground truncate"
                             title={row.type ?? '-'}
                           >
                             {row.type ?? '-'}
@@ -235,7 +236,7 @@ export default async function AdminProductsPage({
                       <div className="mt-3 flex flex-wrap items-center gap-2">
                         <Link
                           href={`/shop/products/${row.slug}`}
-                          className="inline-flex items-center justify-center rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary"
+                          className="border-border text-foreground hover:bg-secondary inline-flex items-center justify-center rounded-md border px-2 py-1 text-xs font-medium transition-colors"
                           aria-label={t('actions.viewProduct', {
                             title: row.title,
                           })}
@@ -245,7 +246,7 @@ export default async function AdminProductsPage({
 
                         <Link
                           href={`/shop/admin/products/${row.id}/edit`}
-                          className="inline-flex items-center justify-center rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary"
+                          className="border-border text-foreground hover:bg-secondary inline-flex items-center justify-center rounded-md border px-2 py-1 text-xs font-medium transition-colors"
                           aria-label={t('actions.editProduct', {
                             title: row.title,
                           })}
@@ -277,7 +278,7 @@ export default async function AdminProductsPage({
           {/* Desktop table */}
           <div className="hidden md:block">
             <div className="overflow-x-auto">
-              <table className="w-full table-fixed divide-y divide-border text-sm">
+              <table className="divide-border w-full table-fixed divide-y text-sm">
                 <caption className="sr-only">{t('listCaption')}</caption>
                 <colgroup>
                   <col className="w-[9.5rem]" />
@@ -330,67 +331,67 @@ export default async function AdminProductsPage({
                   </tr>
                 </thead>
 
-                <tbody className="divide-y divide-border">
+                <tbody className="divide-border divide-y">
                   {rows.map(row => {
                     const priceMinor = row.priceMinor;
 
                     return (
                       <tr key={row.id} className="hover:bg-muted/50">
-                        <td className="max-w-0 px-3 py-2 font-medium text-foreground">
+                        <td className="text-foreground max-w-0 px-3 py-2 font-medium">
                           <div className="truncate" title={row.title}>
                             {row.title}
                           </div>
                         </td>
 
-                        <td className="max-w-0 px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground max-w-0 px-3 py-2">
                           <div className="truncate" title={row.slug}>
                             {row.slug}
                           </div>
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2 text-foreground">
+                        <td className="text-foreground px-3 py-2 whitespace-nowrap">
                           {priceMinor == null
                             ? '-'
                             : formatMoney(priceMinor, displayCurrency, locale)}
                         </td>
 
-                        <td className="max-w-0 px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground max-w-0 px-3 py-2">
                           <div className="truncate" title={row.category ?? '-'}>
                             {row.category ?? '-'}
                           </div>
                         </td>
 
-                        <td className="max-w-0 px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground max-w-0 px-3 py-2">
                           <div className="truncate" title={row.type ?? '-'}>
                             {row.type ?? '-'}
                           </div>
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {row.stock}
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {row.badge == null || row.badge === 'NONE'
                             ? '-'
                             : row.badge}
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2">
-                          <span className="inline-flex rounded-full bg-muted px-2 py-1 text-xs font-medium text-foreground">
+                        <td className="px-3 py-2 whitespace-nowrap">
+                          <span className="bg-muted text-foreground inline-flex rounded-full px-2 py-1 text-xs font-medium">
                             {row.isActive ? t('actions.yes') : t('actions.no')}
                           </span>
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2">
-                          <span className="inline-flex rounded-full bg-muted px-2 py-1 text-xs font-medium text-foreground">
+                        <td className="px-3 py-2 whitespace-nowrap">
+                          <span className="bg-muted text-foreground inline-flex rounded-full px-2 py-1 text-xs font-medium">
                             {row.isFeatured
                               ? t('actions.yes')
                               : t('actions.no')}
                           </span>
                         </td>
 
-                        <td className="whitespace-nowrap px-3 py-2 text-muted-foreground">
+                        <td className="text-muted-foreground px-3 py-2 whitespace-nowrap">
                           {formatDate(row.createdAt, locale)}
                         </td>
 
@@ -398,7 +399,7 @@ export default async function AdminProductsPage({
                           <div className="grid grid-cols-2 gap-2">
                             <Link
                               href={`/shop/products/${row.slug}`}
-                              className="inline-flex items-center justify-center rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary whitespace-normal break-words leading-tight text-center"
+                              className="border-border text-foreground hover:bg-secondary break-words inline-flex items-center justify-center rounded-md border px-2 py-1 text-center text-xs leading-tight font-medium whitespace-normal transition-colors"
                               aria-label={t('actions.viewProduct', {
                                 title: row.title,
                               })}
@@ -408,7 +409,7 @@ export default async function AdminProductsPage({
 
                             <Link
                               href={`/shop/admin/products/${row.id}/edit`}
-                              className="inline-flex items-center justify-center rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary whitespace-normal break-words leading-tight text-center"
+                              className="border-border text-foreground hover:bg-secondary break-words inline-flex items-center justify-center rounded-md border px-2 py-1 text-center text-xs leading-tight font-medium whitespace-normal transition-colors"
                               aria-label={t('actions.editProduct', {
                                 title: row.title,
                               })}
@@ -438,7 +439,7 @@ export default async function AdminProductsPage({
                   {rows.length === 0 ? (
                     <tr>
                       <td
-                        className="px-3 py-6 text-muted-foreground"
+                        className="text-muted-foreground px-3 py-6"
                         colSpan={11}
                       >
                         {t('empty')}
diff --git a/frontend/app/[locale]/shop/cart/CartPageClient.tsx b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
index 9fb12085..525906d2 100644
--- a/frontend/app/[locale]/shop/cart/CartPageClient.tsx
+++ b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
@@ -1,32 +1,32 @@
 'use client';
 
-import { useState } from 'react';
+import { Minus, Plus, ShoppingBag, Trash2 } from 'lucide-react';
 import Image from 'next/image';
 import { useParams } from 'next/navigation';
-import { useRouter, Link } from '@/i18n/routing';
 import { useTranslations } from 'next-intl';
-import { cn } from '@/lib/utils';
-import { Minus, Plus, Trash2, ShoppingBag } from 'lucide-react';
+import { useState } from 'react';
 
-import { useCart } from '@/components/shop/cart-provider';
-import { generateIdempotencyKey } from '@/lib/shop/idempotency';
+import { useCart } from '@/components/shop/CartProvider';
+import { Link, useRouter } from '@/i18n/routing';
 import { formatMoney } from '@/lib/shop/currency';
+import { generateIdempotencyKey } from '@/lib/shop/idempotency';
 import {
-  SHOP_FOCUS,
-  SHOP_LINK_BASE,
-  SHOP_LINK_MD,
-  SHOP_LINK_XS,
-  SHOP_DISABLED,
+  SHOP_CHIP_BORDER_HOVER,
   SHOP_CHIP_INTERACTIVE,
   SHOP_CHIP_SHADOW_HOVER,
-  SHOP_CHIP_BORDER_HOVER,
-  SHOP_STEPPER_BUTTON_BASE,
   SHOP_CTA_BASE,
-  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_WAVE,
+  SHOP_DISABLED,
+  SHOP_FOCUS,
+  SHOP_LINK_BASE,
+  SHOP_LINK_MD,
+  SHOP_LINK_XS,
+  SHOP_STEPPER_BUTTON_BASE,
   shopCtaGradient,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 
 const SHOP_PRODUCT_LINK = cn(
   'block truncate',
@@ -160,15 +160,15 @@ export default function CartPage() {
       <main className="mx-auto max-w-7xl px-4 py-20 sm:px-6 lg:px-8">
         <div className="flex flex-col items-center justify-center text-center">
           <ShoppingBag
-            className="h-16 w-16 text-muted-foreground"
+            className="text-muted-foreground h-16 w-16"
             aria-hidden="true"
           />
-          <h1 className="mt-6 text-3xl font-bold tracking-tight text-foreground">
+          <h1 className="text-foreground mt-6 text-3xl font-bold tracking-tight">
             {t('empty')}
           </h1>
-          <p className="mt-4 text-muted-foreground">{t('emptyDescription')}</p>
+          <p className="text-muted-foreground mt-4">{t('emptyDescription')}</p>
 
-          <div className="mt-8 w-full max-w-md mx-auto">
+          <div className="mx-auto mt-8 w-full max-w-md">
             <Link href="/shop/products" className={SHOP_HERO_CTA}>
               <span
                 className="absolute inset-0"
@@ -197,7 +197,7 @@ export default function CartPage() {
 
   return (
     <main className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
-      <h1 className="text-3xl font-bold tracking-tight text-foreground">
+      <h1 className="text-foreground text-3xl font-bold tracking-tight">
         {t('title')}
       </h1>
 
@@ -217,10 +217,10 @@ export default function CartPage() {
             {cart.items.map(item => (
               <li
                 key={`${item.productId}-${item.selectedSize ?? 'na'}-${item.selectedColor ?? 'na'}`}
-                className="rounded-lg border border-border p-4"
+                className="border-border rounded-lg border p-4"
               >
                 <article className="flex gap-4">
-                  <div className="relative h-24 w-24 flex-shrink-0 overflow-hidden rounded-md bg-muted">
+                  <div className="bg-muted relative h-24 w-24 flex-shrink-0 overflow-hidden rounded-md">
                     <Image
                       src={item.imageUrl || '/placeholder.svg'}
                       alt={item.title}
@@ -241,7 +241,7 @@ export default function CartPage() {
                         </Link>
 
                         {(item.selectedSize || item.selectedColor) && (
-                          <p className="mt-1 text-xs text-muted-foreground">
+                          <p className="text-muted-foreground mt-1 text-xs">
                             {[
                               translateColor(item.selectedColor),
                               item.selectedSize,
@@ -261,7 +261,7 @@ export default function CartPage() {
                             item.selectedColor
                           )
                         }
-                        className="text-muted-foreground transition-colors hover:text-foreground"
+                        className="text-muted-foreground hover:text-foreground transition-colors"
                         aria-label={t('actions.removeItem', {
                           title: item.title,
                         })}
@@ -312,7 +312,7 @@ export default function CartPage() {
 
                         {item.quantity >= item.stock && (
                           <span
-                            className="ml-3 text-xs text-muted-foreground"
+                            className="text-muted-foreground ml-3 text-xs"
                             role="status"
                           >
                             {t('actions.maxStock', { stock: item.stock })}
@@ -320,7 +320,7 @@ export default function CartPage() {
                         )}
                       </div>
 
-                      <span className="text-sm font-semibold text-foreground">
+                      <span className="text-foreground text-sm font-semibold">
                         {formatMoney(
                           item.lineTotalMinor,
                           item.currency,
@@ -336,12 +336,12 @@ export default function CartPage() {
         </section>
 
         <aside
-          className="h-fit rounded-lg border border-border p-6"
+          className="border-border h-fit rounded-lg border p-6"
           aria-labelledby="order-summary"
         >
           <h2
             id="order-summary"
-            className="text-lg font-semibold text-foreground"
+            className="text-foreground text-lg font-semibold"
           >
             {t('summary.heading')}
           </h2>
@@ -351,7 +351,7 @@ export default function CartPage() {
               <span className="text-muted-foreground">
                 {t('summary.subtotal')}
               </span>
-              <span className="font-medium text-foreground">
+              <span className="text-foreground font-medium">
                 {formatMoney(
                   cart.summary.totalAmountMinor,
                   cart.summary.currency,
@@ -369,12 +369,12 @@ export default function CartPage() {
               </span>
             </div>
 
-            <div className="border-t border-border pt-4">
+            <div className="border-border border-t pt-4">
               <div className="flex items-center justify-between">
-                <span className="text-base font-semibold text-foreground">
+                <span className="text-foreground text-base font-semibold">
                   {t('summary.total')}
                 </span>
-                <span className="text-lg font-bold text-foreground">
+                <span className="text-foreground text-lg font-bold">
                   {formatMoney(
                     cart.summary.totalAmountMinor,
                     cart.summary.currency,
@@ -418,7 +418,7 @@ export default function CartPage() {
               </span>
             </button>
 
-            <p className="text-center text-xs text-muted-foreground">
+            <p className="text-muted-foreground text-center text-xs">
               {t('checkout.message')}
             </p>
 
@@ -436,7 +436,7 @@ export default function CartPage() {
             {checkoutError ? (
               <div className="space-y-2">
                 <p
-                  className="text-center text-xs text-destructive"
+                  className="text-destructive text-center text-xs"
                   role="alert"
                 >
                   {checkoutError}
diff --git a/frontend/app/[locale]/shop/cart/page.tsx b/frontend/app/[locale]/shop/cart/page.tsx
index dd15d65e..14207f53 100644
--- a/frontend/app/[locale]/shop/cart/page.tsx
+++ b/frontend/app/[locale]/shop/cart/page.tsx
@@ -1,4 +1,5 @@
 import type { Metadata } from 'next';
+
 import CartPageClient from './CartPageClient';
 
 export const metadata: Metadata = {
diff --git a/frontend/app/[locale]/shop/checkout/error/page.tsx b/frontend/app/[locale]/shop/checkout/error/page.tsx
index 86a4d5a0..3174bc2e 100644
--- a/frontend/app/[locale]/shop/checkout/error/page.tsx
+++ b/frontend/app/[locale]/shop/checkout/error/page.tsx
@@ -1,24 +1,23 @@
-import { Link } from '@/i18n/routing';
+import { Metadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 
-import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
+import { Link } from '@/i18n/routing';
 import { OrderNotFoundError } from '@/lib/services/errors';
 import { getOrderSummary } from '@/lib/services/orders';
-import { orderIdParamSchema } from '@/lib/validation/shop';
-import { cn } from '@/lib/utils';
-
+import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
 import {
-  SHOP_FOCUS,
-  SHOP_DISABLED,
   SHOP_CTA_BASE,
-  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_WAVE,
-  shopCtaGradient,
+  SHOP_DISABLED,
+  SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
+  shopCtaGradient,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
 
 export const metadata: Metadata = {
   title: 'Checkout Error | DevLovers',
@@ -84,14 +83,14 @@ export default async function CheckoutErrorPage({
         className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
         aria-labelledby="checkout-error-title"
       >
-        <section className="rounded-lg border border-border bg-card p-8 text-center">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
           <h1
             id="checkout-error-title"
-            className="text-2xl font-bold text-foreground"
+            className="text-foreground text-2xl font-bold"
           >
             {t('errors.missingOrderId')}
           </h1>
-          <p className="mt-2 text-sm text-muted-foreground">
+          <p className="text-muted-foreground mt-2 text-sm">
             {t('errors.missingOrderIdDescription')}
           </p>
 
@@ -143,14 +142,14 @@ export default async function CheckoutErrorPage({
           className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
           aria-labelledby="checkout-error-title"
         >
-          <section className="rounded-lg border border-border bg-card p-8 text-center">
+          <section className="border-border bg-card rounded-lg border p-8 text-center">
             <h1
               id="checkout-error-title"
-              className="text-2xl font-bold text-foreground"
+              className="text-foreground text-2xl font-bold"
             >
               {t('errors.orderNotFound')}
             </h1>
-            <p className="mt-2 text-sm text-muted-foreground">
+            <p className="text-muted-foreground mt-2 text-sm">
               {t('errors.orderNotFoundDescription')}
             </p>
 
@@ -196,14 +195,14 @@ export default async function CheckoutErrorPage({
         className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
         aria-labelledby="checkout-error-title"
       >
-        <section className="rounded-lg border border-border bg-card p-8 text-center">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
           <h1
             id="checkout-error-title"
-            className="text-2xl font-bold text-foreground"
+            className="text-foreground text-2xl font-bold"
           >
             {t('errors.unableToLoad')}
           </h1>
-          <p className="mt-2 text-sm text-muted-foreground">
+          <p className="text-muted-foreground mt-2 text-sm">
             {t('errors.tryAgainLater')}
           </p>
         </section>
@@ -225,15 +224,15 @@ export default async function CheckoutErrorPage({
       className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
       aria-labelledby="checkout-error-title"
     >
-      <section className="rounded-lg border border-border bg-card p-8 shadow-sm">
+      <section className="border-border bg-card rounded-lg border p-8 shadow-sm">
         <header>
           <h1
             id="checkout-error-title"
-            className="text-3xl font-bold text-foreground"
+            className="text-foreground text-3xl font-bold"
           >
             {isFailed ? t('error.paymentFailed') : t('error.paymentUnclear')}
           </h1>
-          <p className="mt-2 text-sm text-muted-foreground">
+          <p className="text-muted-foreground mt-2 text-sm">
             {isFailed
               ? t('error.paymentFailedDescription')
               : t('error.paymentUnclearDescription')}
@@ -241,20 +240,20 @@ export default async function CheckoutErrorPage({
         </header>
 
         <section
-          className="mt-6 rounded-md border border-border bg-muted/30 p-4 text-sm text-foreground"
+          className="border-border bg-muted/30 text-foreground mt-6 rounded-md border p-4 text-sm"
           aria-label="Order details"
         >
           <dl className="space-y-2">
             <div className="flex items-center justify-between gap-4">
               <dt className="text-muted-foreground">{t('error.orderLabel')}</dt>
-              <dd className="font-mono text-xs text-muted-foreground">
+              <dd className="text-muted-foreground font-mono text-xs">
                 {order.id}
               </dd>
             </div>
 
             <div className="flex items-center justify-between gap-4">
               <dt className="text-muted-foreground">{t('error.totalLabel')}</dt>
-              <dd className="font-semibold text-foreground">
+              <dd className="text-foreground font-semibold">
                 {totalMinor == null
                   ? '-'
                   : formatMoney(totalMinor, currency, locale)}
@@ -265,7 +264,7 @@ export default async function CheckoutErrorPage({
               <dt className="text-muted-foreground">
                 {t('error.statusLabel')}
               </dt>
-              <dd className="font-semibold capitalize text-foreground">
+              <dd className="text-foreground font-semibold capitalize">
                 {order.paymentStatus}
               </dd>
             </div>
diff --git a/frontend/app/[locale]/shop/checkout/payment/StripePaymentClient.tsx b/frontend/app/[locale]/shop/checkout/payment/StripePaymentClient.tsx
index 075ed56f..f9cbca50 100644
--- a/frontend/app/[locale]/shop/checkout/payment/StripePaymentClient.tsx
+++ b/frontend/app/[locale]/shop/checkout/payment/StripePaymentClient.tsx
@@ -1,8 +1,5 @@
 'use client';
 
-import { useMemo, useState } from 'react';
-import { Link, useRouter } from '@/i18n/routing';
-
 import {
   Elements,
   PaymentElement,
@@ -11,30 +8,31 @@ import {
 } from '@stripe/react-stripe-js';
 import {
   loadStripe,
-  type StripeElementsOptions,
   type Stripe,
+  type StripeElementsOptions,
 } from '@stripe/stripe-js';
+import { useMemo, useState } from 'react';
 
+import { Link, useRouter } from '@/i18n/routing';
+import { logError } from '@/lib/logging';
 import {
+  type CurrencyCode,
   currencyValues,
   formatMoney,
   resolveCurrencyFromLocale,
-  type CurrencyCode,
 } from '@/lib/shop/currency';
-import { logError } from '@/lib/logging';
-import { cn } from '@/lib/utils';
-
 import {
-  SHOP_FOCUS,
-  SHOP_DISABLED,
   SHOP_CTA_BASE,
-  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_WAVE,
-  shopCtaGradient,
+  SHOP_DISABLED,
+  SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
+  shopCtaGradient,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 
 type PaymentFormProps = {
   orderId: string;
@@ -232,7 +230,7 @@ function StripePaymentForm({ orderId, locale }: PaymentFormProps) {
       </button>
 
       {errorMessage ? (
-        <p className="text-sm text-destructive" role="alert">
+        <p className="text-destructive text-sm" role="alert">
           {errorMessage}
         </p>
       ) : null}
@@ -270,7 +268,7 @@ export default function StripePaymentClient({
   if (!paymentsEnabled) {
     return (
       <section
-        className="space-y-3 text-sm text-muted-foreground"
+        className="text-muted-foreground space-y-3 text-sm"
         aria-label="Payments disabled"
       >
         <p>Payments are disabled in this environment.</p>
@@ -302,7 +300,7 @@ export default function StripePaymentClient({
   if (!clientSecret || !clientSecret.trim()) {
     return (
       <section
-        className="space-y-3 text-sm text-muted-foreground"
+        className="text-muted-foreground space-y-3 text-sm"
         aria-label="Payment initialization failed"
       >
         <p>Payment cannot be initialized. Please try again later.</p>
@@ -319,7 +317,7 @@ export default function StripePaymentClient({
 
   if (!stripePromise || !options) {
     return (
-      <p className="text-sm text-muted-foreground" aria-live="polite">
+      <p className="text-muted-foreground text-sm" aria-live="polite">
         Preparing secure payment…
       </p>
     );
@@ -329,7 +327,7 @@ export default function StripePaymentClient({
     <section aria-label="Secure payment">
       <Elements stripe={stripePromise as Promise<Stripe>} options={options}>
         <div className="space-y-4">
-          <div className="rounded-md border border-border bg-muted/40 p-3 text-sm text-foreground">
+          <div className="border-border bg-muted/40 text-foreground rounded-md border p-3 text-sm">
             <div className="flex items-center justify-between">
               <span className="text-muted-foreground">Pay</span>
               <span className="text-base font-semibold">
@@ -337,7 +335,7 @@ export default function StripePaymentClient({
               </span>
             </div>
 
-            <p className="text-xs uppercase tracking-wide text-muted-foreground">
+            <p className="text-muted-foreground text-xs tracking-wide uppercase">
               {uiCurrency}
             </p>
           </div>
diff --git a/frontend/app/[locale]/shop/checkout/payment/[orderId]/page.tsx b/frontend/app/[locale]/shop/checkout/payment/[orderId]/page.tsx
index 76f1139c..7f068e85 100644
--- a/frontend/app/[locale]/shop/checkout/payment/[orderId]/page.tsx
+++ b/frontend/app/[locale]/shop/checkout/payment/[orderId]/page.tsx
@@ -1,29 +1,29 @@
-import { Link } from '@/i18n/routing';
-import { ClearCartOnMount } from '@/components/shop/clear-cart-on-mount';
-import StripePaymentClient from '../StripePaymentClient';
+import { Metadata } from 'next';
+import { getTranslations } from 'next-intl/server';
 
-import { formatMoney } from '@/lib/shop/currency';
-import { getOrderSummary } from '@/lib/services/orders';
-import { OrderNotFoundError } from '@/lib/services/errors';
-import { orderIdParamSchema } from '@/lib/validation/shop';
+import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
+import { Link } from '@/i18n/routing';
 import { getStripeEnv } from '@/lib/env/stripe';
 import { logError } from '@/lib/logging';
+import { OrderNotFoundError } from '@/lib/services/errors';
+import { getOrderSummary } from '@/lib/services/orders';
 import { ensureStripePaymentIntentForOrder } from '@/lib/services/orders/payment-attempts';
-import { getTranslations } from 'next-intl/server';
-import { cn } from '@/lib/utils';
-
+import { formatMoney } from '@/lib/shop/currency';
 import {
-  SHOP_FOCUS,
-  SHOP_DISABLED,
   SHOP_CTA_BASE,
-  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_WAVE,
-  shopCtaGradient,
+  SHOP_DISABLED,
+  SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
+  shopCtaGradient,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import StripePaymentClient from '../StripePaymentClient';
 
 export const metadata: Metadata = {
   title: 'Checkout | DevLovers',
@@ -75,7 +75,7 @@ const SHOP_HERO_CTA_SM = cn(
   SHOP_FOCUS,
   SHOP_DISABLED,
   'items-center justify-center gap-2',
-  'px-5 py-2.5 text-xs sm:text-sm text-white',
+  'px-5 py-2.5 text-xs text-white sm:text-sm',
   'shadow-[var(--shop-hero-btn-shadow)] hover:shadow-[var(--shop-hero-btn-shadow-hover)]'
 );
 
@@ -135,13 +135,13 @@ function PageShell({
       className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
       aria-labelledby="payment-title"
     >
-      <section className="rounded-lg border border-border bg-card p-8 text-center">
-        <h1 id="payment-title" className="text-2xl font-bold text-foreground">
+      <section className="border-border bg-card rounded-lg border p-8 text-center">
+        <h1 id="payment-title" className="text-foreground text-2xl font-bold">
           {title}
         </h1>
 
         {description ? (
-          <p className="mt-2 text-sm text-muted-foreground">{description}</p>
+          <p className="text-muted-foreground mt-2 text-sm">{description}</p>
         ) : null}
 
         {children}
@@ -289,15 +289,15 @@ export default async function PaymentPage(props: PaymentPageProps) {
       <ClearCartOnMount enabled={clearCart} />
 
       <header className="mb-6">
-        <p className="text-sm font-semibold uppercase tracking-wide text-accent">
+        <p className="text-accent text-sm font-semibold tracking-wide uppercase">
           {t('payment.title')}
         </p>
 
-        <h1 id="pay-order-title" className="text-3xl font-bold text-foreground">
+        <h1 id="pay-order-title" className="text-foreground text-3xl font-bold">
           {t('payment.payForOrder', { orderId: order.id.slice(0, 8) })}
         </h1>
 
-        <p className="mt-2 text-sm text-muted-foreground">
+        <p className="text-muted-foreground mt-2 text-sm">
           {await buildStatusMessage(order.paymentStatus)}
         </p>
       </header>
@@ -307,29 +307,29 @@ export default async function PaymentPage(props: PaymentPageProps) {
         aria-label="Payment and order summary"
       >
         <section
-          className="rounded-lg border border-border bg-card p-6"
+          className="border-border bg-card rounded-lg border p-6"
           aria-label="Payment details"
         >
-          <h2 className="text-lg font-semibold text-foreground">
+          <h2 className="text-foreground text-lg font-semibold">
             {t('payment.paymentDetails')}
           </h2>
 
-          <p className="mt-2 text-sm text-muted-foreground">
+          <p className="text-muted-foreground mt-2 text-sm">
             {t('payment.completePayment')}
           </p>
 
-          <div className="mt-6 rounded-md border border-border bg-muted/30 p-4">
+          <div className="border-border bg-muted/30 mt-6 rounded-md border p-4">
             <div className="flex items-center justify-between">
-              <span className="text-sm text-muted-foreground">
+              <span className="text-muted-foreground text-sm">
                 {t('payment.amountDue')}
               </span>
 
-              <span className="text-xl font-bold text-foreground">
+              <span className="text-foreground text-xl font-bold">
                 {formatMoney(order.totalAmountMinor, order.currency, locale)}
               </span>
             </div>
 
-            <p className="mt-1 text-xs text-muted-foreground uppercase tracking-wide">
+            <p className="text-muted-foreground mt-1 text-xs tracking-wide uppercase">
               {order.currency}
             </p>
           </div>
@@ -348,29 +348,29 @@ export default async function PaymentPage(props: PaymentPageProps) {
         </section>
 
         <aside
-          className="rounded-lg border border-border bg-card p-6"
+          className="border-border bg-card rounded-lg border p-6"
           aria-label="Order summary"
         >
-          <h2 className="text-lg font-semibold text-foreground">
+          <h2 className="text-foreground text-lg font-semibold">
             {t('payment.orderSummary')}
           </h2>
 
-          <dl className="mt-4 space-y-3 text-sm text-muted-foreground">
+          <dl className="text-muted-foreground mt-4 space-y-3 text-sm">
             <div className="flex items-center justify-between">
               <dt>{t('payment.items')}</dt>
-              <dd className="font-medium text-foreground">{itemsCount}</dd>
+              <dd className="text-foreground font-medium">{itemsCount}</dd>
             </div>
 
             <div className="flex items-center justify-between">
               <dt>{t('payment.totalAmount')}</dt>
-              <dd className="font-semibold text-foreground">
+              <dd className="text-foreground font-semibold">
                 {formatMoney(order.totalAmountMinor, order.currency, locale)}
               </dd>
             </div>
 
             <div className="flex items-center justify-between">
               <dt>{t('payment.status')}</dt>
-              <dd className="font-semibold capitalize text-foreground">
+              <dd className="text-foreground font-semibold capitalize">
                 {order.paymentStatus}
               </dd>
             </div>
diff --git a/frontend/app/[locale]/shop/checkout/success/OrderStatusAutoRefresh.tsx b/frontend/app/[locale]/shop/checkout/success/OrderStatusAutoRefresh.tsx
index 10c22774..70d4c806 100644
--- a/frontend/app/[locale]/shop/checkout/success/OrderStatusAutoRefresh.tsx
+++ b/frontend/app/[locale]/shop/checkout/success/OrderStatusAutoRefresh.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import { useEffect, useRef } from 'react';
 import { useRouter } from 'next/navigation';
+import { useEffect, useRef } from 'react';
 
 type Props = {
   paymentStatus: string;
diff --git a/frontend/app/[locale]/shop/checkout/success/page.tsx b/frontend/app/[locale]/shop/checkout/success/page.tsx
index 91f93241..cedff489 100644
--- a/frontend/app/[locale]/shop/checkout/success/page.tsx
+++ b/frontend/app/[locale]/shop/checkout/success/page.tsx
@@ -1,25 +1,25 @@
-import { Link } from '@/i18n/routing';
+import { Metadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 
-import OrderStatusAutoRefresh from './OrderStatusAutoRefresh';
-import { ClearCartOnMount } from '@/components/shop/clear-cart-on-mount';
-import { formatMoney } from '@/lib/shop/currency';
-import { getOrderSummary } from '@/lib/services/orders';
+import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
+import { Link } from '@/i18n/routing';
 import { OrderNotFoundError } from '@/lib/services/errors';
-import { orderIdParamSchema } from '@/lib/validation/shop';
-import { cn } from '@/lib/utils';
-
+import { getOrderSummary } from '@/lib/services/orders';
+import { formatMoney } from '@/lib/shop/currency';
 import {
-  SHOP_FOCUS,
   SHOP_CTA_BASE,
-  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
   SHOP_CTA_WAVE,
+  SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
   shopCtaGradient,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import OrderStatusAutoRefresh from './OrderStatusAutoRefresh';
 
 export const metadata: Metadata = {
   title: 'Order Confirmed| DevLovers',
@@ -57,7 +57,6 @@ function shouldClearCart(params: SearchParams): boolean {
   return raw === 'true' || raw === '1';
 }
 
-/** Small hero CTA (Link) */
 const SHOP_HERO_CTA_SM = cn(
   SHOP_CTA_BASE,
   SHOP_CTA_INTERACTIVE,
@@ -113,13 +112,13 @@ function CheckoutShell({
       className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8"
       aria-labelledby="checkout-title"
     >
-      <section className="rounded-lg border border-border bg-card p-8 text-center">
-        <h1 id="checkout-title" className="text-2xl font-bold text-foreground">
+      <section className="border-border bg-card rounded-lg border p-8 text-center">
+        <h1 id="checkout-title" className="text-foreground text-2xl font-bold">
           {title}
         </h1>
 
         {description ? (
-          <p className="mt-2 text-sm text-muted-foreground">{description}</p>
+          <p className="text-muted-foreground mt-2 text-sm">{description}</p>
         ) : null}
 
         {children}
@@ -208,19 +207,19 @@ export default async function CheckoutSuccessPage({
 
       <OrderStatusAutoRefresh paymentStatus={order.paymentStatus} />
 
-      <section className="rounded-lg border border-border bg-card p-8">
-        <p className="text-sm font-semibold uppercase tracking-wide text-accent">
+      <section className="border-border bg-card rounded-lg border p-8">
+        <p className="text-accent text-sm font-semibold tracking-wide uppercase">
           {t('success.title')}
         </p>
 
         <h1
           id="order-title"
-          className="mt-2 text-3xl font-bold text-foreground"
+          className="text-foreground mt-2 text-3xl font-bold"
         >
           {t('success.orderLabel')} #{order.id.slice(0, 8)}
         </h1>
 
-        <p className="mt-2 text-sm text-muted-foreground">
+        <p className="text-muted-foreground mt-2 text-sm">
           {t('success.received')}
           {order.paymentStatus === 'paid'
             ? ` ${t('success.paymentConfirmed')}`
@@ -237,8 +236,8 @@ export default async function CheckoutSuccessPage({
           className="mt-6 grid gap-6 md:grid-cols-2"
           aria-label="Order summary"
         >
-          <div className="rounded-md border border-border bg-muted/40 p-4">
-            <h2 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">
+          <div className="border-border bg-muted/40 rounded-md border p-4">
+            <h2 className="text-muted-foreground text-sm font-semibold tracking-wide uppercase">
               {t('success.orderSummary')}
             </h2>
 
@@ -247,19 +246,19 @@ export default async function CheckoutSuccessPage({
                 <dt className="text-muted-foreground">
                   {t('success.totalAmount')}
                 </dt>
-                <dd className="font-semibold text-foreground">
+                <dd className="text-foreground font-semibold">
                   {formatMoney(totalMinor, order.currency, locale)}
                 </dd>
               </div>
 
               <div className="flex items-center justify-between">
                 <dt className="text-muted-foreground">{t('success.items')}</dt>
-                <dd className="font-medium text-foreground">{itemsCount}</dd>
+                <dd className="text-foreground font-medium">{itemsCount}</dd>
               </div>
 
               <div className="flex items-center justify-between">
                 <dt className="text-muted-foreground">{t('success.status')}</dt>
-                <dd className="font-semibold capitalize text-foreground">
+                <dd className="text-foreground font-semibold capitalize">
                   {order.paymentStatus}
                 </dd>
               </div>
diff --git a/frontend/app/[locale]/shop/orders/[id]/page.tsx b/frontend/app/[locale]/shop/orders/[id]/page.tsx
index 97dcedad..4a730309 100644
--- a/frontend/app/[locale]/shop/orders/[id]/page.tsx
+++ b/frontend/app/[locale]/shop/orders/[id]/page.tsx
@@ -1,17 +1,17 @@
 import 'server-only';
-import { cn } from '@/lib/utils';
-import { Link } from '@/i18n/routing';
-import { notFound, redirect } from 'next/navigation';
-import { unstable_noStore as noStore } from 'next/cache';
+
 import { and, eq } from 'drizzle-orm';
+import { Metadata } from 'next';
+import { unstable_noStore as noStore } from 'next/cache';
+import { notFound, redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 
 import { db } from '@/db';
 import { orderItems, orders } from '@/db/schema';
+import { Link } from '@/i18n/routing';
 import { getCurrentUser } from '@/lib/auth';
-import { orderIdParamSchema } from '@/lib/validation/shop';
 import { logError } from '@/lib/logging';
-import { formatMoney, type CurrencyCode } from '@/lib/shop/currency';
+import { type CurrencyCode, formatMoney } from '@/lib/shop/currency';
 import { fromDbMoney } from '@/lib/shop/money';
 import {
   SHOP_FOCUS,
@@ -19,7 +19,8 @@ import {
   SHOP_LINK_MD,
   SHOP_NAV_LINK_BASE,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
 
 export const metadata: Metadata = {
   title: 'Order Details | DevLovers',
@@ -230,7 +231,7 @@ export default async function OrderDetailPage({
           <h1 id="order-heading" className="truncate text-2xl font-semibold">
             {t('title')}
           </h1>
-          <div className="mt-1 truncate text-xs text-muted-foreground">
+          <div className="text-muted-foreground mt-1 truncate text-xs">
             {order.id}
           </div>
         </div>
@@ -249,7 +250,7 @@ export default async function OrderDetailPage({
       </header>
 
       <section
-        className="mb-6 rounded-md border border-border p-4"
+        className="border-border mb-6 rounded-md border p-4"
         aria-labelledby="order-summary-heading"
       >
         <h2 id="order-summary-heading" className="sr-only">
@@ -258,12 +259,12 @@ export default async function OrderDetailPage({
 
         <dl className="grid grid-cols-1 gap-3 sm:grid-cols-2">
           <div>
-            <dt className="text-xs text-muted-foreground">{t('total')}</dt>
+            <dt className="text-muted-foreground text-xs">{t('total')}</dt>
             <dd className="text-sm font-medium">{totalFormatted}</dd>
           </div>
 
           <div>
-            <dt className="text-xs text-muted-foreground">
+            <dt className="text-muted-foreground text-xs">
               {t('paymentStatus')}
             </dt>
             <dd className="text-sm font-medium">
@@ -272,13 +273,13 @@ export default async function OrderDetailPage({
           </div>
 
           <div>
-            <dt className="text-xs text-muted-foreground">{t('created')}</dt>
+            <dt className="text-muted-foreground text-xs">{t('created')}</dt>
             <dd className="text-sm">{createdFormatted}</dd>
           </div>
 
           {isAdmin && (
             <div>
-              <dt className="text-xs text-muted-foreground">{t('provider')}</dt>
+              <dt className="text-muted-foreground text-xs">{t('provider')}</dt>
               <dd className="text-sm">{String(order.paymentProvider)}</dd>
             </div>
           )}
@@ -287,7 +288,7 @@ export default async function OrderDetailPage({
         {isAdmin && (
           <dl className="mt-4 grid grid-cols-1 gap-3 sm:grid-cols-2">
             <div>
-              <dt className="text-xs text-muted-foreground">
+              <dt className="text-muted-foreground text-xs">
                 {t('paymentReference')}
               </dt>
               <dd className="text-sm break-all">
@@ -295,7 +296,7 @@ export default async function OrderDetailPage({
               </dd>
             </div>
             <div>
-              <dt className="text-xs text-muted-foreground">
+              <dt className="text-muted-foreground text-xs">
                 {t('idempotencyKey')}
               </dt>
               <dd className="text-sm break-all">{order.idempotencyKey}</dd>
@@ -306,7 +307,7 @@ export default async function OrderDetailPage({
         {isAdmin && (
           <dl className="mt-4 grid grid-cols-1 gap-3 sm:grid-cols-2">
             <div>
-              <dt className="text-xs text-muted-foreground">
+              <dt className="text-muted-foreground text-xs">
                 {t('stockRestored')}
               </dt>
               <dd className="text-sm">
@@ -314,7 +315,7 @@ export default async function OrderDetailPage({
               </dd>
             </div>
             <div>
-              <dt className="text-xs text-muted-foreground">
+              <dt className="text-muted-foreground text-xs">
                 {t('restockedAt')}
               </dt>
               <dd className="text-sm">{restockedFormatted}</dd>
@@ -324,16 +325,16 @@ export default async function OrderDetailPage({
       </section>
 
       <section
-        className="rounded-md border border-border"
+        className="border-border rounded-md border"
         aria-labelledby="order-items-heading"
       >
-        <div className="border-b border-border p-4">
+        <div className="border-border border-b p-4">
           <h2 id="order-items-heading" className="text-lg font-semibold">
             {t('items')}
           </h2>
         </div>
 
-        <ul className="divide-y divide-border" aria-label={t('items')}>
+        <ul className="divide-border divide-y" aria-label={t('items')}>
           {order.items.map(it => (
             <li key={it.id} className="p-4">
               <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
@@ -354,7 +355,7 @@ export default async function OrderDetailPage({
                     </div>
                   )}
 
-                  <div className="mt-1 break-all text-xs text-muted-foreground">
+                  <div className="text-muted-foreground mt-1 text-xs break-all">
                     {it.productSku
                       ? t('sku', { sku: it.productSku })
                       : t('product', { productId: it.productId })}
@@ -368,7 +369,7 @@ export default async function OrderDetailPage({
                   </div>
                   <div>
                     <dt className="sr-only">{t('unitPrice')}</dt>
-                    <dd className="text-sm text-muted-foreground">
+                    <dd className="text-muted-foreground text-sm">
                       Unit:{' '}
                       {safeFormatMoneyMajor(it.unitPrice, currency, locale)}
                     </dd>
diff --git a/frontend/app/[locale]/shop/orders/error.tsx b/frontend/app/[locale]/shop/orders/error.tsx
index 3b084a1a..51a676ab 100644
--- a/frontend/app/[locale]/shop/orders/error.tsx
+++ b/frontend/app/[locale]/shop/orders/error.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import { cn } from '@/lib/utils';
 import {
   SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 
 type ErrorPageProps = {
   error: Error & { digest?: string };
@@ -25,8 +25,8 @@ export default function OrdersError({ reset }: ErrorPageProps) {
         <h1 className="text-2xl font-semibold">Orders</h1>
       </header>
 
-      <section className="mt-6 rounded-lg border border-border bg-card p-5">
-        <p className="text-sm text-muted-foreground">Failed to load orders.</p>
+      <section className="border-border bg-card mt-6 rounded-lg border p-5">
+        <p className="text-muted-foreground text-sm">Failed to load orders.</p>
 
         <div className="mt-4 flex flex-wrap items-center gap-3">
           <button type="button" className={SHOP_OUTLINE_BTN} onClick={reset}>
diff --git a/frontend/app/[locale]/shop/orders/page.tsx b/frontend/app/[locale]/shop/orders/page.tsx
index 6be669a3..0330386d 100644
--- a/frontend/app/[locale]/shop/orders/page.tsx
+++ b/frontend/app/[locale]/shop/orders/page.tsx
@@ -1,13 +1,14 @@
 import 'server-only';
-import { cn } from '@/lib/utils';
-import { Link } from '@/i18n/routing';
-import { redirect } from 'next/navigation';
-import { unstable_noStore as noStore } from 'next/cache';
+
 import { desc, eq, sql } from 'drizzle-orm';
+import { Metadata } from 'next';
+import { unstable_noStore as noStore } from 'next/cache';
+import { redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 
 import { db } from '@/db';
 import { orderItems, orders } from '@/db/schema';
+import { Link } from '@/i18n/routing';
 import { getCurrentUser } from '@/lib/auth';
 import { logError } from '@/lib/logging';
 import {
@@ -16,7 +17,7 @@ import {
   SHOP_LINK_MD,
   SHOP_NAV_LINK_BASE,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
 
 export const metadata: Metadata = {
   title: 'My Orders | DevLovers',
@@ -205,7 +206,7 @@ export default async function MyOrdersPage({
           <h1 id="my-orders-heading" className="text-2xl font-semibold">
             {t('title')}
           </h1>
-          <p className="mt-1 text-sm text-muted-foreground">{t('subtitle')}</p>
+          <p className="text-muted-foreground mt-1 text-sm">{t('subtitle')}</p>
         </div>
 
         <nav aria-label="Orders navigation" className="flex items-center gap-3">
@@ -217,7 +218,7 @@ export default async function MyOrdersPage({
 
       {rows.length === 0 ? (
         <section className="rounded-md border p-4" aria-label="No orders">
-          <p className="text-sm text-muted-foreground">{t('empty.message')}</p>
+          <p className="text-muted-foreground text-sm">{t('empty.message')}</p>
           <div className="mt-3">
             <Link className={NAV_LINK} href="/shop/products">
               {t('empty.browseProducts')}
@@ -230,29 +231,29 @@ export default async function MyOrdersPage({
             <table className="w-full border-collapse">
               <caption className="sr-only">{t('table.caption')}</caption>
 
-              <thead className="border-b border-border">
+              <thead className="border-border border-b">
                 <tr>
                   <th
                     scope="col"
-                    className="px-4 py-3 text-left text-xs font-semibold text-muted-foreground"
+                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
                   >
                     {t('table.items')}
                   </th>
                   <th
                     scope="col"
-                    className="px-4 py-3 text-left text-xs font-semibold text-muted-foreground"
+                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
                   >
                     {t('table.date')}
                   </th>
                   <th
                     scope="col"
-                    className="px-4 py-3 text-left text-xs font-semibold text-muted-foreground"
+                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
                   >
                     {t('table.status')}
                   </th>
                   <th
                     scope="col"
-                    className="px-4 py-3 text-right text-xs font-semibold text-muted-foreground"
+                    className="text-muted-foreground px-4 py-3 text-right text-xs font-semibold"
                   >
                     {t('table.total')}
                   </th>
@@ -277,9 +278,9 @@ export default async function MyOrdersPage({
                   return (
                     <tr
                       key={o.id}
-                      className="border-b border-border last:border-b-0 hover:bg-muted/20"
+                      className="border-border hover:bg-muted/20 border-b last:border-b-0"
                     >
-                      <th scope="row" className="px-4 py-3 align-top text-left">
+                      <th scope="row" className="px-4 py-3 text-left align-top">
                         <Link
                           href={href}
                           className={ORDER_HEADLINE_LINK}
@@ -289,7 +290,7 @@ export default async function MyOrdersPage({
                           {headline}
                         </Link>
 
-                        <div className="mt-1 text-xs text-muted-foreground">
+                        <div className="text-muted-foreground mt-1 text-xs">
                           <span className="sr-only">
                             {t('table.orderId')}:{' '}
                           </span>
@@ -315,7 +316,7 @@ export default async function MyOrdersPage({
                         </span>
                       </td>
 
-                      <td className="px-4 py-3 align-top text-right text-sm font-medium">
+                      <td className="px-4 py-3 text-right align-top text-sm font-medium">
                         {String(o.totalAmount)} {String(o.currency)}
                       </td>
                     </tr>
diff --git a/frontend/app/[locale]/shop/page.tsx b/frontend/app/[locale]/shop/page.tsx
index a86ddfb8..fa71a45c 100644
--- a/frontend/app/[locale]/shop/page.tsx
+++ b/frontend/app/[locale]/shop/page.tsx
@@ -1,9 +1,11 @@
+import { Metadata } from 'next';
+import { getTranslations } from 'next-intl/server';
+
+import { CategoryTile } from '@/components/shop/CategoryTile';
+import { ProductCard } from '@/components/shop/ProductCard';
+import { Hero } from '@/components/shop/ShopHero';
 import { Link } from '@/i18n/routing';
-import { ProductCard } from '@/components/shop/product-card';
-import { Hero } from '@/components/shop/shop-hero';
-import { CategoryTile } from '@/components/shop/category-tile';
 import { getHomepageContent } from '@/lib/shop/data';
-import { getTranslations } from 'next-intl/server';
 import {
   SHOP_CTA_BASE,
   SHOP_CTA_INSET,
@@ -11,7 +13,6 @@ import {
   SHOP_FOCUS,
   shopCtaGradient,
 } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
 
 export const metadata: Metadata = {
   title: 'Shop | DevLovers',
@@ -38,32 +39,21 @@ export default async function HomePage({
       />
 
       <section
-        className="border-t border-border bg-background py-16"
+        className="border-border bg-background border-t py-16"
         aria-labelledby="new-arrivals-heading"
       >
         <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
           <header className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
             <h2
               id="new-arrivals-heading"
-              className="text-2xl font-bold tracking-tight text-foreground"
+              className="text-foreground text-2xl font-bold tracking-tight"
             >
               {t('newArrivals')}
             </h2>
 
             <Link
               href="/shop/products?filter=new"
-              className="
-              group inline-flex items-center gap-2 rounded-md border border-border
-              px-4 py-2
-              text-xs sm:text-sm font-semibold tracking-[0.25em] uppercase
-              text-muted-foreground hover:text-foreground
-              bg-transparent
-              shadow-none hover:shadow-[var(--shop-card-shadow-hover)]
-              transition-[transform,box-shadow,color,filter] duration-500 ease-out
-              hover:-translate-y-0.5 hover:brightness-110
-              focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)]
-              focus-visible:ring-offset-2 focus-visible:ring-offset-background
-            "
+              className="group border-border text-muted-foreground hover:text-foreground focus-visible:ring-offset-background inline-flex items-center gap-2 rounded-md border bg-transparent px-4 py-2 text-xs font-semibold tracking-[0.25em] uppercase shadow-none transition-[transform,box-shadow,color,filter] duration-500 ease-out hover:-translate-y-0.5 hover:shadow-[var(--shop-card-shadow-hover)] hover:brightness-110 focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:outline-none sm:text-sm"
               aria-label={t('viewAll')}
             >
               <span>{t('viewAll')}</span>
@@ -87,14 +77,14 @@ export default async function HomePage({
       </section>
 
       <section
-        className="border-t border-border bg-background py-16"
+        className="border-border bg-background border-t py-16"
         aria-labelledby="shop-by-category-heading"
       >
         <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
           <header className="flex items-center justify-between">
             <h2
               id="shop-by-category-heading"
-              className="text-2xl font-bold tracking-tight text-foreground"
+              className="text-foreground text-2xl font-bold tracking-tight"
             >
               {t('shopByCategory')}
             </h2>
@@ -111,7 +101,7 @@ export default async function HomePage({
       </section>
 
       <section
-        className="bg-foreground py-16 text-background"
+        className="bg-foreground text-background py-16"
         aria-labelledby="shop-cta-heading"
       >
         <div className="mx-auto max-w-7xl px-4 text-center sm:px-6 lg:px-8">
@@ -122,19 +112,14 @@ export default async function HomePage({
             {t('hero.headline')}
           </h2>
 
-          <p className="mx-auto mt-4 max-w-xl text-background/80">
+          <p className="text-background/80 mx-auto mt-4 max-w-xl">
             {t('hero.subheadline')}
           </p>
 
           <div className="mt-8">
             <Link
               href="/shop/products"
-              className={`
-    ${SHOP_CTA_BASE} ${SHOP_FOCUS}
-    px-8 sm:px-10 md:px-12 py-3 md:py-3.5
-    text-[color:var(--shop-cta-fg)]
-    shadow-[var(--shop-cta-shadow)] hover:shadow-[var(--shop-cta-shadow-hover)]
-  `}
+              className={` ${SHOP_CTA_BASE} ${SHOP_FOCUS} px-8 py-3 text-[color:var(--shop-cta-fg)] shadow-[var(--shop-cta-shadow)] hover:shadow-[var(--shop-cta-shadow-hover)] sm:px-10 md:px-12 md:py-3.5`}
               aria-label={t('hero.cta')}
             >
               <span
diff --git a/frontend/app/[locale]/shop/products/[slug]/page.tsx b/frontend/app/[locale]/shop/products/[slug]/page.tsx
index f5ea2ed8..8f9c57c2 100644
--- a/frontend/app/[locale]/shop/products/[slug]/page.tsx
+++ b/frontend/app/[locale]/shop/products/[slug]/page.tsx
@@ -1,15 +1,16 @@
+import { ArrowLeft } from 'lucide-react';
+import { Metadata } from 'next';
 import Image from 'next/image';
 import { notFound } from 'next/navigation';
-import { ArrowLeft } from 'lucide-react';
 import { getTranslations } from 'next-intl/server';
-import { cn } from '@/lib/utils';
-import { AddToCartButton } from '@/components/shop/add-to-cart-button';
-import { getProductPageData } from '@/lib/shop/data';
-import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
+
+import { AddToCartButton } from '@/components/shop/AddToCartButton';
 import { getPublicProductBySlug } from '@/db/queries/shop/products';
 import { Link } from '@/i18n/routing';
+import { formatMoney, resolveCurrencyFromLocale } from '@/lib/shop/currency';
+import { getProductPageData } from '@/lib/shop/data';
 import { SHOP_FOCUS, SHOP_NAV_LINK_BASE } from '@/lib/shop/ui-classes';
-import { Metadata } from 'next';
+import { cn } from '@/lib/utils';
 
 export const metadata: Metadata = {
   title: 'Product name | DevLovers',
@@ -66,10 +67,10 @@ export default async function ProductPage({
       </nav>
 
       <div className="mt-8 grid gap-8 lg:grid-cols-2 lg:gap-16">
-        <div className="relative aspect-square overflow-hidden rounded-lg bg-muted">
+        <div className="bg-muted relative aspect-square overflow-hidden rounded-lg">
           {product.badge && (
             <span
-              className={`absolute left-4 top-4 z-10 rounded px-2 py-1 text-xs font-semibold uppercase ${
+              className={`absolute top-4 left-4 z-10 rounded px-2 py-1 text-xs font-semibold uppercase ${
                 badge === 'SALE'
                   ? 'bg-accent text-accent-foreground'
                   : 'bg-foreground text-background'
@@ -90,13 +91,13 @@ export default async function ProductPage({
         </div>
 
         <div className="flex flex-col">
-          <h1 className="text-3xl font-bold tracking-tight text-foreground">
+          <h1 className="text-foreground text-3xl font-bold tracking-tight">
             {product.name}
           </h1>
 
           {isUnavailable ? (
             <div
-              className="mt-4 rounded-md border border-border bg-muted/30 p-4 text-sm text-muted-foreground"
+              className="border-border bg-muted/30 text-muted-foreground mt-4 rounded-md border p-4 text-sm"
               role="status"
               aria-live="polite"
             >
@@ -116,7 +117,7 @@ export default async function ProductPage({
               </span>
 
               {product.originalPrice && (
-                <span className="text-lg text-muted-foreground line-through">
+                <span className="text-muted-foreground text-lg line-through">
                   {formatMoney(product.originalPrice, product.currency, locale)}
                 </span>
               )}
@@ -124,7 +125,7 @@ export default async function ProductPage({
           )}
 
           {product.description && (
-            <p className="mt-6 text-muted-foreground">{product.description}</p>
+            <p className="text-muted-foreground mt-6">{product.description}</p>
           )}
 
           {!isUnavailable && (
diff --git a/frontend/app/[locale]/shop/products/page.tsx b/frontend/app/[locale]/shop/products/page.tsx
index 8757db69..f4c369da 100644
--- a/frontend/app/[locale]/shop/products/page.tsx
+++ b/frontend/app/[locale]/shop/products/page.tsx
@@ -1,14 +1,14 @@
-import { Suspense } from 'react';
+import { Metadata } from 'next';
 import { redirect } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
+import { Suspense } from 'react';
 
-import { ProductFilters } from '@/components/shop/product-filters';
-import { CatalogProductsClient } from '@/components/shop/catalog-products-client';
-import { ProductsToolbar } from '@/components/shop/products-toolbar';
+import { CatalogProductsClient } from '@/components/shop/CatalogProductsClient';
+import { ProductFilters } from '@/components/shop/ProductFilters';
+import { ProductsToolbar } from '@/components/shop/ProductsToolbar';
+import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
 import { getCatalogProducts } from '@/lib/shop/data';
 import { catalogQuerySchema } from '@/lib/validation/shop';
-import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
-import { Metadata } from 'next';
 
 export const metadata: Metadata = {
   title: 'Products | DevLovers',
@@ -74,8 +74,8 @@ export default async function ProductsPage({
 
   return (
     <main className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
-      <header className="flex flex-col gap-4 border-b border-border pb-6 sm:flex-row sm:items-center sm:justify-between">
-        <h1 className="text-2xl font-bold tracking-tight text-foreground sm:text-3xl">
+      <header className="border-border flex flex-col gap-4 border-b pb-6 sm:flex-row sm:items-center sm:justify-between">
+        <h1 className="text-foreground text-2xl font-bold tracking-tight sm:text-3xl">
           {t('title')}
         </h1>
 
@@ -101,10 +101,10 @@ export default async function ProductsPage({
               className="flex flex-col items-center justify-center py-16 text-center"
               role="status"
             >
-              <p className="text-lg font-medium text-foreground">
+              <p className="text-foreground text-lg font-medium">
                 {t('noProductsFound')}
               </p>
-              <p className="mt-2 text-sm text-muted-foreground">
+              <p className="text-muted-foreground mt-2 text-sm">
                 {t('adjustFilters')}
               </p>
             </div>
diff --git a/frontend/app/[locale]/signup/page.tsx b/frontend/app/[locale]/signup/page.tsx
index e89d9294..904648d4 100644
--- a/frontend/app/[locale]/signup/page.tsx
+++ b/frontend/app/[locale]/signup/page.tsx
@@ -1,22 +1,16 @@
-"use client";
+'use client';
 
-import { useLocale } from "next-intl";
-import { useSearchParams } from "next/navigation";
-import { SignupForm } from "@/components/auth/SignupForm";
-import { getSafeRedirect } from "@/lib/auth/safe-redirect";
+import { useSearchParams } from 'next/navigation';
+import { useLocale } from 'next-intl';
+
+import { SignupForm } from '@/components/auth/SignupForm';
+import { getSafeRedirect } from '@/lib/auth/safe-redirect';
 
 export default function SignupPage() {
   const locale = useLocale();
   const searchParams = useSearchParams();
 
-  const returnTo = getSafeRedirect(
-    searchParams.get("returnTo")
-  );
+  const returnTo = getSafeRedirect(searchParams.get('returnTo'));
 
-  return (
-    <SignupForm
-      locale={locale}
-      returnTo={returnTo}
-    />
-  );
-}
\ No newline at end of file
+  return <SignupForm locale={locale} returnTo={returnTo} />;
+}
diff --git a/frontend/app/[locale]/terms-of-service/page.tsx b/frontend/app/[locale]/terms-of-service/page.tsx
index e084eeec..f296fde7 100644
--- a/frontend/app/[locale]/terms-of-service/page.tsx
+++ b/frontend/app/[locale]/terms-of-service/page.tsx
@@ -1,4 +1,5 @@
 import { getTranslations } from 'next-intl/server';
+
 import LegalPageShell from '@/components/legal/LegalPageShell';
 import TermsOfServiceContent, {
   TERMS_LAST_UPDATED,
diff --git a/frontend/app/api/ai/explain/route.ts b/frontend/app/api/ai/explain/route.ts
index e12c8e1e..8c12c9ea 100644
--- a/frontend/app/api/ai/explain/route.ts
+++ b/frontend/app/api/ai/explain/route.ts
@@ -1,8 +1,9 @@
 export const runtime = 'nodejs';
 
+import Groq from 'groq-sdk';
 import { NextResponse } from 'next/server';
 import { z } from 'zod';
-import Groq from 'groq-sdk';
+
 import {
   createExplainPrompt,
   type ExplanationResponse,
diff --git a/frontend/app/api/auth/github/callback/route.ts b/frontend/app/api/auth/github/callback/route.ts
index 7062d665..2df81a6a 100644
--- a/frontend/app/api/auth/github/callback/route.ts
+++ b/frontend/app/api/auth/github/callback/route.ts
@@ -1,176 +1,168 @@
-import { NextRequest, NextResponse } from "next/server";
-import { and, eq } from "drizzle-orm";
+import { and, eq } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
 
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { signAuthToken, setAuthCookie } from "@/lib/auth";
-import { authEnv } from "@/lib/env/auth";
-import { consumeOAuthState } from "@/lib/auth/oauth-state";
+import { db } from '@/db';
+import { users } from '@/db/schema/users';
+import { setAuthCookie, signAuthToken } from '@/lib/auth';
+import { consumeOAuthState } from '@/lib/auth/oauth-state';
+import { authEnv } from '@/lib/env/auth';
 
 type GithubTokenResponse = {
-    access_token: string;
-    token_type: string;
-    scope: string;
+  access_token: string;
+  token_type: string;
+  scope: string;
 };
 
 type GithubUser = {
-    id: number;
-    login: string;
-    name: string | null;
-    avatar_url: string;
+  id: number;
+  login: string;
+  name: string | null;
+  avatar_url: string;
 };
 
 type GithubEmail = {
-    email: string;
-    primary: boolean;
-    verified: boolean;
+  email: string;
+  primary: boolean;
+  verified: boolean;
 };
 
 const GITHUB_HEADERS = {
-    "User-Agent": "devlovers-app",
+  'User-Agent': 'devlovers-app',
 };
 
 export async function GET(req: NextRequest) {
-    const code = req.nextUrl.searchParams.get("code");
-    const state = req.nextUrl.searchParams.get("state");
-
-    if (!(await consumeOAuthState(state))) {
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    if (!code) {
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    const tokenRes = await fetch(
-        "https://github.com/login/oauth/access_token",
-        {
-            method: "POST",
-            headers: {
-                Accept: "application/json",
-            },
-            body: new URLSearchParams({
-                client_id: authEnv.github.clientId,
-                client_secret: authEnv.github.clientSecret,
-                code,
-                redirect_uri: authEnv.github.redirectUri,
-            }),
-        }
-    );
-
-    if (!tokenRes.ok) {
-        console.error(
-            "GitHub token exchange failed",
-            await tokenRes.text()
-        );
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    const tokenData = (await tokenRes.json()) as GithubTokenResponse;
-
-    const userRes = await fetch("https://api.github.com/user", {
-        headers: {
-            ...GITHUB_HEADERS,
-            Authorization: `Bearer ${tokenData.access_token}`,
-        },
-    });
-
-    if (!userRes.ok) {
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    const ghUser = (await userRes.json()) as GithubUser;
-
-    const emailsRes = await fetch("https://api.github.com/user/emails", {
-        headers: {
-            ...GITHUB_HEADERS,
-            Authorization: `Bearer ${tokenData.access_token}`,
-        },
-    });
-
-    if (!emailsRes.ok) {
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    const emails = (await emailsRes.json()) as GithubEmail[];
-
-    const primaryEmail = emails.find(
-        (e) => e.primary && e.verified
-    )?.email;
-
-    if (!primaryEmail) {
-        return NextResponse.redirect(new URL("/login", req.url));
-    }
-
-    const githubId = String(ghUser.id);
-    let user = null;
-
-    const [githubUser] = await db
-        .select({
-            id: users.id,
-            email: users.email,
-            role: users.role,
+  const code = req.nextUrl.searchParams.get('code');
+  const state = req.nextUrl.searchParams.get('state');
+
+  if (!(await consumeOAuthState(state))) {
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  if (!code) {
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  const tokenRes = await fetch('https://github.com/login/oauth/access_token', {
+    method: 'POST',
+    headers: {
+      Accept: 'application/json',
+    },
+    body: new URLSearchParams({
+      client_id: authEnv.github.clientId,
+      client_secret: authEnv.github.clientSecret,
+      code,
+      redirect_uri: authEnv.github.redirectUri,
+    }),
+  });
+
+  if (!tokenRes.ok) {
+    console.error('GitHub token exchange failed', await tokenRes.text());
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  const tokenData = (await tokenRes.json()) as GithubTokenResponse;
+
+  const userRes = await fetch('https://api.github.com/user', {
+    headers: {
+      ...GITHUB_HEADERS,
+      Authorization: `Bearer ${tokenData.access_token}`,
+    },
+  });
+
+  if (!userRes.ok) {
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  const ghUser = (await userRes.json()) as GithubUser;
+
+  const emailsRes = await fetch('https://api.github.com/user/emails', {
+    headers: {
+      ...GITHUB_HEADERS,
+      Authorization: `Bearer ${tokenData.access_token}`,
+    },
+  });
+
+  if (!emailsRes.ok) {
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  const emails = (await emailsRes.json()) as GithubEmail[];
+
+  const primaryEmail = emails.find(e => e.primary && e.verified)?.email;
+
+  if (!primaryEmail) {
+    return NextResponse.redirect(new URL('/login', req.url));
+  }
+
+  const githubId = String(ghUser.id);
+  let user = null;
+
+  const [githubUser] = await db
+    .select({
+      id: users.id,
+      email: users.email,
+      role: users.role,
+    })
+    .from(users)
+    .where(and(eq(users.providerId, githubId), eq(users.provider, 'github')))
+    .limit(1);
+
+  if (githubUser) {
+    user = githubUser;
+  } else {
+    const [emailUser] = await db
+      .select({
+        id: users.id,
+        emailVerified: users.emailVerified,
+        image: users.image,
+        name: users.name,
+      })
+      .from(users)
+      .where(eq(users.email, primaryEmail))
+      .limit(1);
+
+    if (emailUser) {
+      const image =
+        emailUser.image && emailUser.image !== 'null'
+          ? emailUser.image
+          : ghUser.avatar_url;
+      const [updatedUser] = await db
+        .update(users)
+        .set({
+          provider: 'github',
+          providerId: githubId,
+          emailVerified: emailUser.emailVerified ?? new Date(),
+          image,
+          name: emailUser.name ?? ghUser.name ?? ghUser.login,
         })
-        .from(users)
-        .where(and(eq(users.providerId, githubId), eq(users.provider, "github")))
-        .limit(1);
+        .where(eq(users.id, emailUser.id))
+        .returning();
 
-    if (githubUser) {
-        user = githubUser;
+      user = updatedUser;
     } else {
-        const [emailUser] = await db
-            .select({
-                id: users.id,
-                emailVerified: users.emailVerified,
-                image: users.image,
-                name: users.name,
-            })
-            .from(users)
-            .where(eq(users.email, primaryEmail))
-            .limit(1);
-
-        if (emailUser) {
-            const image =
-                emailUser.image && emailUser.image !== "null"
-                    ? emailUser.image
-                    : ghUser.avatar_url;
-            const [updatedUser] = await db
-                .update(users)
-                .set({
-                    provider: "github",
-                    providerId: githubId,
-                    emailVerified: emailUser.emailVerified ?? new Date(),
-                    image,
-                    name: emailUser.name ?? ghUser.name ?? ghUser.login,
-                })
-                .where(eq(users.id, emailUser.id))
-                .returning();
-
-            user = updatedUser;
-        } else {
-            const [created] = await db
-                .insert(users)
-                .values({
-                    email: primaryEmail,
-                    name: ghUser.name ?? ghUser.login,
-                    image: ghUser.avatar_url,
-                    provider: "github",
-                    providerId: githubId,
-                    emailVerified: new Date(),
-                })
-                .returning();
-
-            user = created;
-        }
+      const [created] = await db
+        .insert(users)
+        .values({
+          email: primaryEmail,
+          name: ghUser.name ?? ghUser.login,
+          image: ghUser.avatar_url,
+          provider: 'github',
+          providerId: githubId,
+          emailVerified: new Date(),
+        })
+        .returning();
+
+      user = created;
     }
+  }
 
-    const token = signAuthToken({
-        userId: user.id,
-        email: user.email,
-        role: user.role === "admin" ? "admin" : "user",
-    });
+  const token = signAuthToken({
+    userId: user.id,
+    email: user.email,
+    role: user.role === 'admin' ? 'admin' : 'user',
+  });
 
-    await setAuthCookie(token);
+  await setAuthCookie(token);
 
-    return NextResponse.redirect(new URL("/dashboard", req.url));
+  return NextResponse.redirect(new URL('/dashboard', req.url));
 }
diff --git a/frontend/app/api/auth/github/route.ts b/frontend/app/api/auth/github/route.ts
index 17bb6e75..f26b5097 100644
--- a/frontend/app/api/auth/github/route.ts
+++ b/frontend/app/api/auth/github/route.ts
@@ -1,18 +1,22 @@
-import { authEnv } from "@/lib/env/auth";
-import { NextResponse } from "next/server";
-import { generateOAuthState, setOAuthStateCookie } from "@/lib/auth/oauth-state";
+import { NextResponse } from 'next/server';
+
+import {
+  generateOAuthState,
+  setOAuthStateCookie,
+} from '@/lib/auth/oauth-state';
+import { authEnv } from '@/lib/env/auth';
 
 export async function GET() {
-    const state = generateOAuthState();
-    await setOAuthStateCookie(state);
-    const params = new URLSearchParams({
-        client_id: authEnv.github.clientId,
-        redirect_uri: authEnv.github.redirectUri,
-        scope: "user:email",
-        state,
-    });
+  const state = generateOAuthState();
+  await setOAuthStateCookie(state);
+  const params = new URLSearchParams({
+    client_id: authEnv.github.clientId,
+    redirect_uri: authEnv.github.redirectUri,
+    scope: 'user:email',
+    state,
+  });
 
-    return NextResponse.redirect(
-        `https://github.com/login/oauth/authorize?${params.toString()}`
-    );
-}
\ No newline at end of file
+  return NextResponse.redirect(
+    `https://github.com/login/oauth/authorize?${params.toString()}`
+  );
+}
diff --git a/frontend/app/api/auth/google/callback/route.ts b/frontend/app/api/auth/google/callback/route.ts
index 2430415a..b25a79b5 100644
--- a/frontend/app/api/auth/google/callback/route.ts
+++ b/frontend/app/api/auth/google/callback/route.ts
@@ -1,11 +1,11 @@
-import { NextRequest, NextResponse } from "next/server";
-import { and, eq } from "drizzle-orm";
+import { and, eq } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
 
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { signAuthToken, setAuthCookie } from "@/lib/auth";
-import { authEnv } from "@/lib/env/auth";
-import { consumeOAuthState } from "@/lib/auth/oauth-state";
+import { db } from '@/db';
+import { users } from '@/db/schema/users';
+import { setAuthCookie, signAuthToken } from '@/lib/auth';
+import { consumeOAuthState } from '@/lib/auth/oauth-state';
+import { authEnv } from '@/lib/env/auth';
 
 type GoogleTokenResponse = {
   access_token: string;
@@ -23,42 +23,41 @@ type GoogleProfile = {
 };
 
 export async function GET(req: NextRequest) {
-  const code = req.nextUrl.searchParams.get("code");
+  const code = req.nextUrl.searchParams.get('code');
 
   if (!code) {
-    return NextResponse.redirect(new URL("/login", req.url));
+    return NextResponse.redirect(new URL('/login', req.url));
   }
 
-  const state = req.nextUrl.searchParams.get("state");
+  const state = req.nextUrl.searchParams.get('state');
 
   if (!(await consumeOAuthState(state))) {
-    return NextResponse.redirect(new URL("/login", req.url));
+    return NextResponse.redirect(new URL('/login', req.url));
   }
 
-  const tokenRes = await fetch("https://oauth2.googleapis.com/token", {
-    method: "POST",
+  const tokenRes = await fetch('https://oauth2.googleapis.com/token', {
+    method: 'POST',
     headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
+      'Content-Type': 'application/x-www-form-urlencoded',
     },
     body: new URLSearchParams({
       code,
       client_id: authEnv.google.clientId,
       client_secret: authEnv.google.clientSecret,
       redirect_uri: authEnv.google.redirectUri,
-      grant_type: "authorization_code",
+      grant_type: 'authorization_code',
     }),
   });
 
   if (!tokenRes.ok) {
-    console.error(
-      "Google token exchange failed", await tokenRes.text())
-    return NextResponse.redirect(new URL("/login", req.url));
+    console.error('Google token exchange failed', await tokenRes.text());
+    return NextResponse.redirect(new URL('/login', req.url));
   }
 
   const tokenData = (await tokenRes.json()) as GoogleTokenResponse;
 
   const profileRes = await fetch(
-    "https://www.googleapis.com/oauth2/v2/userinfo",
+    'https://www.googleapis.com/oauth2/v2/userinfo',
     {
       headers: {
         Authorization: `Bearer ${tokenData.access_token}`,
@@ -67,14 +66,16 @@ export async function GET(req: NextRequest) {
   );
 
   if (!profileRes.ok) {
-    return NextResponse.redirect(new URL("/login", req.url));
+    return NextResponse.redirect(new URL('/login', req.url));
   }
 
   const profile = (await profileRes.json()) as GoogleProfile;
 
   if (!profile.verified_email) {
-    console.warn("Google email not verified", profile);
-    return NextResponse.redirect(new URL("/login?error=unverified_email", req.url));
+    console.warn('Google email not verified', profile);
+    return NextResponse.redirect(
+      new URL('/login?error=unverified_email', req.url)
+    );
   }
 
   const email = profile.email;
@@ -89,13 +90,12 @@ export async function GET(req: NextRequest) {
       role: users.role,
     })
     .from(users)
-    .where(and(eq(users.providerId, googleId), eq(users.provider, "google")))
+    .where(and(eq(users.providerId, googleId), eq(users.provider, 'google')))
     .limit(1);
 
   if (googleUser) {
     user = googleUser;
   } else {
-
     const [emailUser] = await db
       .select({
         id: users.id,
@@ -109,13 +109,13 @@ export async function GET(req: NextRequest) {
 
     if (emailUser) {
       const image =
-        emailUser.image && emailUser.image !== "null"
+        emailUser.image && emailUser.image !== 'null'
           ? emailUser.image
           : profile.picture;
       const [updatedUser] = await db
         .update(users)
         .set({
-          provider: "google",
+          provider: 'google',
           providerId: googleId,
           emailVerified: emailUser.emailVerified ?? new Date(),
           image,
@@ -126,14 +126,13 @@ export async function GET(req: NextRequest) {
 
       user = updatedUser;
     } else {
-
       const [created] = await db
         .insert(users)
         .values({
           email,
           name: profile.name,
           image: profile.picture,
-          provider: "google",
+          provider: 'google',
           providerId: googleId,
           emailVerified: new Date(),
         })
@@ -143,14 +142,13 @@ export async function GET(req: NextRequest) {
     }
   }
 
-
   const token = signAuthToken({
     userId: user.id,
     email: user.email,
-    role: user.role === "admin" ? "admin" : "user",
+    role: user.role === 'admin' ? 'admin' : 'user',
   });
 
   await setAuthCookie(token);
 
-  return NextResponse.redirect(new URL("/dashboard", req.url));
-}   
+  return NextResponse.redirect(new URL('/dashboard', req.url));
+}
diff --git a/frontend/app/api/auth/google/route.ts b/frontend/app/api/auth/google/route.ts
index ba06b8b8..85d6aec9 100644
--- a/frontend/app/api/auth/google/route.ts
+++ b/frontend/app/api/auth/google/route.ts
@@ -1,16 +1,16 @@
-import { authEnv } from "@/lib/env/auth";
-import { NextResponse } from "next/server";
+import { NextResponse } from 'next/server';
+
 import {
   generateOAuthState,
   setOAuthStateCookie,
-} from "@/lib/auth/oauth-state";
-
+} from '@/lib/auth/oauth-state';
+import { authEnv } from '@/lib/env/auth';
 
 export async function GET() {
-  const { clientId, redirectUri } = authEnv.google
+  const { clientId, redirectUri } = authEnv.google;
 
   if (!clientId || !redirectUri) {
-    throw new Error("Google OAuth is not properly configured");
+    throw new Error('Google OAuth is not properly configured');
   }
 
   const state = generateOAuthState();
@@ -19,13 +19,13 @@ export async function GET() {
   const params = new URLSearchParams({
     client_id: clientId,
     redirect_uri: redirectUri,
-    response_type: "code",
-    scope: "openid email profile",
-    prompt: "select_account",
+    response_type: 'code',
+    scope: 'openid email profile',
+    prompt: 'select_account',
     state,
   });
 
   return NextResponse.redirect(
     `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/app/api/auth/login/route.ts b/frontend/app/api/auth/login/route.ts
index 309b8c08..21d1d5e5 100644
--- a/frontend/app/api/auth/login/route.ts
+++ b/frontend/app/api/auth/login/route.ts
@@ -1,19 +1,18 @@
-import { NextResponse } from "next/server";
+import bcrypt from 'bcryptjs';
+import { eq } from 'drizzle-orm';
 import { revalidatePath } from 'next/cache';
-import bcrypt from "bcryptjs";
-import { z } from "zod";
-import { eq } from "drizzle-orm";
+import { NextResponse } from 'next/server';
+import { z } from 'zod';
 
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { signAuthToken, setAuthCookie } from "@/lib/auth";
-
-export const runtime = "nodejs";
+import { db } from '@/db';
+import { users } from '@/db/schema/users';
+import { setAuthCookie, signAuthToken } from '@/lib/auth';
 
+export const runtime = 'nodejs';
 
 const loginSchema = z.object({
-  email: z.string().email("Invalid email"),
-  password: z.string().min(1, "Password is required"),
+  email: z.string().email('Invalid email'),
+  password: z.string().min(1, 'Password is required'),
 });
 
 export async function POST(req: Request) {
@@ -21,10 +20,7 @@ export async function POST(req: Request) {
   const parsed = loginSchema.safeParse(body);
 
   if (!parsed.success) {
-    return NextResponse.json(
-      { error: "Invalid credentials" },
-      { status: 401 }
-    );
+    return NextResponse.json({ error: 'Invalid credentials' }, { status: 401 });
   }
 
   const { email, password } = parsed.data;
@@ -44,22 +40,25 @@ export async function POST(req: Request) {
 
   if (result.length === 0) {
     return NextResponse.json(
-      { error: "Invalid email or password" },
+      { error: 'Invalid email or password' },
       { status: 401 }
     );
   }
 
-  const user = result[0]
+  const user = result[0];
 
   if (!user.provider) {
-    throw new Error("User record missing provider");
+    throw new Error('User record missing provider');
   }
 
-  if (user.provider === "credentials" && user.emailVerified === null) {
-    return NextResponse.json({
-      error: "Email is not verified",
-      code: "EMAIL_NOT_VERIFIED",
-    }, { status: 403 })
+  if (user.provider === 'credentials' && user.emailVerified === null) {
+    return NextResponse.json(
+      {
+        error: 'Email is not verified',
+        code: 'EMAIL_NOT_VERIFIED',
+      },
+      { status: 403 }
+    );
   }
 
   if (
@@ -67,18 +66,18 @@ export async function POST(req: Request) {
     !(await bcrypt.compare(password, user.passwordHash))
   ) {
     return NextResponse.json(
-      { error: "Invalid email or password" },
+      { error: 'Invalid email or password' },
       { status: 401 }
     );
   }
 
   const token = signAuthToken({
     userId: result[0].id,
-    role: result[0].role as "user" | "admin",
+    role: result[0].role as 'user' | 'admin',
     email: normalizedEmail,
   });
 
   await setAuthCookie(token);
   revalidatePath('/[locale]', 'layout');
   return NextResponse.json({ success: true, userId: result[0].id });
-}
\ No newline at end of file
+}
diff --git a/frontend/app/api/auth/logout/route.ts b/frontend/app/api/auth/logout/route.ts
index 848ad663..57de0cf0 100644
--- a/frontend/app/api/auth/logout/route.ts
+++ b/frontend/app/api/auth/logout/route.ts
@@ -1,9 +1,10 @@
-import { NextResponse } from "next/server";
-import { revalidatePath } from 'next/cache'; 
-import { clearAuthCookie } from "@/lib/auth";
+import { revalidatePath } from 'next/cache';
+import { NextResponse } from 'next/server';
+
+import { clearAuthCookie } from '@/lib/auth';
 
 export async function POST() {
   await clearAuthCookie();
   revalidatePath('/[locale]', 'layout');
   return NextResponse.json({ success: true });
-}
\ No newline at end of file
+}
diff --git a/frontend/app/api/auth/me/route.ts b/frontend/app/api/auth/me/route.ts
index 7c2f8da8..5b755c69 100644
--- a/frontend/app/api/auth/me/route.ts
+++ b/frontend/app/api/auth/me/route.ts
@@ -1,9 +1,10 @@
-import "server-only"
+import 'server-only';
 
-import { NextResponse } from "next/server"
-import { getCurrentUser } from "@/lib/auth"
+import { NextResponse } from 'next/server';
+
+import { getCurrentUser } from '@/lib/auth';
 
 export async function GET() {
-  const user = await getCurrentUser()
-  return NextResponse.json({ user }, { status: 200 })
+  const user = await getCurrentUser();
+  return NextResponse.json({ user }, { status: 200 });
 }
diff --git a/frontend/app/api/auth/password-reset/confirm/route.ts b/frontend/app/api/auth/password-reset/confirm/route.ts
index 2f1f5ec2..11b5a872 100644
--- a/frontend/app/api/auth/password-reset/confirm/route.ts
+++ b/frontend/app/api/auth/password-reset/confirm/route.ts
@@ -1,71 +1,63 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { eq } from "drizzle-orm";
-import bcrypt from "bcryptjs";
-
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { passwordResetTokens } from "@/db/schema/passwordResetTokens";
+import bcrypt from 'bcryptjs';
+import { eq } from 'drizzle-orm';
+import { NextResponse } from 'next/server';
+import { z } from 'zod';
 
+import { db } from '@/db';
+import { passwordResetTokens } from '@/db/schema/passwordResetTokens';
+import { users } from '@/db/schema/users';
 
 const schema = z.object({
-    token: z.string().uuid(),
-    password: z.string().min(8),
+  token: z.string().uuid(),
+  password: z.string().min(8),
 });
 
 export async function POST(req: Request) {
-    const body = await req.json().catch(() => null);
-    const parsed = schema.safeParse(body);
-
-    if (!parsed.success) {
-        return NextResponse.json(
-            { error: "Invalid request" },
-            { status: 400 }
-        );
-    }
-
-    const { token, password } = parsed.data;
-
-    const rows = await db
-        .select({
-            userId: passwordResetTokens.userId,
-            expiresAt: passwordResetTokens.expiresAt,
-        })
-        .from(passwordResetTokens)
-        .where(eq(passwordResetTokens.token, token))
-        .limit(1);
-
-    if (rows.length === 0) {
-        return NextResponse.json(
-            { error: "Invalid or expired token" },
-            { status: 400 }
-        );
-    }
-
-    const { userId, expiresAt } = rows[0];
-
-    if (expiresAt < new Date()) {
-        await db
-            .delete(passwordResetTokens)
-            .where(eq(passwordResetTokens.token, token));
+  const body = await req.json().catch(() => null);
+  const parsed = schema.safeParse(body);
+
+  if (!parsed.success) {
+    return NextResponse.json({ error: 'Invalid request' }, { status: 400 });
+  }
+
+  const { token, password } = parsed.data;
+
+  const rows = await db
+    .select({
+      userId: passwordResetTokens.userId,
+      expiresAt: passwordResetTokens.expiresAt,
+    })
+    .from(passwordResetTokens)
+    .where(eq(passwordResetTokens.token, token))
+    .limit(1);
+
+  if (rows.length === 0) {
+    return NextResponse.json(
+      { error: 'Invalid or expired token' },
+      { status: 400 }
+    );
+  }
+
+  const { userId, expiresAt } = rows[0];
+
+  if (expiresAt < new Date()) {
+    await db
+      .delete(passwordResetTokens)
+      .where(eq(passwordResetTokens.token, token));
 
-        return NextResponse.json(
-            { error: "Invalid or expired token" },
-            { status: 400 }
-        );
-    }
+    return NextResponse.json(
+      { error: 'Invalid or expired token' },
+      { status: 400 }
+    );
+  }
 
-    const passwordHash = await bcrypt.hash(password, 10);
+  const passwordHash = await bcrypt.hash(password, 10);
 
+  await db
+    .delete(passwordResetTokens)
+    .where(eq(passwordResetTokens.token, token));
 
-    await db
-        .delete(passwordResetTokens)
-        .where(eq(passwordResetTokens.token, token));
-
-    await db
-        .update(users)
-        .set({ passwordHash })
-        .where(eq(users.id, userId));
+  await db.update(users).set({ passwordHash }).where(eq(users.id, userId));
 
-    return NextResponse.json({ success: true });
-}
\ No newline at end of file
+  return NextResponse.json({ success: true });
+}
diff --git a/frontend/app/api/auth/password-reset/route.ts b/frontend/app/api/auth/password-reset/route.ts
index 4983db81..1055aa70 100644
--- a/frontend/app/api/auth/password-reset/route.ts
+++ b/frontend/app/api/auth/password-reset/route.ts
@@ -1,63 +1,63 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { eq } from "drizzle-orm";
-
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { passwordResetTokens } from "@/db/schema/passwordResetTokens";
-import { createPasswordResetToken } from "@/lib/auth/password-reset";
-import { sendPasswordResetEmail } from "@/lib/email/sendPasswordResetEmail";
-import { headers } from "next/headers";
-import { resolveBaseUrl } from "@/lib/http/getBaseUrl";
+import { eq } from 'drizzle-orm';
+import { headers } from 'next/headers';
+import { NextResponse } from 'next/server';
+import { z } from 'zod';
+
+import { db } from '@/db';
+import { passwordResetTokens } from '@/db/schema/passwordResetTokens';
+import { users } from '@/db/schema/users';
+import { createPasswordResetToken } from '@/lib/auth/password-reset';
+import { sendPasswordResetEmail } from '@/lib/email/sendPasswordResetEmail';
+import { resolveBaseUrl } from '@/lib/http/getBaseUrl';
 
 const schema = z.object({
-    email: z.string().email(),
+  email: z.string().email(),
 });
 
 export async function POST(req: Request) {
-    const body = await req.json().catch(() => null);
-    const parsed = schema.safeParse(body);
+  const body = await req.json().catch(() => null);
+  const parsed = schema.safeParse(body);
 
-    if (!parsed.success) {
-        return NextResponse.json({ success: true });
-    }
-
-    const email = parsed.data.email.toLowerCase();
-
-    const rows = await db
-        .select({
-            id: users.id,
-            provider: users.provider,
-        })
-        .from(users)
-        .where(eq(users.email, email))
-        .limit(1);
-
-    if (rows.length === 0) {
-        return NextResponse.json({ success: true });
-    }
-
-    const user = rows[0];
+  if (!parsed.success) {
+    return NextResponse.json({ success: true });
+  }
 
-    if (user.provider !== "credentials") {
-        return NextResponse.json({ success: true });
-    }
+  const email = parsed.data.email.toLowerCase();
 
-    await db
-        .delete(passwordResetTokens)
-        .where(eq(passwordResetTokens.userId, user.id));
+  const rows = await db
+    .select({
+      id: users.id,
+      provider: users.provider,
+    })
+    .from(users)
+    .where(eq(users.email, email))
+    .limit(1);
 
-    const token = await createPasswordResetToken(user.id);
+  if (rows.length === 0) {
+    return NextResponse.json({ success: true });
+  }
 
-    const h = await headers()
-    const baseUrl = resolveBaseUrl({
-        origin: h.get("origin"),
-        host: h.get("host"),
-    })
+  const user = rows[0];
 
-    await sendPasswordResetEmail({
-        to: email,
-        resetUrl: `${baseUrl}/reset-password?token=${token}`,
-    });
+  if (user.provider !== 'credentials') {
     return NextResponse.json({ success: true });
-}
\ No newline at end of file
+  }
+
+  await db
+    .delete(passwordResetTokens)
+    .where(eq(passwordResetTokens.userId, user.id));
+
+  const token = await createPasswordResetToken(user.id);
+
+  const h = await headers();
+  const baseUrl = resolveBaseUrl({
+    origin: h.get('origin'),
+    host: h.get('host'),
+  });
+
+  await sendPasswordResetEmail({
+    to: email,
+    resetUrl: `${baseUrl}/reset-password?token=${token}`,
+  });
+  return NextResponse.json({ success: true });
+}
diff --git a/frontend/app/api/auth/resend-verification/route.ts b/frontend/app/api/auth/resend-verification/route.ts
index 523af8bc..e548d720 100644
--- a/frontend/app/api/auth/resend-verification/route.ts
+++ b/frontend/app/api/auth/resend-verification/route.ts
@@ -1,71 +1,69 @@
-import { NextResponse } from "next/server";
-import { z } from "zod";
-import { eq } from "drizzle-orm";
-
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { emailVerificationTokens } from "@/db/schema/emailVerificationTokens";
-import { createEmailVerificationToken } from "@/lib/auth/email-verification";
-import { sendVerificationEmail } from "@/lib/email/sendVerificationEmail";
-import { headers } from "next/headers";
-import { resolveBaseUrl } from "@/lib/http/getBaseUrl";
+import { eq } from 'drizzle-orm';
+import { headers } from 'next/headers';
+import { NextResponse } from 'next/server';
+import { z } from 'zod';
+
+import { db } from '@/db';
+import { emailVerificationTokens } from '@/db/schema/emailVerificationTokens';
+import { users } from '@/db/schema/users';
+import { createEmailVerificationToken } from '@/lib/auth/email-verification';
+import { sendVerificationEmail } from '@/lib/email/sendVerificationEmail';
+import { resolveBaseUrl } from '@/lib/http/getBaseUrl';
 
 const schema = z.object({
-    email: z.string().email(),
+  email: z.string().email(),
 });
 
-
-
 export async function POST(req: Request) {
-    const body = await req.json().catch(() => null);
-    const parsed = schema.safeParse(body);
+  const body = await req.json().catch(() => null);
+  const parsed = schema.safeParse(body);
 
-    if (!parsed.success) {
-        return NextResponse.json({ success: true });
-    }
+  if (!parsed.success) {
+    return NextResponse.json({ success: true });
+  }
 
-    const email = parsed.data.email.toLowerCase();
+  const email = parsed.data.email.toLowerCase();
 
-    const rows = await db
-        .select({
-            id: users.id,
-            provider: users.provider,
-            emailVerified: users.emailVerified,
-        })
-        .from(users)
-        .where(eq(users.email, email))
-        .limit(1);
+  const rows = await db
+    .select({
+      id: users.id,
+      provider: users.provider,
+      emailVerified: users.emailVerified,
+    })
+    .from(users)
+    .where(eq(users.email, email))
+    .limit(1);
 
-    if (rows.length === 0) {
-        return NextResponse.json({ success: true });
-    }
+  if (rows.length === 0) {
+    return NextResponse.json({ success: true });
+  }
 
-    const user = rows[0];
+  const user = rows[0];
 
-    if (user.provider !== "credentials") {
-        return NextResponse.json({ success: true });
-    }
+  if (user.provider !== 'credentials') {
+    return NextResponse.json({ success: true });
+  }
 
-    if (user.emailVerified) {
-        return NextResponse.json({ success: true });
-    }
+  if (user.emailVerified) {
+    return NextResponse.json({ success: true });
+  }
 
-    await db
-        .delete(emailVerificationTokens)
-        .where(eq(emailVerificationTokens.userId, user.id));
+  await db
+    .delete(emailVerificationTokens)
+    .where(eq(emailVerificationTokens.userId, user.id));
 
-    const token = await createEmailVerificationToken(user.id);
+  const token = await createEmailVerificationToken(user.id);
 
-    const h = await headers();
-    const baseUrl = resolveBaseUrl({
-        origin: h.get("origin"),
-        host: h.get("host"),
-    });
+  const h = await headers();
+  const baseUrl = resolveBaseUrl({
+    origin: h.get('origin'),
+    host: h.get('host'),
+  });
 
-    await sendVerificationEmail({
-        to: email,
-        verifyUrl: `${baseUrl}/api/auth/verify-email?token=${token}`,
-    });
+  await sendVerificationEmail({
+    to: email,
+    verifyUrl: `${baseUrl}/api/auth/verify-email?token=${token}`,
+  });
 
-    return NextResponse.json({ success: true });
-}
\ No newline at end of file
+  return NextResponse.json({ success: true });
+}
diff --git a/frontend/app/api/auth/signup/route.ts b/frontend/app/api/auth/signup/route.ts
index 1b43ca7a..95ef342d 100644
--- a/frontend/app/api/auth/signup/route.ts
+++ b/frontend/app/api/auth/signup/route.ts
@@ -1,23 +1,21 @@
-import { NextResponse } from "next/server";
-import bcrypt from "bcryptjs";
-import { z } from "zod";
-import { eq } from "drizzle-orm";
+import bcrypt from 'bcryptjs';
+import { eq } from 'drizzle-orm';
+import { headers } from 'next/headers';
+import { NextResponse } from 'next/server';
+import { z } from 'zod';
 
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { createEmailVerificationToken } from "@/lib/auth/email-verification";
-import { sendVerificationEmail } from "@/lib/email/sendVerificationEmail";
-import { headers } from "next/headers";
-import { resolveBaseUrl } from "@/lib/http/getBaseUrl";
-
-
-export const runtime = "nodejs";
+import { db } from '@/db';
+import { users } from '@/db/schema/users';
+import { createEmailVerificationToken } from '@/lib/auth/email-verification';
+import { sendVerificationEmail } from '@/lib/email/sendVerificationEmail';
+import { resolveBaseUrl } from '@/lib/http/getBaseUrl';
 
+export const runtime = 'nodejs';
 
 const signupSchema = z.object({
-  name: z.string().min(1, "Name is required"),
-  email: z.string().email("Invalid email"),
-  password: z.string().min(8, "Password must be at least 8 characters"),
+  name: z.string().min(1, 'Name is required'),
+  email: z.string().email('Invalid email'),
+  password: z.string().min(8, 'Password must be at least 8 characters'),
 });
 
 export async function POST(req: Request) {
@@ -43,7 +41,7 @@ export async function POST(req: Request) {
 
     if (existingUser.length > 0) {
       return NextResponse.json(
-        { error: "Email already in use" },
+        { error: 'Email already in use' },
         { status: 409 }
       );
     }
@@ -56,37 +54,38 @@ export async function POST(req: Request) {
         name,
         email: normalizedEmail,
         passwordHash,
-        provider: "credentials",
+        provider: 'credentials',
         emailVerified: null,
-        role: "user",
+        role: 'user',
       })
       .returning();
 
-    const token = await createEmailVerificationToken(user.id)
+    const token = await createEmailVerificationToken(user.id);
 
     const h = await headers();
     const baseUrl = resolveBaseUrl({
-      origin: h.get("origin"),
-      host: h.get("host"),
+      origin: h.get('origin'),
+      host: h.get('host'),
     });
 
     await sendVerificationEmail({
       to: normalizedEmail,
-      verifyUrl: `${baseUrl}/api/auth/verify-email?token=${token}`
-    })
-
-    return NextResponse.json({
-      success: true,
-      verificationRequired: true
-    }, { status: 201 })
+      verifyUrl: `${baseUrl}/api/auth/verify-email?token=${token}`,
+    });
 
+    return NextResponse.json(
+      {
+        success: true,
+        verificationRequired: true,
+      },
+      { status: 201 }
+    );
   } catch (error) {
-    console.error("Signup failed:", error);
-    const message =
-      error instanceof Error ? error.message : "Unknown error";
+    console.error('Signup failed:', error);
+    const message = error instanceof Error ? error.message : 'Unknown error';
     return NextResponse.json(
-      { error: "Signup failed", details: message },
+      { error: 'Signup failed', details: message },
       { status: 500 }
     );
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/app/api/auth/verify-email/route.ts b/frontend/app/api/auth/verify-email/route.ts
index b03b69ae..d7da3813 100644
--- a/frontend/app/api/auth/verify-email/route.ts
+++ b/frontend/app/api/auth/verify-email/route.ts
@@ -1,58 +1,56 @@
-import { NextRequest, NextResponse } from "next/server";
-import { eq } from "drizzle-orm";
+import { eq } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
 
-import { db } from "@/db";
-import { users } from "@/db/schema/users";
-import { emailVerificationTokens } from "@/db/schema/emailVerificationTokens";
+import { db } from '@/db';
+import { emailVerificationTokens } from '@/db/schema/emailVerificationTokens';
+import { users } from '@/db/schema/users';
 
 export async function GET(req: NextRequest) {
-    const token = req.nextUrl.searchParams.get("token");
-
-    if (!token) {
-        return NextResponse.redirect(
-            new URL("/login?error=invalid_token", req.url)
-        );
-    }
-
-    const now = new Date();
-
-    const rows = await db
-        .select({
-            userId: emailVerificationTokens.userId,
-            expiresAt: emailVerificationTokens.expiresAt,
-        })
-        .from(emailVerificationTokens)
-        .where(eq(emailVerificationTokens.token, token))
-        .limit(1);
-
-    if (rows.length === 0) {
-        return NextResponse.redirect(
-            new URL("/login?error=invalid_token", req.url)
-        );
-    }
-
-    const { userId, expiresAt } = rows[0];
-
-    if (expiresAt < now) {
-        await db
-            .delete(emailVerificationTokens)
-            .where(eq(emailVerificationTokens.token, token));
-
-        return NextResponse.redirect(
-            new URL("/login?error=token_expired", req.url)
-        );
-    }
+  const token = req.nextUrl.searchParams.get('token');
 
-    await db
-        .update(users)
-        .set({ emailVerified: now })
-        .where(eq(users.id, userId));
+  if (!token) {
+    return NextResponse.redirect(
+      new URL('/login?error=invalid_token', req.url)
+    );
+  }
+
+  const now = new Date();
+
+  const rows = await db
+    .select({
+      userId: emailVerificationTokens.userId,
+      expiresAt: emailVerificationTokens.expiresAt,
+    })
+    .from(emailVerificationTokens)
+    .where(eq(emailVerificationTokens.token, token))
+    .limit(1);
+
+  if (rows.length === 0) {
+    return NextResponse.redirect(
+      new URL('/login?error=invalid_token', req.url)
+    );
+  }
+
+  const { userId, expiresAt } = rows[0];
 
+  if (expiresAt < now) {
     await db
-        .delete(emailVerificationTokens)
-        .where(eq(emailVerificationTokens.token, token));
+      .delete(emailVerificationTokens)
+      .where(eq(emailVerificationTokens.token, token));
 
     return NextResponse.redirect(
-        new URL("/login?verified=1", req.url)
+      new URL('/login?error=token_expired', req.url)
     );
-}
\ No newline at end of file
+  }
+
+  await db
+    .update(users)
+    .set({ emailVerified: now })
+    .where(eq(users.id, userId));
+
+  await db
+    .delete(emailVerificationTokens)
+    .where(eq(emailVerificationTokens.token, token));
+
+  return NextResponse.redirect(new URL('/login?verified=1', req.url));
+}
diff --git a/frontend/app/api/blog-author/route.ts b/frontend/app/api/blog-author/route.ts
index 4df84c69..c59cb47b 100644
--- a/frontend/app/api/blog-author/route.ts
+++ b/frontend/app/api/blog-author/route.ts
@@ -1,5 +1,6 @@
 import groq from 'groq';
 import { NextResponse } from 'next/server';
+
 import { client } from '@/client';
 
 export const revalidate = 0;
diff --git a/frontend/app/api/blog-search/route.ts b/frontend/app/api/blog-search/route.ts
index 14eab6bc..bc35755b 100644
--- a/frontend/app/api/blog-search/route.ts
+++ b/frontend/app/api/blog-search/route.ts
@@ -1,5 +1,6 @@
 import groq from 'groq';
 import { NextResponse } from 'next/server';
+
 import { client } from '@/client';
 
 const searchQuery = groq`
diff --git a/frontend/app/api/debug/redis-clear/route.ts b/frontend/app/api/debug/redis-clear/route.ts
new file mode 100644
index 00000000..ce9daf98
--- /dev/null
+++ b/frontend/app/api/debug/redis-clear/route.ts
@@ -0,0 +1,22 @@
+import { NextResponse } from 'next/server';
+
+import { getRedisClient } from '@/lib/redis';
+
+export async function DELETE() {
+  if (process.env.NODE_ENV !== 'development') {
+    return NextResponse.json({ error: 'Dev only' }, { status: 403 });
+  }
+
+  const redis = getRedisClient();
+  if (!redis) {
+    return NextResponse.json({ error: 'No Redis client' }, { status: 500 });
+  }
+
+  const keys = await redis.keys('quiz:answers:*');
+
+  if (keys.length > 0) {
+    await redis.del(...keys);
+  }
+
+  return NextResponse.json({ deleted: keys.length });
+}
diff --git a/frontend/app/api/debug/redis/route.ts b/frontend/app/api/debug/redis/route.ts
new file mode 100644
index 00000000..5ead471a
--- /dev/null
+++ b/frontend/app/api/debug/redis/route.ts
@@ -0,0 +1,27 @@
+import { NextResponse } from 'next/server';
+
+import { getRedisClient } from '@/lib/redis';
+
+export async function GET() {
+  if (process.env.NODE_ENV === 'production') {
+    return NextResponse.json({ error: 'Not available' }, { status: 403 });
+  }
+
+  const redis = getRedisClient();
+  if (!redis) {
+    return NextResponse.json({ error: 'Redis not configured' });
+  }
+
+  const keys = await redis.keys('quiz:answers:*');
+  const data: Record<string, unknown> = {};
+
+  for (const key of keys) {
+    data[key] = await redis.get(key);
+  }
+
+  return NextResponse.json({
+    count: keys.length,
+    keys,
+    data,
+  });
+}
diff --git a/frontend/app/api/questions/[category]/route.ts b/frontend/app/api/questions/[category]/route.ts
index 4817794b..76470c04 100644
--- a/frontend/app/api/questions/[category]/route.ts
+++ b/frontend/app/api/questions/[category]/route.ts
@@ -1,7 +1,8 @@
+import { and, eq, ilike, sql } from 'drizzle-orm';
 import { NextResponse } from 'next/server';
+
 import { db } from '@/db';
 import { categories, questions, questionTranslations } from '@/db/schema';
-import { eq, sql, and, ilike } from 'drizzle-orm';
 import { buildQaCacheKey, getQaCache, setQaCache } from '@/lib/cache/qa';
 
 export const dynamic = 'force-dynamic';
diff --git a/frontend/app/api/quiz/[slug]/route.ts b/frontend/app/api/quiz/[slug]/route.ts
index 0ee7eed1..fdc4fa81 100644
--- a/frontend/app/api/quiz/[slug]/route.ts
+++ b/frontend/app/api/quiz/[slug]/route.ts
@@ -1,4 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
+
 import { getQuizBySlug, getQuizQuestionsRandomized } from '@/db/queries/quiz';
 
 export async function GET(
diff --git a/frontend/app/api/quiz/guest-result/route.ts b/frontend/app/api/quiz/guest-result/route.ts
index eb63df90..15701095 100644
--- a/frontend/app/api/quiz/guest-result/route.ts
+++ b/frontend/app/api/quiz/guest-result/route.ts
@@ -1,23 +1,24 @@
-import { NextResponse } from "next/server";
-import { getCurrentUser } from "@/lib/auth";
-import { db } from "@/db";
+import { eq, inArray } from 'drizzle-orm';
+import { NextResponse } from 'next/server';
+
+import { db } from '@/db';
+import { awardQuizPoints, calculateQuizPoints } from '@/db/queries/points';
 import {
-  quizAttempts,
+  quizAnswers,
   quizAttemptAnswers,
+  quizAttempts,
   quizQuestions,
-  quizAnswers,
-} from "@/db/schema/quiz";
-import { awardQuizPoints, calculateQuizPoints } from "@/db/queries/points";
-import { eq, inArray } from "drizzle-orm";
+} from '@/db/schema/quiz';
+import { getCurrentUser } from '@/lib/auth';
 
-export const runtime = "nodejs";
+export const runtime = 'nodejs';
 
 export async function POST(req: Request) {
   const body = await req.json().catch(() => null);
 
   if (!body) {
     return NextResponse.json(
-      { success: false, error: "Invalid input" },
+      { success: false, error: 'Invalid input' },
       { status: 400 }
     );
   }
@@ -26,7 +27,7 @@ export async function POST(req: Request) {
 
   if (!quizId || !Array.isArray(answers) || answers.length === 0) {
     return NextResponse.json(
-      { success: false, error: "Invalid input" },
+      { success: false, error: 'Invalid input' },
       { status: 400 }
     );
   }
@@ -34,7 +35,7 @@ export async function POST(req: Request) {
   const session = await getCurrentUser();
   if (!session) {
     return NextResponse.json(
-      { success: false, error: "Unauthorized" },
+      { success: false, error: 'Unauthorized' },
       { status: 401 }
     );
   }
@@ -48,14 +49,14 @@ export async function POST(req: Request) {
 
   if (questionRows.length === 0) {
     return NextResponse.json(
-      { success: false, error: "Quiz not found" },
+      { success: false, error: 'Quiz not found' },
       { status: 404 }
     );
   }
 
   if (answers.length !== questionRows.length) {
     return NextResponse.json(
-      { success: false, error: "Invalid input: answers count mismatch" },
+      { success: false, error: 'Invalid input: answers count mismatch' },
       { status: 400 }
     );
   }
@@ -67,21 +68,21 @@ export async function POST(req: Request) {
   for (const answer of answers) {
     if (!answer?.questionId || !answer?.selectedAnswerId) {
       return NextResponse.json(
-        { success: false, error: "Invalid answer payload" },
+        { success: false, error: 'Invalid answer payload' },
         { status: 400 }
       );
     }
 
     if (!questionIdSet.has(answer.questionId)) {
       return NextResponse.json(
-        { success: false, error: "Invalid question in answers" },
+        { success: false, error: 'Invalid question in answers' },
         { status: 400 }
       );
     }
 
     if (seenQuestionIds.has(answer.questionId)) {
       return NextResponse.json(
-        { success: false, error: "Duplicate answer for question" },
+        { success: false, error: 'Duplicate answer for question' },
         { status: 400 }
       );
     }
@@ -101,7 +102,7 @@ export async function POST(req: Request) {
 
   if (answerRows.length !== answerIds.length) {
     return NextResponse.json(
-      { success: false, error: "Invalid answer selection" },
+      { success: false, error: 'Invalid answer selection' },
       { status: 400 }
     );
   }
@@ -116,7 +117,7 @@ export async function POST(req: Request) {
     const record = answerById.get(answer.selectedAnswerId);
     if (!record || record.quizQuestionId !== answer.questionId) {
       return NextResponse.json(
-        { success: false, error: "Answer does not match question" },
+        { success: false, error: 'Answer does not match question' },
         { status: 400 }
       );
     }
@@ -124,7 +125,7 @@ export async function POST(req: Request) {
     if (record.isCorrect) correctAnswersCount++;
 
     attemptAnswers.push({
-      attemptId: "",
+      attemptId: '',
       quizQuestionId: answer.questionId,
       selectedAnswerId: answer.selectedAnswerId,
       isCorrect: record.isCorrect,
@@ -187,10 +188,10 @@ export async function POST(req: Request) {
       pointsAwarded,
     });
   } catch (error) {
-    console.error("Failed to save guest quiz result:", error);
+    console.error('Failed to save guest quiz result:', error);
     return NextResponse.json(
-      { success: false, error: "Failed to save result" },
+      { success: false, error: 'Failed to save result' },
       { status: 500 }
     );
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/app/api/quiz/verify-answer/route.ts b/frontend/app/api/quiz/verify-answer/route.ts
index 775a263e..5d4485c8 100644
--- a/frontend/app/api/quiz/verify-answer/route.ts
+++ b/frontend/app/api/quiz/verify-answer/route.ts
@@ -1,48 +1,48 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { decryptAnswers } from '@/lib/quiz/quiz-crypto';
+import { NextResponse } from 'next/server';
 
-interface VerifyRequest {
-  questionId: string;
-  answerId: string;
-  encryptedAnswers: string;
-}
+import { getCorrectAnswer, getOrCreateQuizAnswersCache } from '@/lib/quiz/quiz-answers-redis';
+
+export const runtime = 'nodejs';
 
-export async function POST(request: NextRequest) {
+export async function POST(req: Request) {
   try {
-    const body: VerifyRequest = await request.json();
-    const { questionId, answerId, encryptedAnswers } = body;
+    const body = await req.json().catch(() => null);
 
-    if (!questionId || !answerId || !encryptedAnswers) {
+    if (!body?.quizId || !body?.questionId || !body?.selectedAnswerId) {
       return NextResponse.json(
-        { error: 'Missing required fields' },
+        { success: false, error: 'Missing required fields' },
         { status: 400 }
       );
     }
 
-    const correctAnswersMap = decryptAnswers(encryptedAnswers);
+    const { quizId, questionId, selectedAnswerId } = body;
 
-    if (!correctAnswersMap) {
-      return NextResponse.json(
-        { error: 'Invalid encrypted data' },
-        { status: 400 }
-      );
-    }
+    let correctAnswerId = await getCorrectAnswer(quizId, questionId);
 
-    const correctAnswerId = correctAnswersMap[questionId];
+    if (!correctAnswerId) {
+      const cacheReady = await getOrCreateQuizAnswersCache(quizId);
+      if (cacheReady) {
+        correctAnswerId = await getCorrectAnswer(quizId, questionId);
+      }
+    }
 
     if (!correctAnswerId) {
       return NextResponse.json(
-        { error: 'Question not found' },
+        { success: false, error: 'Question not found in cache' },
         { status: 404 }
       );
     }
 
+    const isCorrect = selectedAnswerId === correctAnswerId;
+
     return NextResponse.json({
-      isCorrect: answerId === correctAnswerId,
+      success: true,
+      isCorrect,
     });
-  } catch {
+  } catch (error) {
+    console.error('Failed to verify answer:', error);
     return NextResponse.json(
-      { error: 'Internal server error' },
+      { success: false, error: 'Internal server error' },
       { status: 500 }
     );
   }
diff --git a/frontend/app/api/sessions/activity/route.ts b/frontend/app/api/sessions/activity/route.ts
index cce640f9..ee2077ae 100644
--- a/frontend/app/api/sessions/activity/route.ts
+++ b/frontend/app/api/sessions/activity/route.ts
@@ -1,9 +1,10 @@
+import { randomUUID } from 'crypto';
+import { gte, lt, sql } from 'drizzle-orm';
+import { cookies } from 'next/headers';
 import { NextResponse } from 'next/server';
+
 import { db } from '@/db';
 import { activeSessions } from '@/db/schema/sessions';
-import { cookies } from 'next/headers';
-import { randomUUID } from 'crypto';
-import { sql, gte, lt } from 'drizzle-orm';
 
 const SESSION_TIMEOUT_MINUTES = 15;
 
diff --git a/frontend/app/api/shop/admin/orders/[id]/refund/route.ts b/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
index 300372c1..0687fbd0 100644
--- a/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
+++ b/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
@@ -1,17 +1,19 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
+
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
-import { requireAdminCsrf } from '@/lib/security/admin-csrf';
 import { logError, logWarn } from '@/lib/logging';
-import { OrderNotFoundError, InvalidPayloadError } from '@/lib/services/errors';
+import { requireAdminCsrf } from '@/lib/security/admin-csrf';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
+import { InvalidPayloadError, OrderNotFoundError } from '@/lib/services/errors';
 import { refundOrder } from '@/lib/services/orders';
 import { orderIdParamSchema, orderSummarySchema } from '@/lib/validation/shop';
-import { guardBrowserSameOrigin } from '@/lib/security/origin';
 
 function noStoreJson(body: unknown, init?: { status?: number }) {
   const res = NextResponse.json(body, { status: init?.status ?? 200 });
diff --git a/frontend/app/api/shop/admin/orders/[id]/route.ts b/frontend/app/api/shop/admin/orders/[id]/route.ts
index 9c075567..9a67a973 100644
--- a/frontend/app/api/shop/admin/orders/[id]/route.ts
+++ b/frontend/app/api/shop/admin/orders/[id]/route.ts
@@ -1,17 +1,15 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
 
+import { getAdminOrderDetail } from '@/db/queries/shop/admin-orders';
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
-
-import { getAdminOrderDetail } from '@/db/queries/shop/admin-orders';
-
 import { logError, logWarn } from '@/lib/logging';
-
 import { orderIdParamSchema } from '@/lib/validation/shop';
 
 export const runtime = 'nodejs';
diff --git a/frontend/app/api/shop/admin/orders/reconcile-stale/route.ts b/frontend/app/api/shop/admin/orders/reconcile-stale/route.ts
index ca45e0db..bab91044 100644
--- a/frontend/app/api/shop/admin/orders/reconcile-stale/route.ts
+++ b/frontend/app/api/shop/admin/orders/reconcile-stale/route.ts
@@ -1,5 +1,7 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
+
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
@@ -7,13 +9,13 @@ import {
   requireAdminApi,
 } from '@/lib/auth/admin';
 import { logError, logInfo, logWarn } from '@/lib/logging';
-import { restockStalePendingOrders } from '@/lib/services/orders';
 import {
   CSRF_FORM_FIELD,
   isSameOrigin,
   verifyCsrfToken,
 } from '@/lib/security/csrf';
 import { guardBrowserSameOrigin } from '@/lib/security/origin';
+import { restockStalePendingOrders } from '@/lib/services/orders';
 export const runtime = 'nodejs';
 
 function noStoreJson(body: unknown, init?: { status?: number }) {
diff --git a/frontend/app/api/shop/admin/orders/route.ts b/frontend/app/api/shop/admin/orders/route.ts
index 9b3d79f8..155dbed1 100644
--- a/frontend/app/api/shop/admin/orders/route.ts
+++ b/frontend/app/api/shop/admin/orders/route.ts
@@ -1,21 +1,19 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
 import { z } from 'zod';
 
+import { getAdminOrdersPage } from '@/db/queries/shop/admin-orders';
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
-
+import { logError, logWarn } from '@/lib/logging';
 import { requireAdminCsrf } from '@/lib/security/admin-csrf';
 import { guardBrowserSameOrigin } from '@/lib/security/origin';
 
-import { getAdminOrdersPage } from '@/db/queries/shop/admin-orders';
-
-import { logError, logWarn } from '@/lib/logging';
-
 export const runtime = 'nodejs';
 
 function noStoreJson(body: unknown, init?: { status?: number }) {
diff --git a/frontend/app/api/shop/admin/products/[id]/route.ts b/frontend/app/api/shop/admin/products/[id]/route.ts
index e889d186..bbec7e03 100644
--- a/frontend/app/api/shop/admin/products/[id]/route.ts
+++ b/frontend/app/api/shop/admin/products/[id]/route.ts
@@ -1,26 +1,25 @@
 import crypto from 'node:crypto';
+
+import { sql } from 'drizzle-orm';
 import { NextRequest, NextResponse } from 'next/server';
 import { z } from 'zod';
-import { sql } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { parseAdminProductForm } from '@/lib/admin/parseAdminProductForm';
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
-
+import { logError, logWarn } from '@/lib/logging';
+import { requireAdminCsrf } from '@/lib/security/admin-csrf';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
 import {
   InvalidPayloadError,
-  SlugConflictError,
   PriceConfigError,
+  SlugConflictError,
 } from '@/lib/services/errors';
-
-import { requireAdminCsrf } from '@/lib/security/admin-csrf';
-import { guardBrowserSameOrigin } from '@/lib/security/origin';
-
-import { parseAdminProductForm } from '@/lib/admin/parseAdminProductForm';
-import { logError, logWarn } from '@/lib/logging';
-import { db } from '@/db';
 import {
   deleteProduct,
   getAdminProductByIdWithPrices,
diff --git a/frontend/app/api/shop/admin/products/[id]/status/route.ts b/frontend/app/api/shop/admin/products/[id]/status/route.ts
index 3120080a..a96ddd3d 100644
--- a/frontend/app/api/shop/admin/products/[id]/status/route.ts
+++ b/frontend/app/api/shop/admin/products/[id]/status/route.ts
@@ -1,4 +1,5 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
 import { z } from 'zod';
 
@@ -8,11 +9,10 @@ import {
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
+import { ProductNotFoundError } from '@/lib/errors/products';
+import { logError, logWarn } from '@/lib/logging';
 import { requireAdminCsrf } from '@/lib/security/admin-csrf';
 import { guardBrowserSameOrigin } from '@/lib/security/origin';
-
-import { logError, logWarn } from '@/lib/logging';
-import { ProductNotFoundError } from '@/lib/errors/products';
 import { toggleProductStatus } from '@/lib/services/products';
 
 export const runtime = 'nodejs';
diff --git a/frontend/app/api/shop/admin/products/route.ts b/frontend/app/api/shop/admin/products/route.ts
index 5cd78a01..05c00f9b 100644
--- a/frontend/app/api/shop/admin/products/route.ts
+++ b/frontend/app/api/shop/admin/products/route.ts
@@ -1,17 +1,17 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
 
+import { parseAdminProductForm } from '@/lib/admin/parseAdminProductForm';
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
   AdminUnauthorizedError,
   requireAdminApi,
 } from '@/lib/auth/admin';
+import { logError, logWarn } from '@/lib/logging';
 import { requireAdminCsrf } from '@/lib/security/admin-csrf';
 import { guardBrowserSameOrigin } from '@/lib/security/origin';
-
-import { parseAdminProductForm } from '@/lib/admin/parseAdminProductForm';
-import { logError, logWarn } from '@/lib/logging';
 import { InvalidPayloadError, SlugConflictError } from '@/lib/services/errors';
 import { createProduct } from '@/lib/services/products';
 
@@ -298,13 +298,13 @@ export async function POST(request: NextRequest) {
 
       const errCode =
         error instanceof InvalidPayloadError
-          ? (error as any).code ?? 'INVALID_PAYLOAD'
+          ? ((error as any).code ?? 'INVALID_PAYLOAD')
           : error instanceof SlugConflictError
-          ? error.code
-          : error instanceof Error &&
-            error.message === 'Failed to upload image to Cloudinary'
-          ? 'IMAGE_UPLOAD_FAILED'
-          : 'ADMIN_PRODUCT_CREATE_FAILED';
+            ? error.code
+            : error instanceof Error &&
+                error.message === 'Failed to upload image to Cloudinary'
+              ? 'IMAGE_UPLOAD_FAILED'
+              : 'ADMIN_PRODUCT_CREATE_FAILED';
 
       const isExpected =
         error instanceof InvalidPayloadError ||
diff --git a/frontend/app/api/shop/cart/rehydrate/route.ts b/frontend/app/api/shop/cart/rehydrate/route.ts
index 41849b55..d6ce9478 100644
--- a/frontend/app/api/shop/cart/rehydrate/route.ts
+++ b/frontend/app/api/shop/cart/rehydrate/route.ts
@@ -1,11 +1,13 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
+
 import { MoneyValueError } from '@/db/queries/shop/orders';
-import { resolveLocaleAndCurrency } from '@/lib/shop/request-locale';
+import { logError, logInfo, logWarn } from '@/lib/logging';
+import { InvalidPayloadError, PriceConfigError } from '@/lib/services/errors';
 import { rehydrateCartItems } from '@/lib/services/products';
+import { resolveLocaleAndCurrency } from '@/lib/shop/request-locale';
 import { cartRehydratePayloadSchema } from '@/lib/validation/shop';
-import { InvalidPayloadError, PriceConfigError } from '@/lib/services/errors';
-import { logError, logInfo, logWarn } from '@/lib/logging';
 
 function normalizeCartPayload(body: unknown) {
   if (!body || typeof body !== 'object') return body;
diff --git a/frontend/app/api/shop/catalog/route.ts b/frontend/app/api/shop/catalog/route.ts
index 17ef1cbb..1b0ad318 100644
--- a/frontend/app/api/shop/catalog/route.ts
+++ b/frontend/app/api/shop/catalog/route.ts
@@ -1,10 +1,11 @@
 import crypto from 'node:crypto';
+
 import { NextRequest, NextResponse } from 'next/server';
 
-import { getCatalogProducts } from '@/lib/shop/data';
-import { catalogQuerySchema } from '@/lib/validation/shop';
 import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
 import { logError, logWarn } from '@/lib/logging';
+import { getCatalogProducts } from '@/lib/shop/data';
+import { catalogQuerySchema } from '@/lib/validation/shop';
 
 export const runtime = 'nodejs';
 export const dynamic = 'force-dynamic';
diff --git a/frontend/app/api/shop/checkout/route.ts b/frontend/app/api/shop/checkout/route.ts
index 30c3e7e2..030979aa 100644
--- a/frontend/app/api/shop/checkout/route.ts
+++ b/frontend/app/api/shop/checkout/route.ts
@@ -1,35 +1,36 @@
-import { NextRequest, NextResponse } from 'next/server';
 import crypto from 'node:crypto';
+
+import { NextRequest, NextResponse } from 'next/server';
+
+import { MoneyValueError } from '@/db/queries/shop/orders';
+import { getCurrentUser } from '@/lib/auth';
+import { isPaymentsEnabled } from '@/lib/env/stripe';
+import { logError, logWarn } from '@/lib/logging';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
 import {
   enforceRateLimit,
   getRateLimitSubject,
   rateLimitResponse,
 } from '@/lib/security/rate-limit';
-import { getCurrentUser } from '@/lib/auth';
-import { isPaymentsEnabled } from '@/lib/env/stripe';
-import { logError, logWarn } from '@/lib/logging';
-import { resolveRequestLocale } from '@/lib/shop/request-locale';
 import { IdempotencyConflictError } from '@/lib/services/errors';
-import { MoneyValueError } from '@/db/queries/shop/orders';
-import { guardBrowserSameOrigin } from '@/lib/security/origin';
 import {
   InsufficientStockError,
   InvalidPayloadError,
   InvalidVariantError,
-  PriceConfigError,
   OrderStateInvalidError,
+  PriceConfigError,
 } from '@/lib/services/errors';
+import { createOrderWithItems, restockOrder } from '@/lib/services/orders';
+import {
+  ensureStripePaymentIntentForOrder,
+  PaymentAttemptsExhaustedError,
+} from '@/lib/services/orders/payment-attempts';
+import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
+import { resolveRequestLocale } from '@/lib/shop/request-locale';
 import {
   checkoutPayloadSchema,
   idempotencyKeySchema,
 } from '@/lib/validation/shop';
-import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
-import {
-  PaymentAttemptsExhaustedError,
-  ensureStripePaymentIntentForOrder,
-} from '@/lib/services/orders/payment-attempts';
-
-import { createOrderWithItems, restockOrder } from '@/lib/services/orders';
 
 const EXPECTED_BUSINESS_ERROR_CODES = new Set([
   'IDEMPOTENCY_CONFLICT',
diff --git a/frontend/app/api/shop/internal/orders/restock-stale/route.ts b/frontend/app/api/shop/internal/orders/restock-stale/route.ts
index 66fb43b8..256c6436 100644
--- a/frontend/app/api/shop/internal/orders/restock-stale/route.ts
+++ b/frontend/app/api/shop/internal/orders/restock-stale/route.ts
@@ -1,15 +1,17 @@
 import crypto from 'node:crypto';
-import { NextRequest, NextResponse } from 'next/server';
+
 import { sql } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
+
 import { db } from '@/db';
+import { requireInternalJanitorAuth } from '@/lib/auth/internal-janitor';
+import { logError, logInfo, logWarn } from '@/lib/logging';
+import { guardNonBrowserOnly } from '@/lib/security/origin';
 import {
-  restockStalePendingOrders,
   restockStaleNoPaymentOrders,
+  restockStalePendingOrders,
   restockStuckReservingOrders,
 } from '@/lib/services/orders';
-import { requireInternalJanitorAuth } from '@/lib/auth/internal-janitor';
-import { logError, logInfo, logWarn } from '@/lib/logging';
-import { guardNonBrowserOnly } from '@/lib/security/origin';
 
 export const runtime = 'nodejs';
 
diff --git a/frontend/app/api/shop/orders/[id]/route.ts b/frontend/app/api/shop/orders/[id]/route.ts
index d86b6e1d..4708903d 100644
--- a/frontend/app/api/shop/orders/[id]/route.ts
+++ b/frontend/app/api/shop/orders/[id]/route.ts
@@ -1,12 +1,15 @@
 import 'server-only';
+
 import crypto from 'node:crypto';
-import { orderIdParamSchema } from '@/lib/validation/shop';
-import { logError, logWarn } from '@/lib/logging';
-import { NextRequest, NextResponse } from 'next/server';
+
 import { and, eq } from 'drizzle-orm';
+import { NextRequest, NextResponse } from 'next/server';
+
 import { db } from '@/db';
 import { orderItems, orders } from '@/db/schema';
 import { getCurrentUser } from '@/lib/auth';
+import { logError, logWarn } from '@/lib/logging';
+import { orderIdParamSchema } from '@/lib/validation/shop';
 
 export const dynamic = 'force-dynamic';
 
@@ -196,14 +199,13 @@ export async function GET(
 
     return noStoreJson({ success: true, order: response }, { status: 200 });
   } catch (error) {
-        logError('public_order_detail_failed', error, {
+    logError('public_order_detail_failed', error, {
       ...baseMeta,
       orderId: orderIdForLog,
       code: 'PUBLIC_ORDER_DETAIL_FAILED',
       durationMs: Date.now() - startedAtMs,
     });
 
-
     return noStoreJson(
       { code: 'INTERNAL_ERROR', error: 'internal_error' },
       { status: 500 }
diff --git a/frontend/app/api/shop/webhooks/stripe/route.ts b/frontend/app/api/shop/webhooks/stripe/route.ts
index 73671d9a..e8eaed02 100644
--- a/frontend/app/api/shop/webhooks/stripe/route.ts
+++ b/frontend/app/api/shop/webhooks/stripe/route.ts
@@ -1,25 +1,27 @@
-import Stripe from 'stripe';
 import crypto from 'node:crypto';
+
+import { and, eq, isNull, lt, ne, or } from 'drizzle-orm';
 import { NextRequest, NextResponse } from 'next/server';
-import { and, eq, ne, or, isNull, lt } from 'drizzle-orm';
+import Stripe from 'stripe';
+
 import { db } from '@/db';
-import { verifyWebhookSignature, retrieveCharge } from '@/lib/psp/stripe';
 import { orders, stripeEvents } from '@/db/schema';
-import { restockOrder } from '@/lib/services/orders';
-import { guardedPaymentStatusUpdate } from '@/lib/services/orders/payment-state';
 import { logError, logInfo, logWarn } from '@/lib/logging';
-import {
-  type RefundMetaRecord,
-  appendRefundToMeta,
-} from '@/lib/services/orders/psp-metadata/refunds';
-import { markStripeAttemptFinal } from '@/lib/services/orders/payment-attempts';
+import { retrieveCharge, verifyWebhookSignature } from '@/lib/psp/stripe';
+import { guardNonBrowserOnly } from '@/lib/security/origin';
 import {
   enforceRateLimit,
   getRateLimitSubject,
   rateLimitResponse,
 } from '@/lib/security/rate-limit';
 import { resolveStripeWebhookRateLimit } from '@/lib/security/stripe-webhook-rate-limit';
-import { guardNonBrowserOnly } from '@/lib/security/origin';
+import { restockOrder } from '@/lib/services/orders';
+import { markStripeAttemptFinal } from '@/lib/services/orders/payment-attempts';
+import { guardedPaymentStatusUpdate } from '@/lib/services/orders/payment-state';
+import {
+  appendRefundToMeta,
+  type RefundMetaRecord,
+} from '@/lib/services/orders/psp-metadata/refunds';
 
 const REFUND_FULLNESS_UNDETERMINED = 'REFUND_FULLNESS_UNDETERMINED' as const;
 
@@ -1518,9 +1520,14 @@ export async function POST(request: NextRequest) {
             isNull(stripeEvents.processedAt)
           )
         );
-    } catch {
-      // best-effort
+    } catch (err) {
+      logWarn('stripe_webhook_claim_release_failed', {
+        ...eventMeta(),
+        code: 'CLAIM_RELEASE_FAILED',
+        message: err instanceof Error ? err.message : String(err),
+      });
     }
+
     return noStoreJson({ error: 'internal_error' }, { status: 500 });
   }
 }
diff --git a/frontend/app/api/stats/route.ts b/frontend/app/api/stats/route.ts
index 15e7e636..71fe093c 100644
--- a/frontend/app/api/stats/route.ts
+++ b/frontend/app/api/stats/route.ts
@@ -1,4 +1,5 @@
 import { NextResponse } from 'next/server';
+
 import { getPlatformStats } from '@/lib/about/stats';
 
 export async function GET() {
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index b5bc6b4f..2c79d2d1 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -1,9 +1,12 @@
+import './globals.css';
+
 import type { Metadata } from 'next';
 import { Geist, Geist_Mono } from 'next/font/google';
 import { Analytics } from '@vercel/analytics/next';
 import { SpeedInsights } from '@vercel/speed-insights/next';
 import './globals.css';
 
+
 export const metadata: Metadata = {
   icons: {
     icon: [
@@ -57,7 +60,7 @@ export default function RootLayout({
       </head>
       <body
         suppressHydrationWarning
-        className={`${geistSans.variable} ${geistMono.variable} antialiased bg-gray-50 text-gray-900 dark:bg-neutral-950 dark:text-gray-100 transition-colors duration-300`}
+        className={`${geistSans.variable} ${geistMono.variable} bg-gray-50 text-gray-900 antialiased transition-colors duration-300 dark:bg-neutral-950 dark:text-gray-100`}
       >
         {children}
         <Analytics />
diff --git a/frontend/app/not-found.tsx b/frontend/app/not-found.tsx
index e08cf31b..aa61e857 100644
--- a/frontend/app/not-found.tsx
+++ b/frontend/app/not-found.tsx
@@ -1,8 +1,8 @@
 import { cookies } from 'next/headers';
 
-import ukMessages from '@/messages/uk.json';
 import enMessages from '@/messages/en.json';
 import plMessages from '@/messages/pl.json';
+import ukMessages from '@/messages/uk.json';
 
 type Locale = 'uk' | 'en' | 'pl';
 
@@ -24,48 +24,50 @@ export default async function NotFound() {
   const t = messages[locale];
 
   return (
-    <main className="relative min-h-screen flex items-center justify-center overflow-hidden bg-background transition-colors duration-300">
+    <main className="bg-background relative flex min-h-screen items-center justify-center overflow-hidden transition-colors duration-300">
       <div className="pointer-events-none absolute inset-0 opacity-60">
         <div className="absolute -top-32 left-1/2 h-96 w-[36rem] -translate-x-1/2 rounded-full bg-[var(--accent-primary)]/20 blur-3xl" />
         <div className="absolute bottom-[-12rem] left-1/4 h-[22rem] w-[22rem] rounded-full bg-[var(--accent-hover)]/15 blur-3xl" />
-        <div className="absolute bottom-[-10rem] right-0 h-[26rem] w-[26rem] rounded-full bg-[var(--accent-primary)]/25 blur-3xl" />
+        <div className="absolute right-0 bottom-[-10rem] h-[26rem] w-[26rem] rounded-full bg-[var(--accent-primary)]/25 blur-3xl" />
       </div>
 
       <div className="pointer-events-none absolute inset-0 opacity-40 dark:opacity-60">
-        <span className="absolute left-[10%] top-[18%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute left-[35%] top-[8%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute left-[70%] top-[16%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute left-[80%] top-[40%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute left-[18%] top-[60%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[18%] left-[10%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[8%] left-[35%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
+        <span className="absolute top-[16%] left-[70%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[40%] left-[80%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
+        <span className="absolute top-[60%] left-[18%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
       </div>
 
-      <div className="relative z-10 text-center px-6 py-12">
-        <div className="relative inline-block mt-4">
-          <h1 className="text-4xl sm:text-5xl md:text-6xl lg:text-7xl xl:text-8xl font-black tracking-tight">
+      <div className="relative z-10 px-6 py-12 text-center">
+        <div className="relative mt-4 inline-block">
+          <h1 className="text-4xl font-black tracking-tight sm:text-5xl md:text-6xl lg:text-7xl xl:text-8xl">
             <span className="relative inline-block bg-gradient-to-r from-[var(--accent-primary)]/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-[var(--accent-hover)]/70 bg-clip-text text-transparent">
               DevL
             </span>
-            <span className="relative inline-block text-red-500 text-[1em] leading-none" style={{ verticalAlign: 'baseline' }}>
+            <span
+              className="relative inline-block text-[1em] leading-none text-red-500"
+              style={{ verticalAlign: 'baseline' }}
+            >
               Ø
             </span>
             <span className="relative inline-block bg-gradient-to-r from-[var(--accent-primary)]/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-[var(--accent-hover)]/70 bg-clip-text text-transparent">
               vers
             </span>
-
           </h1>
         </div>
 
-        <h2 className="mt-6 text-2xl md:text-3xl font-bold text-foreground">
+        <h2 className="text-foreground mt-6 text-2xl font-bold md:text-3xl">
           {t.title}
         </h2>
 
-        <p className="mt-4 max-w-md mx-auto text-muted-foreground">
+        <p className="text-muted-foreground mx-auto mt-4 max-w-md">
           {t.description}
         </p>
 
         <a
           href={`/${locale}`}
-          className="mt-8 inline-flex items-center justify-center rounded-full bg-[var(--accent-primary)] hover:bg-[var(--accent-hover)] px-6 py-3 text-sm font-medium text-white transition-colors"
+          className="mt-8 inline-flex items-center justify-center rounded-full bg-[var(--accent-primary)] px-6 py-3 text-sm font-medium text-white transition-colors hover:bg-[var(--accent-hover)]"
         >
           {t.backHome}
         </a>
diff --git a/frontend/client.ts b/frontend/client.ts
index 45ad6da9..3085f871 100644
--- a/frontend/client.ts
+++ b/frontend/client.ts
@@ -1,8 +1,8 @@
-import { createClient } from "@sanity/client";
+import { createClient } from '@sanity/client';
 
 export const client = createClient({
-  projectId: "6y9ive6v",
-  dataset: "production",
+  projectId: '6y9ive6v',
+  dataset: 'production',
   useCdn: false,
-  apiVersion: "2025-11-29",
+  apiVersion: '2025-11-29',
 });
diff --git a/frontend/components/about/CommunitySection.tsx b/frontend/components/about/CommunitySection.tsx
index 91c38756..619f33e1 100644
--- a/frontend/components/about/CommunitySection.tsx
+++ b/frontend/components/about/CommunitySection.tsx
@@ -1,109 +1,101 @@
-"use client"
+'use client';
 
-import { Github, ArrowRight, ExternalLink, MessageCircle } from "lucide-react"
-import Link from "next/link"
-import { useTranslations } from "next-intl"
-import { TESTIMONIALS, type Testimonial } from "@/data/about"
-import { GradientBadge } from "@/components/ui/gradient-badge"
-import { SectionHeading } from "@/components/ui/section-heading"
+import { ArrowRight, ExternalLink, Github, MessageCircle } from 'lucide-react';
+import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+
+import { GradientBadge } from '@/components/ui/gradient-badge';
+import { SectionHeading } from '@/components/ui/section-heading';
+import { type Testimonial, TESTIMONIALS } from '@/data/about';
 
 export function CommunitySection() {
-  const t = useTranslations("about.community")
+  const t = useTranslations('about.community');
 
   return (
-    <section className="w-full py-20 lg:py-28 relative overflow-hidden bg-gray-50 dark:bg-transparent">
-
-        <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[300px] h-[300px] bg-[#1e5eff]/5 dark:bg-[#ff2d55]/5 blur-[80px] rounded-full pointer-events-none" />
-
-        <div className="w-full relative z-10">
+    <section className="relative w-full overflow-hidden bg-gray-50 py-20 lg:py-28 dark:bg-transparent">
+      <div className="pointer-events-none absolute top-1/2 left-1/2 h-[300px] w-[300px] -translate-x-1/2 -translate-y-1/2 rounded-full bg-[#1e5eff]/5 blur-[80px] dark:bg-[#ff2d55]/5" />
+
+      <div className="relative z-10 w-full">
+        <div className="container-main mb-12 text-center">
+          <GradientBadge
+            icon={MessageCircle}
+            text={t('badge')}
+            className="mb-4"
+          />
+
+          <SectionHeading
+            title={t('title')}
+            highlight={t('titleHighlight')}
+            subtitle={t('subtitle')}
+            className="mb-0"
+          />
+        </div>
 
-            <div className="container-main mb-12 text-center">
-                <GradientBadge icon={MessageCircle} text={t("badge")} className="mb-4" />
+        <div className="pause-on-hover relative mb-8 w-full md:mb-16">
+          <div className="dark:from-background pointer-events-none absolute top-0 left-0 z-10 h-full w-12 bg-gradient-to-r from-gray-50 to-transparent md:w-32" />
+          <div className="dark:from-background pointer-events-none absolute top-0 right-0 z-10 h-full w-12 bg-gradient-to-l from-gray-50 to-transparent md:w-32" />
 
-                <SectionHeading
-                    title={t("title")}
-                    highlight={t("titleHighlight")}
-                    subtitle={t("subtitle")}
-                    className="mb-0"
-                />
+          <div className="flex w-max min-w-full">
+            <div className="animate-scroll flex shrink-0 gap-4 px-2">
+              {TESTIMONIALS.map((testimonial, index) => (
+                <TestimonialCard key={`loop1-${index}`} {...testimonial} />
+              ))}
             </div>
-
-            <div className="relative w-full pause-on-hover mb-8 md:mb-16">
-
-                <div className="pointer-events-none absolute left-0 top-0 z-10 h-full w-12 md:w-32 bg-gradient-to-r from-gray-50 dark:from-background to-transparent" />
-                <div className="pointer-events-none absolute right-0 top-0 z-10 h-full w-12 md:w-32 bg-gradient-to-l from-gray-50 dark:from-background to-transparent" />
-
-                <div className="flex w-max min-w-full">
-                    <div className="flex shrink-0 gap-4 px-2 animate-scroll">
-                        {TESTIMONIALS.map((testimonial, index) => (
-                            <TestimonialCard key={`loop1-${index}`} {...testimonial} />
-                        ))}
-                    </div>
-                    <div className="flex shrink-0 gap-4 px-2 animate-scroll" aria-hidden="true">
-                        {TESTIMONIALS.map((testimonial, index) => (
-                            <TestimonialCard key={`loop2-${index}`} {...testimonial} />
-                        ))}
-                    </div>
-                </div>
+            <div
+              className="animate-scroll flex shrink-0 gap-4 px-2"
+              aria-hidden="true"
+            >
+              {TESTIMONIALS.map((testimonial, index) => (
+                <TestimonialCard key={`loop2-${index}`} {...testimonial} />
+              ))}
             </div>
+          </div>
+        </div>
 
-            <div className="container-main text-center">
-                <div className="flex flex-col items-center gap-2 md:hidden">
-                    <Link
-                        href="https://github.com/DevLoversTeam/devlovers.net/discussions"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="group inline-flex items-center gap-1.5 px-4 py-2 rounded-full
-                            border border-gray-200 dark:border-white/10
-                            bg-white/50 dark:bg-white/5
-                            text-[10px] font-bold uppercase tracking-wider
-                            text-gray-700 dark:text-gray-300
-                            transition-all duration-300
-                            hover:border-[#1e5eff]/40 dark:hover:border-[#ff2d55]/40
-                            hover:text-[#1e5eff] dark:hover:text-[#ff2d55]"
-                    >
-                        <Github size={12} />
-                        {t("joinDiscussion")}
-                        <ArrowRight size={10} className="group-hover:translate-x-0.5 transition-transform" />
-                    </Link>
-                </div>
-
-                <Link
-                    href="https://github.com/DevLoversTeam/devlovers.net/discussions"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="group relative hidden md:inline-flex items-center justify-center gap-4 p-1.5 pl-6 pr-1.5 rounded-full
-                    bg-white dark:bg-white/5 border border-gray-200 dark:border-white/10
-                    transition-all duration-300 ease-out
-                    hover:scale-[1.02]
-                    hover:border-[#1e5eff]/50 dark:hover:border-[#ff2d55]/50
-                    hover:shadow-[0_0_30px_-5px_rgba(30,94,255,0.15)] dark:hover:shadow-[0_0_30px_-5px_rgba(255,45,85,0.15)]"
-                >
-                    <span className="text-sm text-gray-700 dark:text-gray-200 font-medium">
-                        {t("successStory")}
-                    </span>
-
-                    <span className="flex items-center gap-2 px-5 py-2.5 rounded-full
-                        bg-gray-900 dark:bg-white text-white dark:text-black
-                        text-xs font-bold uppercase tracking-wider
-                        transition-all duration-300
-                        group-hover:bg-[#1e5eff] dark:group-hover:bg-[#ff2d55]
-                        group-hover:text-white dark:group-hover:text-white"
-                    >
-                        <Github size={14} />
-                        {t("joinDiscussion")}
-                        <ArrowRight size={12} className="group-hover:translate-x-1 transition-transform" />
-                    </span>
-                </Link>
-
-                <p className="mt-3 md:mt-6 text-[8px] md:text-[10px] text-gray-400 dark:text-gray-600 uppercase tracking-widest md:font-bold md:opacity-60 opacity-70">
-                    {t("readThreads")}
-                </p>
-            </div>
+        <div className="container-main text-center">
+          <div className="flex flex-col items-center gap-2 md:hidden">
+            <Link
+              href="https://github.com/DevLoversTeam/devlovers.net/discussions"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="group inline-flex items-center gap-1.5 rounded-full border border-gray-200 bg-white/50 px-4 py-2 text-[10px] font-bold tracking-wider text-gray-700 uppercase transition-all duration-300 hover:border-[#1e5eff]/40 hover:text-[#1e5eff] dark:border-white/10 dark:bg-white/5 dark:text-gray-300 dark:hover:border-[#ff2d55]/40 dark:hover:text-[#ff2d55]"
+            >
+              <Github size={12} />
+              {t('joinDiscussion')}
+              <ArrowRight
+                size={10}
+                className="transition-transform group-hover:translate-x-0.5"
+              />
+            </Link>
+          </div>
 
+          <Link
+            href="https://github.com/DevLoversTeam/devlovers.net/discussions"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="group relative hidden items-center justify-center gap-4 rounded-full border border-gray-200 bg-white p-1.5 pr-1.5 pl-6 transition-all duration-300 ease-out hover:scale-[1.02] hover:border-[#1e5eff]/50 hover:shadow-[0_0_30px_-5px_rgba(30,94,255,0.15)] md:inline-flex dark:border-white/10 dark:bg-white/5 dark:hover:border-[#ff2d55]/50 dark:hover:shadow-[0_0_30px_-5px_rgba(255,45,85,0.15)]"
+          >
+            <span className="text-sm font-medium text-gray-700 dark:text-gray-200">
+              {t('successStory')}
+            </span>
+
+            <span className="flex items-center gap-2 rounded-full bg-gray-900 px-5 py-2.5 text-xs font-bold tracking-wider text-white uppercase transition-all duration-300 group-hover:bg-[#1e5eff] group-hover:text-white dark:bg-white dark:text-black dark:group-hover:bg-[#ff2d55] dark:group-hover:text-white">
+              <Github size={14} />
+              {t('joinDiscussion')}
+              <ArrowRight
+                size={12}
+                className="transition-transform group-hover:translate-x-1"
+              />
+            </span>
+          </Link>
+
+          <p className="mt-3 text-[8px] tracking-widest text-gray-400 uppercase opacity-70 md:mt-6 md:text-[10px] md:font-bold md:opacity-60 dark:text-gray-600">
+            {t('readThreads')}
+          </p>
+        </div>
       </div>
     </section>
-  )
+  );
 }
 
 function TestimonialCard({
@@ -113,33 +105,39 @@ function TestimonialCard({
   content,
   platform,
   icon: Icon,
-  color
+  color,
 }: Testimonial) {
   return (
-    <div className="w-[280px] md:w-[320px] shrink-0 rounded-xl border border-gray-200 dark:border-white/10 bg-white/10 dark:bg-neutral-900/10 backdrop-blur-md p-5 shadow-sm hover:shadow-md transition-all duration-300 hover:border-gray-300 dark:hover:border-white/20 hover:-translate-y-1">
+    <div className="w-[280px] shrink-0 rounded-xl border border-gray-200 bg-white/10 p-5 shadow-sm backdrop-blur-md transition-all duration-300 hover:-translate-y-1 hover:border-gray-300 hover:shadow-md md:w-[320px] dark:border-white/10 dark:bg-neutral-900/10 dark:hover:border-white/20">
       <div className="mb-3 flex items-start justify-between">
         <div className="flex items-center gap-3">
-          <div className="flex h-9 w-9 items-center justify-center rounded-full bg-gray-100 dark:bg-white/10 border border-gray-200 dark:border-white/5 text-xs font-bold text-gray-700 dark:text-gray-200">
+          <div className="flex h-9 w-9 items-center justify-center rounded-full border border-gray-200 bg-gray-100 text-xs font-bold text-gray-700 dark:border-white/5 dark:bg-white/10 dark:text-gray-200">
             {avatar}
           </div>
           <div>
-            <div className="font-bold text-gray-900 dark:text-white text-sm leading-none mb-1">{name}</div>
-            <div className="text-[10px] uppercase tracking-wide text-gray-500 font-medium">{role}</div>
+            <div className="mb-1 text-sm leading-none font-bold text-gray-900 dark:text-white">
+              {name}
+            </div>
+            <div className="text-[10px] font-medium tracking-wide text-gray-500 uppercase">
+              {role}
+            </div>
           </div>
         </div>
 
-        <div className={`flex h-7 w-7 items-center justify-center rounded-full ${color}`}>
+        <div
+          className={`flex h-7 w-7 items-center justify-center rounded-full ${color}`}
+        >
           <Icon size={12} />
         </div>
       </div>
 
-      <p className="text-sm leading-relaxed text-gray-600 dark:text-gray-300 font-normal">
+      <p className="text-sm leading-relaxed font-normal text-gray-600 dark:text-gray-300">
         &quot;{content}&quot;
       </p>
 
-      <div className="mt-3 text-[10px] text-gray-400 dark:text-gray-600 font-mono flex items-center gap-1">
+      <div className="mt-3 flex items-center gap-1 font-mono text-[10px] text-gray-400 dark:text-gray-600">
         via {platform} <ExternalLink size={8} />
       </div>
     </div>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/frontend/components/about/FeaturesSection.tsx b/frontend/components/about/FeaturesSection.tsx
index 093bd2c9..2dedfa1e 100644
--- a/frontend/components/about/FeaturesSection.tsx
+++ b/frontend/components/about/FeaturesSection.tsx
@@ -1,418 +1,683 @@
-"use client"
+'use client';
 
-import { useState, useEffect } from "react"
-import { motion, AnimatePresence, useReducedMotion } from "framer-motion"
-import { Link } from "@/i18n/routing"
-import { useTranslations } from "next-intl"
+import { AnimatePresence, motion, useReducedMotion } from 'framer-motion';
 import {
-    MessageCircle, Brain, Trophy, User, ShoppingBag, BookOpen,
-    Globe, Cpu, Shield, Languages, Clock, Lightbulb, Target,
-    Medal, Users, Flame, Zap, BarChart3, TrendingUp, Tag, History,
-    CreditCard, Package, Sparkles, PenTool, CalendarDays,
-    Search, Save, Activity, UserCircle, Bell,
-    LucideIcon
-} from "lucide-react"
-import { SectionHeading } from "@/components/ui/section-heading"
+  Activity,
+  BarChart3,
+  Bell,
+  BookOpen,
+  Brain,
+  CalendarDays,
+  Clock,
+  Cpu,
+  CreditCard,
+  Flame,
+  Globe,
+  History,
+  Languages,
+  Lightbulb,
+  LucideIcon,
+  Medal,
+  MessageCircle,
+  Package,
+  PenTool,
+  Save,
+  Search,
+  Shield,
+  ShoppingBag,
+  Sparkles,
+  Tag,
+  Target,
+  TrendingUp,
+  Trophy,
+  User,
+  UserCircle,
+  Users,
+  Zap,
+} from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
+
+import { SectionHeading } from '@/components/ui/section-heading';
+import { Link } from '@/i18n/routing';
 
 interface Feature {
-    icon: LucideIcon
-    labelKey: string
-    descKey: string
-    x: number
-    y: number
-    size: number
+  icon: LucideIcon;
+  labelKey: string;
+  descKey: string;
+  x: number;
+  y: number;
+  size: number;
 }
 
 interface Page {
-    id: string
-    icon: LucideIcon
-    href: string
-    features: Feature[]
+  id: string;
+  icon: LucideIcon;
+  href: string;
+  features: Feature[];
 }
 
 const decorativeDots = [
-    { x: '5%', y: '20%', size: 8 },
-    { x: '10%', y: '75%', size: 6 },
-    { x: '18%', y: '40%', size: 5 },
-    { x: '92%', y: '25%', size: 7 },
-    { x: '88%', y: '70%', size: 6 },
-    { x: '82%', y: '45%', size: 5 },
-    { x: '7%', y: '55%', size: 7 },
-    { x: '95%', y: '55%', size: 8 },
-    { x: '15%', y: '85%', size: 6 },
-    { x: '85%', y: '15%', size: 5 },
-    { x: '3%', y: '35%', size: 6 },
-    { x: '97%', y: '80%', size: 7 },
-]
+  { x: '5%', y: '20%', size: 8 },
+  { x: '10%', y: '75%', size: 6 },
+  { x: '18%', y: '40%', size: 5 },
+  { x: '92%', y: '25%', size: 7 },
+  { x: '88%', y: '70%', size: 6 },
+  { x: '82%', y: '45%', size: 5 },
+  { x: '7%', y: '55%', size: 7 },
+  { x: '95%', y: '55%', size: 8 },
+  { x: '15%', y: '85%', size: 6 },
+  { x: '85%', y: '15%', size: 5 },
+  { x: '3%', y: '35%', size: 6 },
+  { x: '97%', y: '80%', size: 7 },
+];
 
 const pages: Page[] = [
-    {
-        id: "qa",
-        icon: MessageCircle,
-        href: "/q&a",
-        features: [
-            { icon: Globe, labelKey: "bubbles.qa.languages.label", descKey: "bubbles.qa.languages.desc", x: -120, y: -120, size: 88 },
-            { icon: Cpu, labelKey: "bubbles.qa.aiHelper.label", descKey: "bubbles.qa.aiHelper.desc", x: 120, y: -120, size: 88 },
-            { icon: Lightbulb, labelKey: "bubbles.qa.smartCache.label", descKey: "bubbles.qa.smartCache.desc", x: -120, y: 120, size: 88 },
-            { icon: Search, labelKey: "bubbles.qa.techFilter.label", descKey: "bubbles.qa.techFilter.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-    {
-        id: "quiz",
-        icon: Brain,
-        href: "/quizzes",
-        features: [
-            { icon: Clock, labelKey: "bubbles.quiz.smartTimer.label", descKey: "bubbles.quiz.smartTimer.desc", x: -120, y: -120, size: 88 },
-            { icon: Shield, labelKey: "bubbles.quiz.antiCheat.label", descKey: "bubbles.quiz.antiCheat.desc", x: 120, y: -120, size: 88 },
-            { icon: Save, labelKey: "bubbles.quiz.autoSync.label", descKey: "bubbles.quiz.autoSync.desc", x: -120, y: 120, size: 88 },
-            { icon: BarChart3, labelKey: "bubbles.quiz.tracking.label", descKey: "bubbles.quiz.tracking.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-    {
-        id: "leaderboard",
-        icon: Trophy,
-        href: "/leaderboard",
-        features: [
-            { icon: Medal, labelKey: "bubbles.leaderboard.podium.label", descKey: "bubbles.leaderboard.podium.desc", x: -120, y: -120, size: 88 },
-            { icon: Globe, labelKey: "bubbles.leaderboard.globalRank.label", descKey: "bubbles.leaderboard.globalRank.desc", x: 120, y: -120, size: 88 },
-            { icon: Zap, labelKey: "bubbles.leaderboard.xpSystem.label", descKey: "bubbles.leaderboard.xpSystem.desc", x: -120, y: 120, size: 88 },
-            { icon: Activity, labelKey: "bubbles.leaderboard.liveFeed.label", descKey: "bubbles.leaderboard.liveFeed.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-    {
-        id: "profile",
-        icon: User,
-        href: "/dashboard",
-        features: [
-            { icon: BarChart3, labelKey: "bubbles.profile.statsHub.label", descKey: "bubbles.profile.statsHub.desc", x: -120, y: -120, size: 88 },
-            { icon: History, labelKey: "bubbles.profile.history.label", descKey: "bubbles.profile.history.desc", x: 120, y: -120, size: 88 },
-            { icon: UserCircle, labelKey: "bubbles.profile.identity.label", descKey: "bubbles.profile.identity.desc", x: -120, y: 120, size: 88 },
-            { icon: Bell, labelKey: "bubbles.profile.reminders.label", descKey: "bubbles.profile.reminders.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-    {
-        id: "blog",
+  {
+    id: 'qa',
+    icon: MessageCircle,
+    href: '/q&a',
+    features: [
+      {
+        icon: Globe,
+        labelKey: 'bubbles.qa.languages.label',
+        descKey: 'bubbles.qa.languages.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Cpu,
+        labelKey: 'bubbles.qa.aiHelper.label',
+        descKey: 'bubbles.qa.aiHelper.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Lightbulb,
+        labelKey: 'bubbles.qa.smartCache.label',
+        descKey: 'bubbles.qa.smartCache.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: Search,
+        labelKey: 'bubbles.qa.techFilter.label',
+        descKey: 'bubbles.qa.techFilter.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+  {
+    id: 'quiz',
+    icon: Brain,
+    href: '/quizzes',
+    features: [
+      {
+        icon: Clock,
+        labelKey: 'bubbles.quiz.smartTimer.label',
+        descKey: 'bubbles.quiz.smartTimer.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Shield,
+        labelKey: 'bubbles.quiz.antiCheat.label',
+        descKey: 'bubbles.quiz.antiCheat.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Save,
+        labelKey: 'bubbles.quiz.autoSync.label',
+        descKey: 'bubbles.quiz.autoSync.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: BarChart3,
+        labelKey: 'bubbles.quiz.tracking.label',
+        descKey: 'bubbles.quiz.tracking.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+  {
+    id: 'leaderboard',
+    icon: Trophy,
+    href: '/leaderboard',
+    features: [
+      {
+        icon: Medal,
+        labelKey: 'bubbles.leaderboard.podium.label',
+        descKey: 'bubbles.leaderboard.podium.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Globe,
+        labelKey: 'bubbles.leaderboard.globalRank.label',
+        descKey: 'bubbles.leaderboard.globalRank.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Zap,
+        labelKey: 'bubbles.leaderboard.xpSystem.label',
+        descKey: 'bubbles.leaderboard.xpSystem.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: Activity,
+        labelKey: 'bubbles.leaderboard.liveFeed.label',
+        descKey: 'bubbles.leaderboard.liveFeed.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+  {
+    id: 'profile',
+    icon: User,
+    href: '/dashboard',
+    features: [
+      {
+        icon: BarChart3,
+        labelKey: 'bubbles.profile.statsHub.label',
+        descKey: 'bubbles.profile.statsHub.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: History,
+        labelKey: 'bubbles.profile.history.label',
+        descKey: 'bubbles.profile.history.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: UserCircle,
+        labelKey: 'bubbles.profile.identity.label',
+        descKey: 'bubbles.profile.identity.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: Bell,
+        labelKey: 'bubbles.profile.reminders.label',
+        descKey: 'bubbles.profile.reminders.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+  {
+    id: 'blog',
+    icon: BookOpen,
+    href: '/blog',
+    features: [
+      {
+        icon: TrendingUp,
+        labelKey: 'bubbles.blog.techTrends.label',
+        descKey: 'bubbles.blog.techTrends.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: PenTool,
+        labelKey: 'bubbles.blog.tutorials.label',
+        descKey: 'bubbles.blog.tutorials.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
         icon: BookOpen,
-        href: "/blog",
-        features: [
-            { icon: TrendingUp, labelKey: "bubbles.blog.techTrends.label", descKey: "bubbles.blog.techTrends.desc", x: -120, y: -120, size: 88 },
-            { icon: PenTool, labelKey: "bubbles.blog.tutorials.label", descKey: "bubbles.blog.tutorials.desc", x: 120, y: -120, size: 88 },
-            { icon: BookOpen, labelKey: "bubbles.blog.deepDives.label", descKey: "bubbles.blog.deepDives.desc", x: -120, y: 120, size: 88 },
-            { icon: Users, labelKey: "bubbles.blog.community.label", descKey: "bubbles.blog.community.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-    {
-        id: "shop",
-        icon: ShoppingBag,
-        href: "/shop",
-        features: [
-            { icon: Sparkles, labelKey: "bubbles.shop.newDrops.label", descKey: "bubbles.shop.newDrops.desc", x: -120, y: -120, size: 88 },
-            { icon: Tag, labelKey: "bubbles.shop.curated.label", descKey: "bubbles.shop.curated.desc", x: 120, y: -120, size: 88 },
-            { icon: CreditCard, labelKey: "bubbles.shop.checkout.label", descKey: "bubbles.shop.checkout.desc", x: -120, y: 120, size: 88 },
-            { icon: Package, labelKey: "bubbles.shop.premium.label", descKey: "bubbles.shop.premium.desc", x: 120, y: 120, size: 88 },
-        ]
-    },
-]
+        labelKey: 'bubbles.blog.deepDives.label',
+        descKey: 'bubbles.blog.deepDives.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: Users,
+        labelKey: 'bubbles.blog.community.label',
+        descKey: 'bubbles.blog.community.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+  {
+    id: 'shop',
+    icon: ShoppingBag,
+    href: '/shop',
+    features: [
+      {
+        icon: Sparkles,
+        labelKey: 'bubbles.shop.newDrops.label',
+        descKey: 'bubbles.shop.newDrops.desc',
+        x: -120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: Tag,
+        labelKey: 'bubbles.shop.curated.label',
+        descKey: 'bubbles.shop.curated.desc',
+        x: 120,
+        y: -120,
+        size: 88,
+      },
+      {
+        icon: CreditCard,
+        labelKey: 'bubbles.shop.checkout.label',
+        descKey: 'bubbles.shop.checkout.desc',
+        x: -120,
+        y: 120,
+        size: 88,
+      },
+      {
+        icon: Package,
+        labelKey: 'bubbles.shop.premium.label',
+        descKey: 'bubbles.shop.premium.desc',
+        x: 120,
+        y: 120,
+        size: 88,
+      },
+    ],
+  },
+];
 
-function FeatureBubble({ feature, index, href, isMobile, t }: { feature: Feature; index: number; href: string; isMobile: boolean; t: (key: string) => string }) {
-    const Icon = feature.icon
-    const floatDelay = index * 0.5
-    const floatDuration = 3 + index * 0.3
+function FeatureBubble({
+  feature,
+  index,
+  href,
+  isMobile,
+  t,
+}: {
+  feature: Feature;
+  index: number;
+  href: string;
+  isMobile: boolean;
+  t: (key: string) => string;
+}) {
+  const Icon = feature.icon;
+  const floatDelay = index * 0.5;
+  const floatDuration = 3 + index * 0.3;
 
-    const scaleX = isMobile ? 0.55 : 1
-    const scaleY = isMobile ? 1.3 : 1
-    const posX = feature.x * scaleX
-    const posY = feature.y * scaleY
+  const scaleX = isMobile ? 0.55 : 1;
+  const scaleY = isMobile ? 1.3 : 1;
+  const posX = feature.x * scaleX;
+  const posY = feature.y * scaleY;
 
-    const shouldReduceMotion = useReducedMotion()
+  const shouldReduceMotion = useReducedMotion();
 
-    return (
-        <motion.div
-            className="absolute"
-            style={{ left: '50%', top: '50%' }}
-            initial={{ x: '-50%', y: '-50%', opacity: 0, scale: 0 }}
-            animate={{
-                x: `calc(-50% + ${posX}%)`,
-                y: `calc(-50% + ${posY}%)`,
-                opacity: 1,
-                scale: 1,
-            }}
-            exit={{ x: '-50%', y: '-50%', opacity: 0, scale: 0 }}
-            transition={shouldReduceMotion ? { duration: 0 } : {
-                x: { delay: 0.1 + index * 0.08, duration: 0.6, type: "spring", bounce: 0.3 },
-                y: { delay: 0.1 + index * 0.08, duration: 0.6, type: "spring", bounce: 0.3 },
-                opacity: { delay: 0.1 + index * 0.08, duration: 0.3 },
-                scale: { delay: 0.1 + index * 0.08, duration: 0.5, type: "spring", bounce: 0.4 },
-            }}
-        >
-            <div
-                className="animate-float motion-reduce:animate-none"
-                style={{ animationDelay: `${floatDelay}s`, animationDuration: `${floatDuration}s` }}
-            >
-                <Link href={href} className="group block">
-                    <div className="flex items-center gap-2 md:gap-3 px-2 md:px-3 py-2 md:py-2.5 w-[140px] md:w-[180px] bg-white dark:bg-neutral-900 border border-gray-200 dark:border-white/10 shadow-lg dark:shadow-black/30 rounded-xl md:rounded-2xl cursor-pointer transition-all duration-200 group-hover:border-[#1e5eff]/40 dark:group-hover:border-[#ff2d55]/40 group-hover:shadow-[0_8px_30px_rgba(30,94,255,0.25)] dark:group-hover:shadow-[0_8px_30px_rgba(255,45,85,0.25)] group-hover:scale-105">
-                        <div
-                            className="flex items-center justify-center shrink-0 w-8 h-8 md:w-10 md:h-10 bg-[#1e5eff]/10 dark:bg-[#ff2d55]/10 rounded-lg md:rounded-xl transition-transform duration-200 group-hover:rotate-6 group-hover:scale-110"
-                        >
-                            <Icon className="w-4 h-4 md:w-5 md:h-5 text-[#1e5eff] dark:text-[#ff2d55]" strokeWidth={1.5} />
-                        </div>
-                        <div className="min-w-0">
-                            <div className="text-xs md:text-sm font-bold text-gray-800 dark:text-white">{t(feature.labelKey)}</div>
-                            <div className="text-[10px] md:text-xs text-gray-500 dark:text-gray-400">{t(feature.descKey)}</div>
-                        </div>
-                    </div>
-                </Link>
+  return (
+    <motion.div
+      className="absolute"
+      style={{ left: '50%', top: '50%' }}
+      initial={{ x: '-50%', y: '-50%', opacity: 0, scale: 0 }}
+      animate={{
+        x: `calc(-50% + ${posX}%)`,
+        y: `calc(-50% + ${posY}%)`,
+        opacity: 1,
+        scale: 1,
+      }}
+      exit={{ x: '-50%', y: '-50%', opacity: 0, scale: 0 }}
+      transition={
+        shouldReduceMotion
+          ? { duration: 0 }
+          : {
+              x: {
+                delay: 0.1 + index * 0.08,
+                duration: 0.6,
+                type: 'spring',
+                bounce: 0.3,
+              },
+              y: {
+                delay: 0.1 + index * 0.08,
+                duration: 0.6,
+                type: 'spring',
+                bounce: 0.3,
+              },
+              opacity: { delay: 0.1 + index * 0.08, duration: 0.3 },
+              scale: {
+                delay: 0.1 + index * 0.08,
+                duration: 0.5,
+                type: 'spring',
+                bounce: 0.4,
+              },
+            }
+      }
+    >
+      <div
+        className="animate-float motion-reduce:animate-none"
+        style={{
+          animationDelay: `${floatDelay}s`,
+          animationDuration: `${floatDuration}s`,
+        }}
+      >
+        <Link href={href} className="group block">
+          <div className="flex w-[140px] cursor-pointer items-center gap-2 rounded-xl border border-gray-200 bg-white px-2 py-2 shadow-lg transition-all duration-200 group-hover:scale-105 group-hover:border-[#1e5eff]/40 group-hover:shadow-[0_8px_30px_rgba(30,94,255,0.25)] md:w-[180px] md:gap-3 md:rounded-2xl md:px-3 md:py-2.5 dark:border-white/10 dark:bg-neutral-900 dark:shadow-black/30 dark:group-hover:border-[#ff2d55]/40 dark:group-hover:shadow-[0_8px_30px_rgba(255,45,85,0.25)]">
+            <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-[#1e5eff]/10 transition-transform duration-200 group-hover:scale-110 group-hover:rotate-6 md:h-10 md:w-10 md:rounded-xl dark:bg-[#ff2d55]/10">
+              <Icon
+                className="h-4 w-4 text-[#1e5eff] md:h-5 md:w-5 dark:text-[#ff2d55]"
+                strokeWidth={1.5}
+              />
             </div>
-        </motion.div>
-    )
+            <div className="min-w-0">
+              <div className="text-xs font-bold text-gray-800 md:text-sm dark:text-white">
+                {t(feature.labelKey)}
+              </div>
+              <div className="text-[10px] text-gray-500 md:text-xs dark:text-gray-400">
+                {t(feature.descKey)}
+              </div>
+            </div>
+          </div>
+        </Link>
+      </div>
+    </motion.div>
+  );
 }
 
 function CentralIcon({ page }: { page: Page }) {
-    const Icon = page.icon
-    
-    return (
-        <motion.div
-            initial={{ opacity: 0, scale: 0.5 }}
-            animate={{ opacity: 1, scale: 1 }}
-            exit={{ opacity: 0, scale: 0.8 }}
-            transition={{ duration: 0.5, type: "spring", bounce: 0.3 }}
-            className="relative flex items-center justify-center z-30"
-        >
-            <motion.div 
-                className="absolute w-60 h-60 rounded-full blur-3xl"
-                animate={{ opacity: [0.15, 0.25, 0.15], scale: [1, 1.1, 1] }}
-                transition={{ duration: 3, repeat: Infinity, ease: "easeInOut" }}
-            >
-                <div className="w-full h-full rounded-full bg-[#1e5eff] dark:bg-[#ff2d55]" />
-            </motion.div>
-            
-            <div className="relative w-36 h-36 md:w-40 md:h-40 rounded-full flex items-center justify-center border border-gray-100 dark:border-white/10 bg-white/80 dark:bg-neutral-900/60 backdrop-blur-xl shadow-2xl dark:shadow-black/40">
-                <div className="absolute inset-2 rounded-full bg-gradient-to-br from-[#1e5eff]/10 to-[#1e5eff]/5 dark:from-[#ff2d55]/10 dark:to-[#ff2d55]/5" />
-                <Icon className="relative z-10 w-16 h-16 text-[#1e5eff] dark:text-[#ff2d55]" strokeWidth={1.5} />
-            </div>
-        </motion.div>
-    )
+  const Icon = page.icon;
+
+  return (
+    <motion.div
+      initial={{ opacity: 0, scale: 0.5 }}
+      animate={{ opacity: 1, scale: 1 }}
+      exit={{ opacity: 0, scale: 0.8 }}
+      transition={{ duration: 0.5, type: 'spring', bounce: 0.3 }}
+      className="relative z-30 flex items-center justify-center"
+    >
+      <motion.div
+        className="absolute h-60 w-60 rounded-full blur-3xl"
+        animate={{ opacity: [0.15, 0.25, 0.15], scale: [1, 1.1, 1] }}
+        transition={{ duration: 3, repeat: Infinity, ease: 'easeInOut' }}
+      >
+        <div className="h-full w-full rounded-full bg-[#1e5eff] dark:bg-[#ff2d55]" />
+      </motion.div>
+
+      <div className="relative flex h-36 w-36 items-center justify-center rounded-full border border-gray-100 bg-white/80 shadow-2xl backdrop-blur-xl md:h-40 md:w-40 dark:border-white/10 dark:bg-neutral-900/60 dark:shadow-black/40">
+        <div className="absolute inset-2 rounded-full bg-gradient-to-br from-[#1e5eff]/10 to-[#1e5eff]/5 dark:from-[#ff2d55]/10 dark:to-[#ff2d55]/5" />
+        <Icon
+          className="relative z-10 h-16 w-16 text-[#1e5eff] dark:text-[#ff2d55]"
+          strokeWidth={1.5}
+        />
+      </div>
+    </motion.div>
+  );
 }
 
 function DecorativeDots() {
-    return (
-        <div className="absolute inset-0 pointer-events-none z-0" aria-hidden="true">
-            {decorativeDots.map((dot, i) => (
-                <div
-                    key={i}
-                    className="absolute rounded-full bg-[#1e5eff]/40 dark:bg-[#ff2d55]/40 animate-float"
-                    style={{
-                        left: dot.x,
-                        top: dot.y,
-                        width: dot.size,
-                        height: dot.size,
-                        animationDelay: `${i * 0.3}s`,
-                        animationDuration: `${3 + i * 0.2}s`,
-                    }}
-                />
-            ))}
-        </div>
-    )
+  return (
+    <div
+      className="pointer-events-none absolute inset-0 z-0"
+      aria-hidden="true"
+    >
+      {decorativeDots.map((dot, i) => (
+        <div
+          key={i}
+          className="animate-float absolute rounded-full bg-[#1e5eff]/40 dark:bg-[#ff2d55]/40"
+          style={{
+            left: dot.x,
+            top: dot.y,
+            width: dot.size,
+            height: dot.size,
+            animationDelay: `${i * 0.3}s`,
+            animationDuration: `${3 + i * 0.2}s`,
+          }}
+        />
+      ))}
+    </div>
+  );
 }
 
 function OrbitRings() {
-    return (
-        <div className="absolute inset-0 flex items-center justify-center pointer-events-none" aria-hidden="true">
-            <div className="absolute w-[55%] h-[55%] rounded-full border border-dashed border-gray-300/50 dark:border-white/10 animate-spin-slow" />
-            <div className="absolute w-[75%] h-[75%] rounded-full border border-dashed border-gray-200/50 dark:border-white/[0.07] animate-spin-slower" />
-            <div className="absolute w-[95%] h-[95%] rounded-full border border-gray-100/50 dark:border-white/[0.03]" />
-        </div>
-    )
+  return (
+    <div
+      className="pointer-events-none absolute inset-0 flex items-center justify-center"
+      aria-hidden="true"
+    >
+      <div className="animate-spin-slow absolute h-[55%] w-[55%] rounded-full border border-dashed border-gray-300/50 dark:border-white/10" />
+      <div className="animate-spin-slower absolute h-[75%] w-[75%] rounded-full border border-dashed border-gray-200/50 dark:border-white/[0.07]" />
+      <div className="absolute h-[95%] w-[95%] rounded-full border border-gray-100/50 dark:border-white/[0.03]" />
+    </div>
+  );
 }
 
 function ConnectingLines() {
-    const lines = [
-        { x2: "15%", y2: "15%", delay: "0s" },
-        { x2: "85%", y2: "15%", delay: "0.5s" },
-        { x2: "15%", y2: "85%", delay: "1s" },
-        { x2: "85%", y2: "85%", delay: "1.5s" },
-    ]
-    
-    return (
-        <svg className="absolute inset-0 w-full h-full pointer-events-none" aria-hidden="true">
-            <defs>
-                <linearGradient id="lineGradient" x1="0%" y1="0%" x2="100%" y2="100%">
-                    <stop offset="0%" className="[stop-color:#1e5eff] dark:[stop-color:#ff2d55]" stopOpacity="0.3" />
-                    <stop offset="100%" className="[stop-color:#1e5eff] dark:[stop-color:#ff2d55]" stopOpacity="0" />
-                </linearGradient>
-            </defs>
-            {lines.map((line, i) => (
-                <line 
-                    key={i}
-                    x1="50%" y1="50%" x2={line.x2} y2={line.y2} 
-                    stroke="url(#lineGradient)" 
-                    strokeWidth="1" 
-                    strokeDasharray="4 4" 
-                    className="animate-dash-flow" 
-                    style={{ animationDelay: line.delay }} 
-                />
-            ))}
-        </svg>
-    )
+  const lines = [
+    { x2: '15%', y2: '15%', delay: '0s' },
+    { x2: '85%', y2: '15%', delay: '0.5s' },
+    { x2: '15%', y2: '85%', delay: '1s' },
+    { x2: '85%', y2: '85%', delay: '1.5s' },
+  ];
+
+  return (
+    <svg
+      className="pointer-events-none absolute inset-0 h-full w-full"
+      aria-hidden="true"
+    >
+      <defs>
+        <linearGradient id="lineGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+          <stop
+            offset="0%"
+            className="[stop-color:#1e5eff] dark:[stop-color:#ff2d55]"
+            stopOpacity="0.3"
+          />
+          <stop
+            offset="100%"
+            className="[stop-color:#1e5eff] dark:[stop-color:#ff2d55]"
+            stopOpacity="0"
+          />
+        </linearGradient>
+      </defs>
+      {lines.map((line, i) => (
+        <line
+          key={i}
+          x1="50%"
+          y1="50%"
+          x2={line.x2}
+          y2={line.y2}
+          stroke="url(#lineGradient)"
+          strokeWidth="1"
+          strokeDasharray="4 4"
+          className="animate-dash-flow"
+          style={{ animationDelay: line.delay }}
+        />
+      ))}
+    </svg>
+  );
 }
 
 function TabButton({
-    page,
-    isActive,
-    onClick,
-    onKeyDown,
-    t
+  page,
+  isActive,
+  onClick,
+  onKeyDown,
+  t,
 }: {
-    page: Page;
-    isActive: boolean;
-    onClick: () => void
-    onKeyDown: (e: React.KeyboardEvent<HTMLButtonElement>) => void
-    t: (key: string) => string
+  page: Page;
+  isActive: boolean;
+  onClick: () => void;
+  onKeyDown: (e: React.KeyboardEvent<HTMLButtonElement>) => void;
+  t: (key: string) => string;
 }) {
-    return (
-        <button
-            type="button"
-            id={`${page.id}-tab`}
-            onClick={onClick}
-            onKeyDown={onKeyDown}
-            role="tab"
-            aria-selected={isActive}
-            aria-controls={`${page.id}-panel`}
-            tabIndex={isActive ? 0 : -1}
-            className={`relative p-2.5 md:px-5 md:py-2.5 rounded-full text-sm font-medium transition-all duration-300 ${
-                isActive
-                    ? "text-white"
-                    : "text-gray-600 dark:text-gray-400 hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-white/10"
-            }`}
-        >
-            {isActive && (
-                <motion.div
-                    layoutId="activeTabBackground"
-                    className="absolute inset-0 bg-[#1e5eff] dark:bg-[#ff2d55] shadow-lg shadow-[#1e5eff]/25 dark:shadow-[#ff2d55]/25"
-                    initial={false}
-                    transition={{ type: "spring", bounce: 0.2, duration: 0.6 }}
-                    style={{ borderRadius: 9999 }}
-                />
-            )}
-            <span className="relative z-10 flex items-center gap-2">
-                <page.icon size={18} className="md:w-4 md:h-4" aria-hidden="true" />
-                <span className="hidden md:inline">{t(`${page.id}.title`)}</span>
-            </span>
-        </button>
-    )
+  return (
+    <button
+      type="button"
+      id={`${page.id}-tab`}
+      onClick={onClick}
+      onKeyDown={onKeyDown}
+      role="tab"
+      aria-selected={isActive}
+      aria-controls={`${page.id}-panel`}
+      tabIndex={isActive ? 0 : -1}
+      className={`relative rounded-full p-2.5 text-sm font-medium transition-all duration-300 md:px-5 md:py-2.5 ${
+        isActive
+          ? 'text-white'
+          : 'text-gray-600 hover:bg-gray-100 hover:text-black dark:text-gray-400 dark:hover:bg-white/10 dark:hover:text-white'
+      }`}
+    >
+      {isActive && (
+        <motion.div
+          layoutId="activeTabBackground"
+          className="absolute inset-0 bg-[#1e5eff] shadow-lg shadow-[#1e5eff]/25 dark:bg-[#ff2d55] dark:shadow-[#ff2d55]/25"
+          initial={false}
+          transition={{ type: 'spring', bounce: 0.2, duration: 0.6 }}
+          style={{ borderRadius: 9999 }}
+        />
+      )}
+      <span className="relative z-10 flex items-center gap-2">
+        <page.icon size={18} className="md:h-4 md:w-4" aria-hidden="true" />
+        <span className="hidden md:inline">{t(`${page.id}.title`)}</span>
+      </span>
+    </button>
+  );
 }
 
 export function FeaturesSection() {
-    const t = useTranslations("about.features")
-    const [activeTab, setActiveTab] = useState("qa")
-    const [isMobile, setIsMobile] = useState(() =>
-        typeof window !== "undefined" ? window.innerWidth < 768 : false
-    )
-    const activePage = pages.find(p => p.id === activeTab) || pages[0]
+  const t = useTranslations('about.features');
+  const [activeTab, setActiveTab] = useState('qa');
+  const [isMobile, setIsMobile] = useState(() =>
+    typeof window !== 'undefined' ? window.innerWidth < 768 : false
+  );
+  const activePage = pages.find(p => p.id === activeTab) || pages[0];
 
-    useEffect(() => {
-        const checkMobile = () => setIsMobile(window.innerWidth < 768)
-        checkMobile()
-        window.addEventListener('resize', checkMobile)
-        return () => window.removeEventListener('resize', checkMobile)
-    }, [])
+  useEffect(() => {
+    const checkMobile = () => setIsMobile(window.innerWidth < 768);
+    checkMobile();
+    window.addEventListener('resize', checkMobile);
+    return () => window.removeEventListener('resize', checkMobile);
+  }, []);
 
-    const onTabKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>, index: number) => {
-        if (event.key !== "ArrowRight" && event.key !== "ArrowLeft") return
-        event.preventDefault()
-        const dir = event.key === "ArrowRight" ? 1 : -1
-        const nextIndex = (index + dir + pages.length) % pages.length
-        const nextId = pages[nextIndex].id
-        setActiveTab(nextId)
-        setTimeout(() => {
-             document.getElementById(`${nextId}-tab`)?.focus()
-        }, 0)
-    }
+  const onTabKeyDown = (
+    event: React.KeyboardEvent<HTMLButtonElement>,
+    index: number
+  ) => {
+    if (event.key !== 'ArrowRight' && event.key !== 'ArrowLeft') return;
+    event.preventDefault();
+    const dir = event.key === 'ArrowRight' ? 1 : -1;
+    const nextIndex = (index + dir + pages.length) % pages.length;
+    const nextId = pages[nextIndex].id;
+    setActiveTab(nextId);
+    setTimeout(() => {
+      document.getElementById(`${nextId}-tab`)?.focus();
+    }, 0);
+  };
 
+  return (
+    <section className="relative w-full overflow-hidden bg-gray-50 py-20 lg:py-28 dark:bg-transparent">
+      <DecorativeDots />
 
+      <div
+        className="pointer-events-none absolute inset-0 -z-10"
+        aria-hidden="true"
+      >
+        <div className="absolute top-1/2 left-1/2 h-[400px] w-full max-w-2xl -translate-x-1/2 -translate-y-1/2 rounded-full bg-[#1e5eff]/20 opacity-20 blur-[150px] dark:bg-[#ff2d55]/20" />
+      </div>
 
-    return (
-        <section className="relative w-full py-20 lg:py-28 overflow-hidden bg-gray-50 dark:bg-transparent">
-            <DecorativeDots />
+      <div className="container-main relative z-10 flex flex-col items-center">
+        <SectionHeading
+          title={t('title')}
+          highlight={t('titleHighlight')}
+          subtitle={t('subtitle')}
+        />
 
-            <div className="absolute inset-0 -z-10 pointer-events-none" aria-hidden="true">
-                <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-full max-w-2xl h-[400px] rounded-full blur-[150px] opacity-20 bg-[#1e5eff]/20 dark:bg-[#ff2d55]/20" />
-            </div>
+        <div className="relative mx-auto mb-4 aspect-square w-full max-w-md">
+          <OrbitRings />
+          <ConnectingLines />
 
-            <div className="relative container-main z-10 flex flex-col items-center">
-                <SectionHeading
-                    title={t("title")}
-                    highlight={t("titleHighlight")}
-                    subtitle={t("subtitle")}
-                />
+          <div className="pointer-events-none absolute inset-0 z-30 flex items-center justify-center">
+            <AnimatePresence mode="wait">
+              <CentralIcon key={activeTab} page={activePage} />
+            </AnimatePresence>
+          </div>
 
-                <div className="w-full max-w-md mx-auto aspect-square relative mb-4">
-                    <OrbitRings />
-                    <ConnectingLines />
-
-                    <div className="absolute inset-0 flex items-center justify-center z-30 pointer-events-none">
-                        <AnimatePresence mode="wait">
-                            <CentralIcon key={activeTab} page={activePage} />
-                        </AnimatePresence>
-                    </div>
-
-                    <AnimatePresence mode="wait">
-                        <motion.div
-                            key={activeTab}
-                            role="tabpanel"
-                            id={`${activeTab}-panel`}
-                            aria-labelledby={`${activeTab}-tab`}
-                            initial={{ opacity: 0 }}
-                            animate={{ opacity: 1 }}
-                            exit={{ opacity: 0 }}
-                            className="absolute inset-0"
-                        >
-                            {activePage.features.map((feature, i) => (
-                                <FeatureBubble
-                                    key={feature.labelKey}
-                                    feature={feature}
-                                    index={i}
-                                    href={activePage.href}
-                                    isMobile={isMobile}
-                                    t={t}
-                                />
-                            ))}
-                        </motion.div>
-                    </AnimatePresence>
-                </div>
+          <AnimatePresence mode="wait">
+            <motion.div
+              key={activeTab}
+              role="tabpanel"
+              id={`${activeTab}-panel`}
+              aria-labelledby={`${activeTab}-tab`}
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1 }}
+              exit={{ opacity: 0 }}
+              className="absolute inset-0"
+            >
+              {activePage.features.map((feature, i) => (
+                <FeatureBubble
+                  key={feature.labelKey}
+                  feature={feature}
+                  index={i}
+                  href={activePage.href}
+                  isMobile={isMobile}
+                  t={t}
+                />
+              ))}
+            </motion.div>
+          </AnimatePresence>
+        </div>
 
-                <div className="flex justify-center mb-8">
-                    <div role="tablist" aria-label="Feature categories" className="inline-flex gap-1 md:gap-2 p-1.5 rounded-full border border-gray-200 dark:border-white/10 bg-white/20 dark:bg-white/5 backdrop-blur-md shadow-sm dark:shadow-none">
-                        {pages.map((page, index) => (
-                            <TabButton
-                                key={page.id}
-                                page={page}
-                                isActive={activeTab === page.id}
-                                onClick={() => setActiveTab(page.id)}
-                                onKeyDown={(e) => onTabKeyDown(e, index)}
-                                t={t}
-                            />
-                        ))}
-                    </div>
-                </div>
+        <div className="mb-8 flex justify-center">
+          <div
+            role="tablist"
+            aria-label="Feature categories"
+            className="inline-flex gap-1 rounded-full border border-gray-200 bg-white/20 p-1.5 shadow-sm backdrop-blur-md md:gap-2 dark:border-white/10 dark:bg-white/5 dark:shadow-none"
+          >
+            {pages.map((page, index) => (
+              <TabButton
+                key={page.id}
+                page={page}
+                isActive={activeTab === page.id}
+                onClick={() => setActiveTab(page.id)}
+                onKeyDown={e => onTabKeyDown(e, index)}
+                t={t}
+              />
+            ))}
+          </div>
+        </div>
 
-                <div className="max-w-2xl mx-auto text-center relative h-20 md:h-16 w-full mb-4">
-                    <AnimatePresence mode="wait">
-                        <motion.div
-                            key={activeTab}
-                            initial={{ opacity: 0, y: 10 }}
-                            animate={{ opacity: 1, y: 0 }}
-                            exit={{ opacity: 0, y: -10 }}
-                            transition={{ duration: 0.2 }}
-                            className="absolute w-full top-0 left-0 flex justify-center"
-                        >
-                            <p className="text-base md:text-lg text-gray-600 dark:text-gray-300 leading-relaxed font-light">
-                                {t(`${activeTab}.description`)}
-                            </p>
-                        </motion.div>
-                    </AnimatePresence>
-                </div>
-            </div>
-        </section>
-    )
-}
\ No newline at end of file
+        <div className="relative mx-auto mb-4 h-20 w-full max-w-2xl text-center md:h-16">
+          <AnimatePresence mode="wait">
+            <motion.div
+              key={activeTab}
+              initial={{ opacity: 0, y: 10 }}
+              animate={{ opacity: 1, y: 0 }}
+              exit={{ opacity: 0, y: -10 }}
+              transition={{ duration: 0.2 }}
+              className="absolute top-0 left-0 flex w-full justify-center"
+            >
+              <p className="text-base leading-relaxed font-light text-gray-600 md:text-lg dark:text-gray-300">
+                {t(`${activeTab}.description`)}
+              </p>
+            </motion.div>
+          </AnimatePresence>
+        </div>
+      </div>
+    </section>
+  );
+}
diff --git a/frontend/components/about/HeroSection.tsx b/frontend/components/about/HeroSection.tsx
index 7bb783ee..df3487df 100644
--- a/frontend/components/about/HeroSection.tsx
+++ b/frontend/components/about/HeroSection.tsx
@@ -1,123 +1,212 @@
-"use client"
+'use client';
 
-import { motion } from "framer-motion"
-import { CheckCircle, Users, Star, Linkedin, ArrowDown } from "lucide-react"
-import { useTranslations } from "next-intl"
-import { InteractiveGame } from "./InteractiveGame"
-import type { PlatformStats } from "@/lib/about/stats"
-import { DynamicGridBackground } from "@/components/shared/DynamicGridBackground"
+import { motion } from 'framer-motion';
+import { ArrowDown, CheckCircle, Linkedin, Star, Users } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+
+import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
+import type { PlatformStats } from '@/lib/about/stats';
+
+import { InteractiveGame } from './InteractiveGame';
 
 export function HeroSection({ stats }: { stats?: PlatformStats }) {
-  const t = useTranslations("about.hero")
+  const t = useTranslations('about.hero');
 
   const data = stats || {
-    questionsSolved: "850+",
-    githubStars: "120+",
-    activeUsers: "200+",
-    linkedinFollowers: "1.3k+"
-  }
+    questionsSolved: '850+',
+    githubStars: '120+',
+    activeUsers: '200+',
+    linkedinFollowers: '1.3k+',
+  };
 
   return (
-    <DynamicGridBackground showStaticGrid className="flex min-h-[calc(100svh)] items-center justify-center bg-gray-50 transition-colors duration-300 dark:bg-transparent pt-20 pb-10">
-      <div className="relative z-10 grid w-full max-w-[1600px] grid-cols-1 items-center px-4 sm:px-6 lg:px-8 xl:grid-cols-12 xl:gap-8 h-full">
-
+    <DynamicGridBackground
+      showStaticGrid
+      className="flex min-h-[calc(100svh)] items-center justify-center bg-gray-50 pt-20 pb-10 transition-colors duration-300 dark:bg-transparent"
+    >
+      <div className="relative z-10 grid h-full w-full max-w-[1600px] grid-cols-1 items-center px-4 sm:px-6 lg:px-8 xl:grid-cols-12 xl:gap-8">
         <div className="hidden h-full flex-col justify-center gap-24 xl:col-span-3 xl:flex">
-             <motion.div initial={{ x: -50, opacity: 0 }} animate={{ x: 0, opacity: 1 }} transition={{ delay: 0.2 }} className="self-end">
-                <GlassWidget icon={CheckCircle} color="text-green-500" bg="bg-green-500/10" label={t("stats.quizzesPassed")} value={data.questionsSolved} />
-             </motion.div>
-             <motion.div initial={{ x: -50, opacity: 0 }} animate={{ x: 0, opacity: 1 }} transition={{ delay: 0.4 }} className="self-start">
-                <GlassWidget icon={Star} color="text-yellow-500" bg="bg-yellow-500/10" label={t("stats.githubStars")} value={data.githubStars} />
-             </motion.div>
+          <motion.div
+            initial={{ x: -50, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{ delay: 0.2 }}
+            className="self-end"
+          >
+            <GlassWidget
+              icon={CheckCircle}
+              color="text-green-500"
+              bg="bg-green-500/10"
+              label={t('stats.quizzesPassed')}
+              value={data.questionsSolved}
+            />
+          </motion.div>
+          <motion.div
+            initial={{ x: -50, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{ delay: 0.4 }}
+            className="self-start"
+          >
+            <GlassWidget
+              icon={Star}
+              color="text-yellow-500"
+              bg="bg-yellow-500/10"
+              label={t('stats.githubStars')}
+              value={data.githubStars}
+            />
+          </motion.div>
         </div>
 
         <div className="flex flex-col items-center text-center xl:col-span-6">
+          <div className="mb-6 scale-90 md:scale-100">
+            <InteractiveGame />
+          </div>
 
-            <div className="scale-90 md:scale-100 mb-6">
-                <InteractiveGame />
-            </div>
-
-            <motion.h1
-              initial={{ y: 20, opacity: 0 }}
-              animate={{ y: 0, opacity: 1 }}
-              transition={{ duration: 0.6 }}
-              className="mt-4 mb-8 text-4xl font-black tracking-tight text-gray-900 dark:text-white md:text-5xl lg:text-6xl xl:text-7xl max-w-5xl text-balance leading-[1.1]"
-            >
-              <span className="text-transparent bg-clip-text bg-gradient-to-r from-[#1e5eff] to-[#1e5eff]/70 dark:from-[#ff2d55] dark:to-[#ff2d55]/70">
-                {t("titleHighlight")} <br/>
-              </span> {t("titleRest")}
-            </motion.h1>
+          <motion.h1
+            initial={{ y: 20, opacity: 0 }}
+            animate={{ y: 0, opacity: 1 }}
+            transition={{ duration: 0.6 }}
+            className="mt-4 mb-8 max-w-5xl text-4xl leading-[1.1] font-black tracking-tight text-balance text-gray-900 md:text-5xl lg:text-6xl xl:text-7xl dark:text-white"
+          >
+            <span className="bg-gradient-to-r from-[#1e5eff] to-[#1e5eff]/70 bg-clip-text text-transparent dark:from-[#ff2d55] dark:to-[#ff2d55]/70">
+              {t('titleHighlight')} <br />
+            </span>{' '}
+            {t('titleRest')}
+          </motion.h1>
 
-            <motion.p
-              initial={{ y: 20, opacity: 0 }}
-              animate={{ y: 0, opacity: 1 }}
-              transition={{ duration: 0.6, delay: 0.1 }}
-              className="max-w-3xl text-sm font-light leading-relaxed text-gray-700 text-balance dark:text-gray-300 md:text-lg lg:text-xl mb-10"
-            >
-              {t("description")} <strong className="font-medium text-gray-900 dark:text-gray-200">{t("descriptionHighlight")}</strong> {t("descriptionRest")}
-            </motion.p>
+          <motion.p
+            initial={{ y: 20, opacity: 0 }}
+            animate={{ y: 0, opacity: 1 }}
+            transition={{ duration: 0.6, delay: 0.1 }}
+            className="mb-10 max-w-3xl text-sm leading-relaxed font-light text-balance text-gray-700 md:text-lg lg:text-xl dark:text-gray-300"
+          >
+            {t('description')}{' '}
+            <strong className="font-medium text-gray-900 dark:text-gray-200">
+              {t('descriptionHighlight')}
+            </strong>{' '}
+            {t('descriptionRest')}
+          </motion.p>
 
-            <motion.div
-                initial={{ opacity: 0, y: 20 }}
-                animate={{ opacity: 1, y: 0 }}
-                transition={{ delay: 0.3 }}
-                className="grid w-full max-w-lg grid-cols-2 gap-4 xl:hidden"
-            >
-                <MobileStatItem icon={CheckCircle} color="text-green-500" bg="bg-green-500/10" label={t("stats.quizzes")} value={data.questionsSolved} />
-                <MobileStatItem icon={Star} color="text-yellow-500" bg="bg-yellow-500/10" label={t("stats.stars")} value={data.githubStars} />
-                <MobileStatItem icon={Users} color="text-[#ff2d55]" bg="bg-[#ff2d55]/10" label={t("stats.users")} value={data.activeUsers} />
-                <MobileStatItem icon={Linkedin} color="text-blue-600" bg="bg-blue-600/10" label={t("stats.followers")} value={data.linkedinFollowers} />
-            </motion.div>
+          <motion.div
+            initial={{ opacity: 0, y: 20 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ delay: 0.3 }}
+            className="grid w-full max-w-lg grid-cols-2 gap-4 xl:hidden"
+          >
+            <MobileStatItem
+              icon={CheckCircle}
+              color="text-green-500"
+              bg="bg-green-500/10"
+              label={t('stats.quizzes')}
+              value={data.questionsSolved}
+            />
+            <MobileStatItem
+              icon={Star}
+              color="text-yellow-500"
+              bg="bg-yellow-500/10"
+              label={t('stats.stars')}
+              value={data.githubStars}
+            />
+            <MobileStatItem
+              icon={Users}
+              color="text-[#ff2d55]"
+              bg="bg-[#ff2d55]/10"
+              label={t('stats.users')}
+              value={data.activeUsers}
+            />
+            <MobileStatItem
+              icon={Linkedin}
+              color="text-blue-600"
+              bg="bg-blue-600/10"
+              label={t('stats.followers')}
+              value={data.linkedinFollowers}
+            />
+          </motion.div>
 
-            <motion.div
-                animate={{ y: [0, 10, 0] }}
-                transition={{ duration: 2, repeat: Infinity }}
-                className="mt-16 text-gray-400 dark:text-gray-600 hidden xl:block"
-            >
-                <ArrowDown className="h-6 w-6" aria-hidden="true" />
-            </motion.div>
+          <motion.div
+            animate={{ y: [0, 10, 0] }}
+            transition={{ duration: 2, repeat: Infinity }}
+            className="mt-16 hidden text-gray-400 xl:block dark:text-gray-600"
+          >
+            <ArrowDown className="h-6 w-6" aria-hidden="true" />
+          </motion.div>
         </div>
 
         <div className="hidden h-full flex-col justify-center gap-24 xl:col-span-3 xl:flex">
-             <motion.div initial={{ x: 50, opacity: 0 }} animate={{ x: 0, opacity: 1 }} transition={{ delay: 0.3 }} className="self-start">
-                <GlassWidget icon={Users} color="text-[#ff2d55]" bg="bg-[#ff2d55]/10" label={t("stats.activeUsers")} value={data.activeUsers} />
-             </motion.div>
-             <motion.div initial={{ x: 50, opacity: 0 }} animate={{ x: 0, opacity: 1 }} transition={{ delay: 0.5 }} className="self-end">
-                <GlassWidget icon={Linkedin} color="text-blue-600" bg="bg-blue-600/10" label={t("stats.linkedinFollowers")} value={data.linkedinFollowers} />
-             </motion.div>
+          <motion.div
+            initial={{ x: 50, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{ delay: 0.3 }}
+            className="self-start"
+          >
+            <GlassWidget
+              icon={Users}
+              color="text-[#ff2d55]"
+              bg="bg-[#ff2d55]/10"
+              label={t('stats.activeUsers')}
+              value={data.activeUsers}
+            />
+          </motion.div>
+          <motion.div
+            initial={{ x: 50, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{ delay: 0.5 }}
+            className="self-end"
+          >
+            <GlassWidget
+              icon={Linkedin}
+              color="text-blue-600"
+              bg="bg-blue-600/10"
+              label={t('stats.linkedinFollowers')}
+              value={data.linkedinFollowers}
+            />
+          </motion.div>
         </div>
-
       </div>
     </DynamicGridBackground>
-  )
+  );
 }
 
 function GlassWidget({ icon: Icon, color, bg, label, value }: any) {
-    return (
-        <motion.div 
-            whileHover={{ y: -5 }}
-            className="flex min-w-[220px] items-center gap-4 rounded-2xl border border-gray-100 bg-white/10 p-5 shadow-xl backdrop-blur-xl transition-all hover:border-[#1e5eff]/30 dark:border-white/5 dark:bg-neutral-900/10 dark:hover:border-[#ff2d55]/30 dark:shadow-black/50"
-        >
-            <div className={`flex h-12 w-12 items-center justify-center rounded-xl ${bg} ${color}`} aria-hidden="true">
-                <Icon size={24} />
-            </div>
-            <div className="flex flex-col items-start">
-                <div className="text-[10px] font-bold uppercase tracking-widest text-gray-400">{label}</div>
-                <div className="text-2xl font-bold text-gray-900 dark:text-white">{value}</div>
-            </div>
-        </motion.div>
-    )
+  return (
+    <motion.div
+      whileHover={{ y: -5 }}
+      className="flex min-w-[220px] items-center gap-4 rounded-2xl border border-gray-100 bg-white/10 p-5 shadow-xl backdrop-blur-xl transition-all hover:border-[#1e5eff]/30 dark:border-white/5 dark:bg-neutral-900/10 dark:shadow-black/50 dark:hover:border-[#ff2d55]/30"
+    >
+      <div
+        className={`flex h-12 w-12 items-center justify-center rounded-xl ${bg} ${color}`}
+        aria-hidden="true"
+      >
+        <Icon size={24} />
+      </div>
+      <div className="flex flex-col items-start">
+        <div className="text-[10px] font-bold tracking-widest text-gray-400 uppercase">
+          {label}
+        </div>
+        <div className="text-2xl font-bold text-gray-900 dark:text-white">
+          {value}
+        </div>
+      </div>
+    </motion.div>
+  );
 }
 
 function MobileStatItem({ icon: Icon, color, bg, label, value }: any) {
-    return (
-        <div className="flex items-center gap-3 rounded-xl border border-gray-100 bg-white/10 p-3 shadow-sm backdrop-blur-xl dark:border-white/5 dark:bg-neutral-900/10">
-            <div className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg ${bg} ${color}`} aria-hidden="true">
-                <Icon size={20} />
-            </div>
-            <div className="flex flex-col items-start overflow-hidden">
-                <div className="text-lg font-bold text-gray-900 dark:text-white leading-tight truncate">{value}</div>
-                <div className="text-[10px] uppercase font-medium text-gray-500 dark:text-gray-400 tracking-wider truncate">{label}</div>
-            </div>
+  return (
+    <div className="flex items-center gap-3 rounded-xl border border-gray-100 bg-white/10 p-3 shadow-sm backdrop-blur-xl dark:border-white/5 dark:bg-neutral-900/10">
+      <div
+        className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg ${bg} ${color}`}
+        aria-hidden="true"
+      >
+        <Icon size={20} />
+      </div>
+      <div className="flex flex-col items-start overflow-hidden">
+        <div className="truncate text-lg leading-tight font-bold text-gray-900 dark:text-white">
+          {value}
+        </div>
+        <div className="truncate text-[10px] font-medium tracking-wider text-gray-500 uppercase dark:text-gray-400">
+          {label}
         </div>
-    )
+      </div>
+    </div>
+  );
 }
diff --git a/frontend/components/about/InteractiveGame.tsx b/frontend/components/about/InteractiveGame.tsx
index b85afd4b..642a33a3 100644
--- a/frontend/components/about/InteractiveGame.tsx
+++ b/frontend/components/about/InteractiveGame.tsx
@@ -1,518 +1,612 @@
-"use client"
-
-import { useState, useEffect, useRef, useCallback } from "react"
-import { motion, AnimatePresence } from "framer-motion"
-import { Heart, Bug, Play, X, RotateCcw, Zap, Skull, Rabbit } from "lucide-react"
-import { useTranslations } from "next-intl"
-
-const GAME_WIDTH_DESKTOP = 540
-const GAME_WIDTH_MOBILE = 320
-const IDLE_WIDTH_DESKTOP = 280
-const IDLE_WIDTH_MOBILE = 240
-
-const GROUND_Y_DESKTOP = 32
-const GROUND_Y_MOBILE = 24
-const PLAYER_X_DESKTOP = 64
-const PLAYER_X_MOBILE = 40
-const PLAYER_SIZE_DESKTOP = 40
-const PLAYER_SIZE_MOBILE = 32
-const JUMP_HEIGHT_DESKTOP = 90
-const JUMP_HEIGHT_MOBILE = 70
-const JUMP_DURATION = 500
-
-type ObstacleType = 'ground' | 'flying' | 'fast' | 'tall'
+'use client';
+
+import { AnimatePresence, motion } from 'framer-motion';
+import {
+  Bug,
+  Heart,
+  Play,
+  Rabbit,
+  RotateCcw,
+  Skull,
+  X,
+  Zap,
+} from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+const GAME_WIDTH_DESKTOP = 540;
+const GAME_WIDTH_MOBILE = 320;
+const IDLE_WIDTH_DESKTOP = 280;
+const IDLE_WIDTH_MOBILE = 240;
+
+const GROUND_Y_DESKTOP = 32;
+const GROUND_Y_MOBILE = 24;
+const PLAYER_X_DESKTOP = 64;
+const PLAYER_X_MOBILE = 40;
+const PLAYER_SIZE_DESKTOP = 40;
+const PLAYER_SIZE_MOBILE = 32;
+const JUMP_HEIGHT_DESKTOP = 90;
+const JUMP_HEIGHT_MOBILE = 70;
+const JUMP_DURATION = 500;
+
+type ObstacleType = 'ground' | 'flying' | 'fast' | 'tall';
 
 interface Obstacle {
-    type: ObstacleType
-    x: number
-    size: number
-    heightOffset: number
-    speedMultiplier: number
+  type: ObstacleType;
+  x: number;
+  size: number;
+  heightOffset: number;
+  speedMultiplier: number;
 }
 
 const OBSTACLE_CONFIGS: Record<ObstacleType, Omit<Obstacle, 'x'>> = {
-    ground: { type: 'ground', size: 32, heightOffset: 0, speedMultiplier: 1 },
-    flying: { type: 'flying', size: 28, heightOffset: 45, speedMultiplier: 1 },
-    fast: { type: 'fast', size: 24, heightOffset: 0, speedMultiplier: 1.2 },
-    tall: { type: 'tall', size: 38, heightOffset: 0, speedMultiplier: 0.95 },
-}
+  ground: { type: 'ground', size: 32, heightOffset: 0, speedMultiplier: 1 },
+  flying: { type: 'flying', size: 28, heightOffset: 45, speedMultiplier: 1 },
+  fast: { type: 'fast', size: 24, heightOffset: 0, speedMultiplier: 1.2 },
+  tall: { type: 'tall', size: 38, heightOffset: 0, speedMultiplier: 0.95 },
+};
 
 const LEVEL_THRESHOLDS = [
-    { score: 0, types: ['ground'] as ObstacleType[], nameKey: 'level1', baseSpeed: 3.5 },
-    { score: 8, types: ['ground', 'fast'] as ObstacleType[], nameKey: 'level2', baseSpeed: 4 },
-    { score: 18, types: ['ground', 'fast', 'flying'] as ObstacleType[], nameKey: 'level3', baseSpeed: 4.5 },
-    { score: 30, types: ['ground', 'fast', 'flying', 'tall'] as ObstacleType[], nameKey: 'level4', baseSpeed: 5 },
-]
+  {
+    score: 0,
+    types: ['ground'] as ObstacleType[],
+    nameKey: 'level1',
+    baseSpeed: 3.5,
+  },
+  {
+    score: 8,
+    types: ['ground', 'fast'] as ObstacleType[],
+    nameKey: 'level2',
+    baseSpeed: 4,
+  },
+  {
+    score: 18,
+    types: ['ground', 'fast', 'flying'] as ObstacleType[],
+    nameKey: 'level3',
+    baseSpeed: 4.5,
+  },
+  {
+    score: 30,
+    types: ['ground', 'fast', 'flying', 'tall'] as ObstacleType[],
+    nameKey: 'level4',
+    baseSpeed: 5,
+  },
+];
 
 function getBaseSpeed(score: number): number {
-    let speed = 3.5
-    for (const level of LEVEL_THRESHOLDS) {
-        if (score >= level.score) {
-            speed = level.baseSpeed
-        }
+  let speed = 3.5;
+  for (const level of LEVEL_THRESHOLDS) {
+    if (score >= level.score) {
+      speed = level.baseSpeed;
     }
-    return speed
+  }
+  return speed;
 }
 
 function getAvailableTypes(score: number): ObstacleType[] {
-    let types: ObstacleType[] = ['ground']
-    for (const level of LEVEL_THRESHOLDS) {
-        if (score >= level.score) {
-            types = level.types
-        }
+  let types: ObstacleType[] = ['ground'];
+  for (const level of LEVEL_THRESHOLDS) {
+    if (score >= level.score) {
+      types = level.types;
     }
-    return types
+  }
+  return types;
 }
 
 function getCurrentLevelKey(score: number): string {
-    let nameKey = 'level1'
-    for (const level of LEVEL_THRESHOLDS) {
-        if (score >= level.score) {
-            nameKey = level.nameKey
-        }
+  let nameKey = 'level1';
+  for (const level of LEVEL_THRESHOLDS) {
+    if (score >= level.score) {
+      nameKey = level.nameKey;
     }
-    return nameKey
+  }
+  return nameKey;
 }
 
 function getRandomObstacle(score: number, gameWidth: number): Obstacle {
-    const types = getAvailableTypes(score)
-    let selectedType: ObstacleType
-    const rand = Math.random()
-
-    if (types.length === 1) {
-        selectedType = 'ground'
-    } else if (types.length === 2) {
-        selectedType = rand < 0.7 ? 'ground' : types[1]
-    } else if (types.length === 3) {
-        if (rand < 0.5) selectedType = 'ground'
-        else if (rand < 0.75) selectedType = types[1]
-        else selectedType = types[2]
-    } else {
-        if (rand < 0.4) selectedType = 'ground'
-        else if (rand < 0.6) selectedType = types[1]
-        else if (rand < 0.8) selectedType = types[2]
-        else selectedType = types[3]
-    }
-
-    return {
-        ...OBSTACLE_CONFIGS[selectedType],
-        x: gameWidth + 40,
-    }
+  const types = getAvailableTypes(score);
+  let selectedType: ObstacleType;
+  const rand = Math.random();
+
+  if (types.length === 1) {
+    selectedType = 'ground';
+  } else if (types.length === 2) {
+    selectedType = rand < 0.7 ? 'ground' : types[1];
+  } else if (types.length === 3) {
+    if (rand < 0.5) selectedType = 'ground';
+    else if (rand < 0.75) selectedType = types[1];
+    else selectedType = types[2];
+  } else {
+    if (rand < 0.4) selectedType = 'ground';
+    else if (rand < 0.6) selectedType = types[1];
+    else if (rand < 0.8) selectedType = types[2];
+    else selectedType = types[3];
+  }
+
+  return {
+    ...OBSTACLE_CONFIGS[selectedType],
+    x: gameWidth + 40,
+  };
 }
 
 export function InteractiveGame() {
-    const t = useTranslations("about.arcade")
-    const [mode, setMode] = useState<'idle' | 'preview' | 'playing'>('idle')
-    const [gameOver, setGameOver] = useState(false)
-    const [score, setScore] = useState(0)
-    const [levelUpFlash, setLevelUpFlash] = useState(false)
-    const [isMobile, setIsMobile] = useState(false)
-
-    const gameWidth = isMobile ? GAME_WIDTH_MOBILE : GAME_WIDTH_DESKTOP
-    const idleWidth = isMobile ? IDLE_WIDTH_MOBILE : IDLE_WIDTH_DESKTOP
-    const playerX = isMobile ? PLAYER_X_MOBILE : PLAYER_X_DESKTOP
-    const groundY = isMobile ? GROUND_Y_MOBILE : GROUND_Y_DESKTOP
-    const playerSize = isMobile ? PLAYER_SIZE_MOBILE : PLAYER_SIZE_DESKTOP
-    const jumpHeight = isMobile ? JUMP_HEIGHT_MOBILE : JUMP_HEIGHT_DESKTOP
-    const obstacleEndX = -60
-
-    const [highScore, setHighScore] = useState(0)
-
-    useEffect(() => {
-        const checkMobile = () => setIsMobile(window.innerWidth < 640)
-        checkMobile()
-        window.addEventListener('resize', checkMobile)
-        return () => window.removeEventListener('resize', checkMobile)
-    }, [])
-
-    useEffect(() => {
-        const saved = localStorage.getItem('devlovers_highscore')
-        if (saved) setHighScore(parseInt(saved, 10))
-    }, [])
-
-    const [playerY, setPlayerY] = useState(0)
-    const [obstacle, setObstacle] = useState<Obstacle>(() => getRandomObstacle(0, GAME_WIDTH_DESKTOP))
-    const [gameSpeed, setGameSpeed] = useState(3.5)
-
-    const isJumpingRef = useRef(false)
-    const jumpStartTime = useRef(0)
-    const lastTimeRef = useRef(0)
-    const requestRef = useRef<number | null>(null)
-    const pillRef = useRef<HTMLDivElement>(null)
-    const hasPassedRef = useRef(false)
-    const prevLevelRef = useRef('level1')
-
-    const exitGame = useCallback(() => {
-        setMode('idle')
-        setGameOver(false)
-        setScore(0)
-        setPlayerY(0)
-        setObstacle(getRandomObstacle(0, gameWidth))
-        setGameSpeed(3.5)
-        isJumpingRef.current = false
-        hasPassedRef.current = false
-        prevLevelRef.current = 'level1'
-        if (requestRef.current !== null) cancelAnimationFrame(requestRef.current)
-    }, [gameWidth])
-
-    const handleRetry = useCallback(() => {
-        setGameOver(false)
-        setScore(0)
-        setPlayerY(0)
-        setObstacle(getRandomObstacle(0, gameWidth))
-        setGameSpeed(3.5)
-        isJumpingRef.current = false
-        hasPassedRef.current = false
-        lastTimeRef.current = 0
-        prevLevelRef.current = 'level1'
-    }, [gameWidth])
-
-    const handleGameOver = useCallback((finalScore: number) => {
-        setGameOver(true)
-        if (finalScore > highScore) {
-            setHighScore(finalScore)
-            localStorage.setItem('devlovers_highscore', finalScore.toString())
+  const t = useTranslations('about.arcade');
+  const [mode, setMode] = useState<'idle' | 'preview' | 'playing'>('idle');
+  const [gameOver, setGameOver] = useState(false);
+  const [score, setScore] = useState(0);
+  const [levelUpFlash, setLevelUpFlash] = useState(false);
+  const [isMobile, setIsMobile] = useState(false);
+
+  const gameWidth = isMobile ? GAME_WIDTH_MOBILE : GAME_WIDTH_DESKTOP;
+  const idleWidth = isMobile ? IDLE_WIDTH_MOBILE : IDLE_WIDTH_DESKTOP;
+  const playerX = isMobile ? PLAYER_X_MOBILE : PLAYER_X_DESKTOP;
+  const groundY = isMobile ? GROUND_Y_MOBILE : GROUND_Y_DESKTOP;
+  const playerSize = isMobile ? PLAYER_SIZE_MOBILE : PLAYER_SIZE_DESKTOP;
+  const jumpHeight = isMobile ? JUMP_HEIGHT_MOBILE : JUMP_HEIGHT_DESKTOP;
+  const obstacleEndX = -60;
+
+  const [highScore, setHighScore] = useState(0);
+
+  useEffect(() => {
+    const checkMobile = () => setIsMobile(window.innerWidth < 640);
+    checkMobile();
+    window.addEventListener('resize', checkMobile);
+    return () => window.removeEventListener('resize', checkMobile);
+  }, []);
+
+  useEffect(() => {
+    const saved = localStorage.getItem('devlovers_highscore');
+    if (saved) setHighScore(parseInt(saved, 10));
+  }, []);
+
+  const [playerY, setPlayerY] = useState(0);
+  const [obstacle, setObstacle] = useState<Obstacle>(() =>
+    getRandomObstacle(0, GAME_WIDTH_DESKTOP)
+  );
+  const [gameSpeed, setGameSpeed] = useState(3.5);
+
+  const isJumpingRef = useRef(false);
+  const jumpStartTime = useRef(0);
+  const lastTimeRef = useRef(0);
+  const requestRef = useRef<number | null>(null);
+  const pillRef = useRef<HTMLDivElement>(null);
+  const hasPassedRef = useRef(false);
+  const prevLevelRef = useRef('level1');
+
+  const exitGame = useCallback(() => {
+    setMode('idle');
+    setGameOver(false);
+    setScore(0);
+    setPlayerY(0);
+    setObstacle(getRandomObstacle(0, gameWidth));
+    setGameSpeed(3.5);
+    isJumpingRef.current = false;
+    hasPassedRef.current = false;
+    prevLevelRef.current = 'level1';
+    if (requestRef.current !== null) cancelAnimationFrame(requestRef.current);
+  }, [gameWidth]);
+
+  const handleRetry = useCallback(() => {
+    setGameOver(false);
+    setScore(0);
+    setPlayerY(0);
+    setObstacle(getRandomObstacle(0, gameWidth));
+    setGameSpeed(3.5);
+    isJumpingRef.current = false;
+    hasPassedRef.current = false;
+    lastTimeRef.current = 0;
+    prevLevelRef.current = 'level1';
+  }, [gameWidth]);
+
+  const handleGameOver = useCallback(
+    (finalScore: number) => {
+      setGameOver(true);
+      if (finalScore > highScore) {
+        setHighScore(finalScore);
+        localStorage.setItem('devlovers_highscore', finalScore.toString());
+      }
+    },
+    [highScore]
+  );
+
+  const jump = useCallback(() => {
+    if (!isJumpingRef.current && mode === 'playing' && !gameOver) {
+      isJumpingRef.current = true;
+      jumpStartTime.current = performance.now();
+    }
+  }, [mode, gameOver]);
+
+  useEffect(() => {
+    const currentLevelKey = getCurrentLevelKey(score);
+    if (currentLevelKey !== prevLevelRef.current && score > 0) {
+      prevLevelRef.current = currentLevelKey;
+      setLevelUpFlash(true);
+      setTimeout(() => setLevelUpFlash(false), 500);
+    }
+  }, [score]);
+
+  useEffect(() => {
+    const handleClickOutside = (e: MouseEvent) => {
+      if (pillRef.current && !pillRef.current.contains(e.target as Node)) {
+        exitGame();
+      }
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [exitGame]);
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (mode !== 'playing') return;
+      if (e.code === 'Space' || e.code === 'ArrowUp') {
+        e.preventDefault();
+        if (gameOver) {
+          handleRetry();
+        } else {
+          jump();
         }
-    }, [highScore])
+      }
+      if (e.code === 'Escape') exitGame();
+    };
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [mode, gameOver, jump, handleRetry, exitGame]);
+
+  useEffect(() => {
+    if (mode !== 'playing' || gameOver) {
+      if (requestRef.current !== null) cancelAnimationFrame(requestRef.current);
+      return;
+    }
 
-    const jump = useCallback(() => {
-        if (!isJumpingRef.current && mode === 'playing' && !gameOver) {
-            isJumpingRef.current = true
-            jumpStartTime.current = performance.now()
-        }
-    }, [mode, gameOver])
-
-    useEffect(() => {
-        const currentLevelKey = getCurrentLevelKey(score)
-        if (currentLevelKey !== prevLevelRef.current && score > 0) {
-            prevLevelRef.current = currentLevelKey
-            setLevelUpFlash(true)
-            setTimeout(() => setLevelUpFlash(false), 500)
-        }
-    }, [score])
+    const gameLoop = (currentTime: number) => {
+      if (lastTimeRef.current === 0) {
+        lastTimeRef.current = currentTime;
+      }
 
-    useEffect(() => {
-        const handleClickOutside = (e: MouseEvent) => {
-            if (pillRef.current && !pillRef.current.contains(e.target as Node)) {
-                exitGame()
-            }
-        }
-        document.addEventListener("mousedown", handleClickOutside)
-        return () => document.removeEventListener("mousedown", handleClickOutside)
-    }, [exitGame])
-
-    useEffect(() => {
-        const handleKeyDown = (e: KeyboardEvent) => {
-            if (mode !== 'playing') return
-            if (e.code === "Space" || e.code === "ArrowUp") {
-                e.preventDefault()
-                if (gameOver) {
-                    handleRetry()
-                } else {
-                    jump()
-                }
-            }
-            if (e.code === "Escape") exitGame()
+      const deltaTime = (currentTime - lastTimeRef.current) / 1000;
+      lastTimeRef.current = currentTime;
+
+      let newPlayerY = 0;
+      if (isJumpingRef.current) {
+        const jumpElapsed = currentTime - jumpStartTime.current;
+        const jumpProgress = jumpElapsed / JUMP_DURATION;
+
+        if (jumpProgress >= 1) {
+          isJumpingRef.current = false;
+          newPlayerY = 0;
+        } else {
+          newPlayerY = jumpHeight * Math.sin(jumpProgress * Math.PI);
         }
-        window.addEventListener("keydown", handleKeyDown)
-        return () => window.removeEventListener("keydown", handleKeyDown)
-    }, [mode, gameOver, jump, handleRetry, exitGame])
-
-    useEffect(() => {
-        if (mode !== 'playing' || gameOver) {
-            if (requestRef.current !== null) cancelAnimationFrame(requestRef.current)
-            return
+      }
+      setPlayerY(newPlayerY);
+
+      setObstacle(prevObstacle => {
+        const effectiveSpeed = gameSpeed * prevObstacle.speedMultiplier;
+        const newX = prevObstacle.x - effectiveSpeed * deltaTime * 100;
+        const obstacleRight = newX + prevObstacle.size;
+
+        if (!hasPassedRef.current && obstacleRight < playerX) {
+          hasPassedRef.current = true;
+          setScore(s => {
+            const newScore = s + 1;
+            const newBaseSpeed = getBaseSpeed(newScore);
+            setGameSpeed(newBaseSpeed);
+            return newScore;
+          });
         }
 
-        const gameLoop = (currentTime: number) => {
-            if (lastTimeRef.current === 0) {
-                lastTimeRef.current = currentTime
-            }
-
-            const deltaTime = (currentTime - lastTimeRef.current) / 1000
-            lastTimeRef.current = currentTime
-
-            let newPlayerY = 0
-            if (isJumpingRef.current) {
-                const jumpElapsed = currentTime - jumpStartTime.current
-                const jumpProgress = jumpElapsed / JUMP_DURATION
-
-                if (jumpProgress >= 1) {
-                    isJumpingRef.current = false
-                    newPlayerY = 0
-                } else {
-                    newPlayerY = jumpHeight * Math.sin(jumpProgress * Math.PI)
-                }
-            }
-            setPlayerY(newPlayerY)
-
-            setObstacle(prevObstacle => {
-                const effectiveSpeed = gameSpeed * prevObstacle.speedMultiplier
-                let newX = prevObstacle.x - effectiveSpeed * deltaTime * 100
-                const obstacleRight = newX + prevObstacle.size
-
-                if (!hasPassedRef.current && obstacleRight < playerX) {
-                    hasPassedRef.current = true
-                    setScore(s => {
-                        const newScore = s + 1
-                        const newBaseSpeed = getBaseSpeed(newScore)
-                        setGameSpeed(newBaseSpeed)
-                        return newScore
-                    })
-                }
-
-                if (newX < obstacleEndX) {
-                    hasPassedRef.current = false
-                    return getRandomObstacle(score, gameWidth)
-                }
-
-                return { ...prevObstacle, x: newX }
-            })
-
-            setObstacle(currentObstacle => {
-                const pLeft = playerX + 8
-                const pRight = playerX + playerSize - 8
-                const playerBottom = groundY + newPlayerY
-                const playerTop = playerBottom + playerSize - 8
-
-                const oLeft = currentObstacle.x + 6
-                const oRight = currentObstacle.x + currentObstacle.size - 6
-                const obstacleBottom = groundY + currentObstacle.heightOffset
-                const obstacleTop = obstacleBottom + currentObstacle.size - 4
-
-                const isColliding =
-                    pRight > oLeft &&
-                    pLeft < oRight &&
-                    playerBottom < obstacleTop &&
-                    playerTop > obstacleBottom
-
-                if (isColliding) {
-                    setScore(s => {
-                        handleGameOver(s)
-                        return s
-                    })
-                }
-
-                return currentObstacle
-            })
-
-            requestRef.current = requestAnimationFrame(gameLoop)
+        if (newX < obstacleEndX) {
+          hasPassedRef.current = false;
+          return getRandomObstacle(score, gameWidth);
         }
 
-        lastTimeRef.current = 0
-        requestRef.current = requestAnimationFrame(gameLoop)
-
-        return () => {
-            if (requestRef.current !== null) cancelAnimationFrame(requestRef.current)
+        return { ...prevObstacle, x: newX };
+      });
+
+      setObstacle(currentObstacle => {
+        const pLeft = playerX + 8;
+        const pRight = playerX + playerSize - 8;
+        const playerBottom = groundY + newPlayerY;
+        const playerTop = playerBottom + playerSize - 8;
+
+        const oLeft = currentObstacle.x + 6;
+        const oRight = currentObstacle.x + currentObstacle.size - 6;
+        const obstacleBottom = groundY + currentObstacle.heightOffset;
+        const obstacleTop = obstacleBottom + currentObstacle.size - 4;
+
+        const isColliding =
+          pRight > oLeft &&
+          pLeft < oRight &&
+          playerBottom < obstacleTop &&
+          playerTop > obstacleBottom;
+
+        if (isColliding) {
+          setScore(s => {
+            handleGameOver(s);
+            return s;
+          });
         }
-    }, [mode, gameOver, gameSpeed, handleGameOver, score, playerX, obstacleEndX, gameWidth, groundY, playerSize, jumpHeight])
-
-    const renderObstacle = (obs: Obstacle) => {
-        const baseClasses = "transition-colors"
-
-        switch (obs.type) {
-            case 'flying':
-                return (
-                    <div className="relative">
-                        <Bug
-                            className={`${baseClasses} text-purple-500 dark:text-purple-400`}
-                            style={{ width: obs.size, height: obs.size }}
-                        />
-                        <div className="absolute -inset-1 bg-purple-500/20 blur-md rounded-full" />
-                    </div>
-                )
-            case 'fast':
-                return (
-                    <div className="relative">
-                        <Rabbit
-                            className={`${baseClasses} text-orange-500 dark:text-orange-400`}
-                            style={{ width: obs.size, height: obs.size }}
-                        />
-                    </div>
-                )
-            case 'tall':
-                return (
-                    <div className="relative">
-                        <Skull
-                            className={`${baseClasses} text-red-600 dark:text-red-500`}
-                            style={{ width: obs.size, height: obs.size }}
-                        />
-                        <div className="absolute -inset-1 bg-red-500/20 blur-md rounded-full" />
-                    </div>
-                )
-            default:
-                return (
-                    <Bug
-                        className={`${baseClasses} text-neutral-600 dark:text-neutral-400 opacity-90`}
-                        style={{ width: obs.size, height: obs.size }}
-                    />
-                )
-        }
-    }
 
-    return (
-        <motion.div
-            ref={pillRef}
-            layout
-            transition={{ type: "spring", stiffness: 180, damping: 24 }}
-            animate={{
-                width: mode === 'idle' ? idleWidth : gameWidth,
-                height: mode === 'idle' ? 56 : (isMobile ? 180 : 240),
-                borderRadius: mode === 'idle' ? "9999px" : (isMobile ? "20px" : "24px")
-            }}
-            onHoverStart={() => mode === 'idle' && setMode('preview')}
-            onHoverEnd={() => mode === 'preview' && setMode('idle')}
-            className="relative mb-8 md:mb-14 select-none border border-neutral-200/50 dark:border-white/10 bg-white/40 dark:bg-white/5 backdrop-blur-md shadow-xl z-50 mx-auto group overflow-hidden"
-            onClick={() => mode !== 'playing' && setMode('playing')}
-        >
-            <AnimatePresence>
-                {levelUpFlash && (
-                    <motion.div
-                        initial={{ opacity: 0 }}
-                        animate={{ opacity: 1 }}
-                        exit={{ opacity: 0 }}
-                        transition={{ duration: 0.2 }}
-                        className="absolute inset-0 z-50 bg-[#ff005b]/20 pointer-events-none"
+        return currentObstacle;
+      });
+
+      requestRef.current = requestAnimationFrame(gameLoop);
+    };
+
+    lastTimeRef.current = 0;
+    requestRef.current = requestAnimationFrame(gameLoop);
+
+    return () => {
+      if (requestRef.current !== null) cancelAnimationFrame(requestRef.current);
+    };
+  }, [
+    mode,
+    gameOver,
+    gameSpeed,
+    handleGameOver,
+    score,
+    playerX,
+    obstacleEndX,
+    gameWidth,
+    groundY,
+    playerSize,
+    jumpHeight,
+  ]);
+
+  const renderObstacle = (obs: Obstacle) => {
+    const baseClasses = 'transition-colors';
+
+    switch (obs.type) {
+      case 'flying':
+        return (
+          <div className="relative">
+            <Bug
+              className={`${baseClasses} text-purple-500 dark:text-purple-400`}
+              style={{ width: obs.size, height: obs.size }}
+            />
+            <div className="absolute -inset-1 rounded-full bg-purple-500/20 blur-md" />
+          </div>
+        );
+      case 'fast':
+        return (
+          <div className="relative">
+            <Rabbit
+              className={`${baseClasses} text-orange-500 dark:text-orange-400`}
+              style={{ width: obs.size, height: obs.size }}
+            />
+          </div>
+        );
+      case 'tall':
+        return (
+          <div className="relative">
+            <Skull
+              className={`${baseClasses} text-red-600 dark:text-red-500`}
+              style={{ width: obs.size, height: obs.size }}
+            />
+            <div className="absolute -inset-1 rounded-full bg-red-500/20 blur-md" />
+          </div>
+        );
+      default:
+        return (
+          <Bug
+            className={`${baseClasses} text-neutral-600 opacity-90 dark:text-neutral-400`}
+            style={{ width: obs.size, height: obs.size }}
+          />
+        );
+    }
+  };
+
+  return (
+    <motion.div
+      ref={pillRef}
+      layout
+      transition={{ type: 'spring', stiffness: 180, damping: 24 }}
+      animate={{
+        width: mode === 'idle' ? idleWidth : gameWidth,
+        height: mode === 'idle' ? 56 : isMobile ? 180 : 240,
+        borderRadius: mode === 'idle' ? '9999px' : isMobile ? '20px' : '24px',
+      }}
+      onHoverStart={() => mode === 'idle' && setMode('preview')}
+      onHoverEnd={() => mode === 'preview' && setMode('idle')}
+      className="group relative z-50 mx-auto mb-8 overflow-hidden border border-neutral-200/50 bg-white/40 shadow-xl backdrop-blur-md select-none md:mb-14 dark:border-white/10 dark:bg-white/5"
+      onClick={() => mode !== 'playing' && setMode('playing')}
+    >
+      <AnimatePresence>
+        {levelUpFlash && (
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{ duration: 0.2 }}
+            className="pointer-events-none absolute inset-0 z-50 bg-[#ff005b]/20"
+          />
+        )}
+      </AnimatePresence>
+
+      <AnimatePresence mode="wait">
+        {mode === 'idle' ? (
+          <motion.div
+            key="idle"
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            className="flex h-full w-full items-center justify-between px-4 md:px-6"
+          >
+            <div className="flex items-center gap-2 md:gap-3">
+              <Heart
+                className="h-4 w-4 fill-[#ff005b] text-[#ff005b] md:h-5 md:w-5"
+                strokeWidth={0}
+              />
+              <span className="text-[9px] font-bold tracking-[0.15em] text-neutral-600 uppercase md:text-[10px] md:tracking-[0.2em] dark:text-neutral-300">
+                {t('title')}
+              </span>
+            </div>
+            <div className="flex items-center gap-2 opacity-50">
+              <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-green-500" />
+              <span className="font-mono text-[8px] text-neutral-400 md:text-[9px]">
+                {t('ready')}
+              </span>
+            </div>
+          </motion.div>
+        ) : (
+          <motion.div
+            key="active"
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0, transition: { duration: 0.15 } }}
+            className="flex h-full w-full flex-col"
+          >
+            <div className="flex items-center justify-between border-b border-neutral-200/30 bg-white/30 px-3 py-2 md:px-6 md:py-3 dark:border-white/5 dark:bg-white/5">
+              <div className="hidden items-center gap-3 md:flex">
+                <div
+                  className={`h-2 w-2 rounded-full ${mode === 'playing' && !gameOver ? 'bg-green-500 shadow-[0_0_8px_#22c55e]' : 'bg-red-500'}`}
+                />
+                <div className="flex flex-col">
+                  <span className="font-mono text-[8px] font-bold tracking-wider text-neutral-400 uppercase">
+                    {t(getCurrentLevelKey(score))}
+                  </span>
+                  <span className="text-[10px] leading-none font-bold text-neutral-700 dark:text-white">
+                    {gameOver ? t('crashed') : t('running')}
+                  </span>
+                </div>
+              </div>
+
+              <div className="flex items-center gap-2 md:hidden">
+                <div
+                  className={`h-2 w-2 rounded-full ${mode === 'playing' && !gameOver ? 'bg-green-500' : 'bg-red-500'}`}
+                />
+                <span className="font-mono text-[8px] font-bold text-neutral-400 uppercase">
+                  {t(getCurrentLevelKey(score))}
+                </span>
+              </div>
+
+              <div className="flex items-center gap-3 md:absolute md:left-1/2 md:-translate-x-1/2 md:gap-6">
+                <div className="flex flex-col items-center">
+                  <span className="text-[7px] font-bold tracking-widest text-neutral-400 uppercase md:text-[8px]">
+                    {t('high')}
+                  </span>
+                  <span
+                    suppressHydrationWarning
+                    className="font-mono text-[10px] font-bold text-neutral-500 md:text-xs"
+                  >
+                    {highScore.toString().padStart(3, '0')}
+                  </span>
+                </div>
+                <div className="h-3 w-[1px] bg-neutral-300 md:h-4 dark:bg-white/20" />
+                <div className="flex flex-col items-center">
+                  <span className="text-[7px] font-bold tracking-widest text-[#ff005b] uppercase md:text-[8px]">
+                    {t('score')}
+                  </span>
+                  <span className="font-mono text-sm leading-none font-black text-neutral-800 md:text-lg dark:text-white">
+                    {score.toString().padStart(3, '0')}
+                  </span>
+                </div>
+              </div>
+
+              <button
+                onClick={e => {
+                  e.stopPropagation();
+                  exitGame();
+                }}
+                className="-mr-1 p-1.5 transition-colors hover:text-[#ff005b] md:-mr-2 md:p-2"
+              >
+                <X size={14} className="text-neutral-400 md:h-4 md:w-4" />
+              </button>
+            </div>
+
+            <div
+              className="relative w-full flex-1 cursor-pointer overflow-hidden"
+              onClick={mode === 'playing' && !gameOver ? jump : undefined}
+            >
+              <div className="absolute inset-0 bg-[linear-gradient(to_right,#80808015_1px,transparent_1px),linear-gradient(to_bottom,#80808015_1px,transparent_1px)] bg-[size:40px_40px]" />
+
+              <div
+                className="absolute z-10 transition-transform"
+                style={{
+                  left: playerX,
+                  bottom: groundY + playerY,
+                  transform:
+                    playerY > 10
+                      ? 'rotate(-15deg) scale(0.95)'
+                      : 'rotate(0deg) scale(1)',
+                  transition: 'transform 0.1s ease-out',
+                }}
+              >
+                <div className="relative">
+                  <div className="absolute -inset-4 rounded-full bg-[#ff005b]/20 opacity-50 blur-xl" />
+                  <Heart
+                    className="relative fill-[#ff005b] text-[#ff005b] drop-shadow-sm"
+                    strokeWidth={0}
+                    style={{ width: playerSize, height: playerSize }}
+                  />
+                </div>
+              </div>
+
+              {mode === 'playing' && (
+                <div
+                  className="absolute z-10"
+                  style={{
+                    left: obstacle.x,
+                    bottom: groundY + obstacle.heightOffset,
+                  }}
+                >
+                  {renderObstacle(obstacle)}
+                </div>
+              )}
+
+              {mode === 'preview' && (
+                <motion.div
+                  initial={{ opacity: 0 }}
+                  animate={{ opacity: 1 }}
+                  className="pointer-events-none absolute inset-0 z-20 flex items-center justify-center"
+                >
+                  <div className="flex items-center gap-2 rounded-lg border border-neutral-200 bg-white/90 px-5 py-2 shadow-xl dark:border-white/10 dark:bg-neutral-800/90">
+                    <Play
+                      size={10}
+                      fill="currentColor"
+                      className="text-[#ff005b]"
                     />
-                )}
-            </AnimatePresence>
-
-            <AnimatePresence mode="wait">
-                {mode === 'idle' ? (
-                    <motion.div
-                        key="idle"
-                        initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0 }}
-                        className="flex items-center justify-between w-full h-full px-4 md:px-6"
-                    >
-                        <div className="flex items-center gap-2 md:gap-3">
-                            <Heart className="h-4 w-4 md:h-5 md:w-5 fill-[#ff005b] text-[#ff005b]" strokeWidth={0} />
-                            <span className="text-[9px] md:text-[10px] font-bold uppercase tracking-[0.15em] md:tracking-[0.2em] text-neutral-600 dark:text-neutral-300">
-                                {t("title")}
-                            </span>
-                        </div>
-                        <div className="flex items-center gap-2 opacity-50">
-                            <span className="h-1.5 w-1.5 rounded-full bg-green-500 animate-pulse" />
-                            <span className="text-[8px] md:text-[9px] font-mono text-neutral-400">{t("ready")}</span>
-                        </div>
-                    </motion.div>
-                ) : (
-                    <motion.div
-                        key="active"
-                        initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0, transition: { duration: 0.15 } }}
-                        className="flex flex-col h-full w-full"
+                    <span className="text-[10px] font-bold tracking-widest text-neutral-800 uppercase dark:text-white">
+                      {t('clickToStart')}
+                    </span>
+                  </div>
+                </motion.div>
+              )}
+
+              {gameOver && (
+                <motion.div
+                  initial={{ opacity: 0 }}
+                  animate={{ opacity: 1 }}
+                  className="absolute inset-0 z-30 flex flex-col items-center justify-center bg-white/60 backdrop-blur-sm dark:bg-black/60"
+                >
+                  <div className="mb-4 flex items-center gap-2 text-[#ff005b]">
+                    <Zap size={18} fill="currentColor" />
+                    <span className="text-sm font-black tracking-widest uppercase">
+                      {t('systemFailure')}
+                    </span>
+                  </div>
+                  <div className="flex gap-3">
+                    <button
+                      onClick={e => {
+                        e.stopPropagation();
+                        handleRetry();
+                      }}
+                      className="flex items-center gap-2 rounded-lg bg-[#ff005b] px-6 py-2.5 text-[10px] font-bold tracking-widest text-white uppercase shadow-lg transition-all hover:brightness-110 active:scale-95"
                     >
-                        <div className="flex justify-between items-center px-3 md:px-6 py-2 md:py-3 border-b border-neutral-200/30 dark:border-white/5 bg-white/30 dark:bg-white/5">
-                            <div className="hidden md:flex items-center gap-3">
-                                <div className={`h-2 w-2 rounded-full ${mode === 'playing' && !gameOver ? 'bg-green-500 shadow-[0_0_8px_#22c55e]' : 'bg-red-500'}`} />
-                                <div className="flex flex-col">
-                                    <span className="text-[8px] font-mono font-bold text-neutral-400 uppercase tracking-wider">
-                                        {t(getCurrentLevelKey(score))}
-                                    </span>
-                                    <span className="text-[10px] font-bold text-neutral-700 dark:text-white leading-none">
-                                        {gameOver ? t("crashed") : t("running")}
-                                    </span>
-                                </div>
-                            </div>
-
-                            <div className="flex md:hidden items-center gap-2">
-                                <div className={`h-2 w-2 rounded-full ${mode === 'playing' && !gameOver ? 'bg-green-500' : 'bg-red-500'}`} />
-                                <span className="text-[8px] font-mono font-bold text-neutral-400 uppercase">
-                                    {t(getCurrentLevelKey(score))}
-                                </span>
-                            </div>
-
-                            <div className="flex items-center gap-3 md:gap-6 md:absolute md:left-1/2 md:-translate-x-1/2">
-                                <div className="flex flex-col items-center">
-                                    <span className="text-[7px] md:text-[8px] font-bold text-neutral-400 uppercase tracking-widest">{t("high")}</span>
-                                    <span suppressHydrationWarning className="font-mono text-[10px] md:text-xs font-bold text-neutral-500">
-                                        {highScore.toString().padStart(3, '0')}
-                                    </span>
-                                </div>
-                                <div className="w-[1px] h-3 md:h-4 bg-neutral-300 dark:bg-white/20" />
-                                <div className="flex flex-col items-center">
-                                    <span className="text-[7px] md:text-[8px] font-bold text-[#ff005b] uppercase tracking-widest">{t("score")}</span>
-                                    <span className="font-mono text-sm md:text-lg font-black text-neutral-800 dark:text-white leading-none">
-                                        {score.toString().padStart(3, '0')}
-                                    </span>
-                                </div>
-                            </div>
-
-                            <button onClick={(e) => {e.stopPropagation(); exitGame();}} className="p-1.5 md:p-2 -mr-1 md:-mr-2 hover:text-[#ff005b] transition-colors">
-                                <X size={14} className="md:w-4 md:h-4 text-neutral-400" />
-                            </button>
-                        </div>
-
-                        <div
-                            className="relative flex-1 w-full overflow-hidden cursor-pointer"
-                            onClick={mode === 'playing' && !gameOver ? jump : undefined}
-                        >
-                            <div className="absolute inset-0 bg-[linear-gradient(to_right,#80808015_1px,transparent_1px),linear-gradient(to_bottom,#80808015_1px,transparent_1px)] bg-[size:40px_40px]" />
-
-                            <div
-                                className="absolute z-10 transition-transform"
-                                style={{
-                                    left: playerX,
-                                    bottom: groundY + playerY,
-                                    transform: playerY > 10 ? 'rotate(-15deg) scale(0.95)' : 'rotate(0deg) scale(1)',
-                                    transition: 'transform 0.1s ease-out'
-                                }}
-                            >
-                                <div className="relative">
-                                    <div className="absolute -inset-4 bg-[#ff005b]/20 blur-xl rounded-full opacity-50" />
-                                    <Heart
-                                        className="relative fill-[#ff005b] text-[#ff005b] drop-shadow-sm"
-                                        strokeWidth={0}
-                                        style={{ width: playerSize, height: playerSize }}
-                                    />
-                                </div>
-                            </div>
-
-                            {mode === 'playing' && (
-                                <div
-                                    className="absolute z-10"
-                                    style={{
-                                        left: obstacle.x,
-                                        bottom: groundY + obstacle.heightOffset
-                                    }}
-                                >
-                                    {renderObstacle(obstacle)}
-                                </div>
-                            )}
-
-                            {mode === 'preview' && (
-                                <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} className="absolute inset-0 flex items-center justify-center z-20 pointer-events-none">
-                                    <div className="bg-white/90 dark:bg-neutral-800/90 border border-neutral-200 dark:border-white/10 px-5 py-2 rounded-lg shadow-xl flex items-center gap-2">
-                                        <Play size={10} fill="currentColor" className="text-[#ff005b]" />
-                                        <span className="text-[10px] font-bold uppercase tracking-widest text-neutral-800 dark:text-white">{t("clickToStart")}</span>
-                                    </div>
-                                </motion.div>
-                            )}
-
-                            {gameOver && (
-                                <motion.div
-                                    initial={{ opacity: 0 }} animate={{ opacity: 1 }}
-                                    className="absolute inset-0 z-30 flex flex-col items-center justify-center bg-white/60 dark:bg-black/60 backdrop-blur-sm"
-                                >
-                                    <div className="flex items-center gap-2 mb-4 text-[#ff005b]">
-                                        <Zap size={18} fill="currentColor" />
-                                        <span className="text-sm font-black uppercase tracking-widest">{t("systemFailure")}</span>
-                                    </div>
-                                    <div className="flex gap-3">
-                                        <button
-                                            onClick={(e) => {e.stopPropagation(); handleRetry();}}
-                                            className="px-6 py-2.5 bg-[#ff005b] text-white text-[10px] font-bold uppercase tracking-widest rounded-lg shadow-lg hover:brightness-110 active:scale-95 transition-all flex items-center gap-2"
-                                        >
-                                            <RotateCcw size={12} /> {t("retry")}
-                                        </button>
-                                    </div>
-                                </motion.div>
-                            )}
-
-                            <div className="absolute w-full h-[1px] bg-neutral-300 dark:bg-white/10" style={{ bottom: groundY }} />
-                        </div>
-                    </motion.div>
-                )}
-            </AnimatePresence>
-        </motion.div>
-    )
+                      <RotateCcw size={12} /> {t('retry')}
+                    </button>
+                  </div>
+                </motion.div>
+              )}
+
+              <div
+                className="absolute h-[1px] w-full bg-neutral-300 dark:bg-white/10"
+                style={{ bottom: groundY }}
+              />
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </motion.div>
+  );
 }
diff --git a/frontend/components/about/PricingSection.tsx b/frontend/components/about/PricingSection.tsx
index 1e6382ca..ace570f8 100644
--- a/frontend/components/about/PricingSection.tsx
+++ b/frontend/components/about/PricingSection.tsx
@@ -1,169 +1,216 @@
-"use client"
-import { useState } from "react"
-import { motion } from "framer-motion"
-import { Check, Heart, X, Sparkles, Server, ArrowRight } from "lucide-react"
-import Link from "next/link"
-import { useTranslations } from "next-intl"
-import type { Sponsor } from "@/lib/about/github-sponsors"
-import { SponsorsWall } from "./SponsorsWall"
-import { GradientBadge } from "@/components/ui/gradient-badge"
-import { SectionHeading } from "@/components/ui/section-heading"
-import { ParticleCanvas } from "@/components/ui/particle-canvas"
+'use client';
+import { motion } from 'framer-motion';
+import { ArrowRight, Check, Heart, Server, Sparkles, X } from 'lucide-react';
+import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
+
+import { GradientBadge } from '@/components/ui/gradient-badge';
+import { ParticleCanvas } from '@/components/ui/particle-canvas';
+import { SectionHeading } from '@/components/ui/section-heading';
+import type { Sponsor } from '@/lib/about/github-sponsors';
+
+import { SponsorsWall } from './SponsorsWall';
 
 interface PricingSectionProps {
-  sponsors?: Sponsor[]
+  sponsors?: Sponsor[];
 }
 
 export function PricingSection({ sponsors = [] }: PricingSectionProps) {
-    const t = useTranslations("about.pricing")
-    const [activeShape, setActiveShape] = useState<"brackets" | "heart" | null>(null)
-
-    const juniorFeatures = [
-        t("junior.features.unlimited"),
-        t("junior.features.fullAccess"),
-        t("junior.features.noCard"),
-        t("junior.features.noGuilt"),
-    ]
-
-    const heroFeatures = [
-        t("hero.features.servers"),
-        t("hero.features.coffee"),
-        t("hero.features.badge"),
-        t("hero.features.feeling"),
-    ]
-
-    return (
-        <section className="w-full py-20 lg:py-28 relative overflow-hidden bg-gray-50 dark:bg-transparent" aria-labelledby="pricing-heading">
-            <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[600px] h-[600px] bg-[#1e5eff]/5 dark:bg-[#ff2d55]/5 blur-[100px] rounded-full pointer-events-none" aria-hidden="true" />
-
-            <div className="absolute inset-0 pointer-events-none z-0">
-                <ParticleCanvas activeShape={activeShape} className="w-full h-full" />
+  const t = useTranslations('about.pricing');
+  const [activeShape, setActiveShape] = useState<'brackets' | 'heart' | null>(
+    null
+  );
+
+  const juniorFeatures = [
+    t('junior.features.unlimited'),
+    t('junior.features.fullAccess'),
+    t('junior.features.noCard'),
+    t('junior.features.noGuilt'),
+  ];
+
+  const heroFeatures = [
+    t('hero.features.servers'),
+    t('hero.features.coffee'),
+    t('hero.features.badge'),
+    t('hero.features.feeling'),
+  ];
+
+  return (
+    <section
+      className="relative w-full overflow-hidden bg-gray-50 py-20 lg:py-28 dark:bg-transparent"
+      aria-labelledby="pricing-heading"
+    >
+      <div
+        className="pointer-events-none absolute top-1/2 left-1/2 h-[600px] w-[600px] -translate-x-1/2 -translate-y-1/2 rounded-full bg-[#1e5eff]/5 blur-[100px] dark:bg-[#ff2d55]/5"
+        aria-hidden="true"
+      />
+
+      <div className="pointer-events-none absolute inset-0 z-0">
+        <ParticleCanvas activeShape={activeShape} className="h-full w-full" />
+      </div>
+
+      <div className="container-main relative z-10">
+        <div className="mb-16 text-center">
+          <motion.div
+            initial={{ opacity: 0, y: 10 }}
+            whileInView={{ opacity: 1, y: 0 }}
+          >
+            <h2 id="pricing-heading" className="sr-only">
+              {t('heading')}
+            </h2>
+            <GradientBadge icon={Sparkles} text={t('badge')} className="mb-4" />
+          </motion.div>
+
+          <SectionHeading
+            title={t('title')}
+            highlight={t('titleHighlight')}
+            subtitle={t('subtitle')}
+          />
+        </div>
+
+        <div className="mx-auto mb-6 grid max-w-4xl grid-cols-1 gap-6 md:grid-cols-2 lg:gap-12">
+          <motion.div
+            whileHover={{ y: -5 }}
+            onMouseEnter={() => setActiveShape('brackets')}
+            onMouseLeave={() => setActiveShape(null)}
+            onFocus={() => setActiveShape('brackets')}
+            onBlur={() => setActiveShape(null)}
+            className="relative z-10 flex flex-col rounded-3xl border border-gray-200 bg-white/10 p-8 shadow-sm backdrop-blur-md lg:p-10 dark:border-neutral-800 dark:bg-neutral-900/10"
+          >
+            <div className="mb-6">
+              <h3 className="mb-2 text-xl font-bold text-gray-900 dark:text-white">
+                {t('junior.title')}
+              </h3>
+              <p className="text-sm text-gray-600 dark:text-neutral-400">
+                {t('junior.description')}
+              </p>
+            </div>
+            <div className="mb-8">
+              <span className="text-4xl font-black text-gray-900 lg:text-5xl dark:text-white">
+                {t('junior.price')}
+              </span>
+              <span className="ml-2 font-mono text-sm text-gray-500 dark:text-neutral-500">
+                {t('junior.period')}
+              </span>
             </div>
 
-            <div className="container-main relative z-10">
-                <div className="text-center mb-16">
-                    <motion.div
-                        initial={{ opacity: 0, y: 10 }}
-                        whileInView={{ opacity: 1, y: 0 }}
-                    >
-                        <h2 id="pricing-heading" className="sr-only">{t("heading")}</h2>
-                        <GradientBadge icon={Sparkles} text={t("badge")} className="mb-4" />
-                    </motion.div>
-
-                    <SectionHeading
-                        title={t("title")}
-                        highlight={t("titleHighlight")}
-                        subtitle={t("subtitle")}
-                    />
+            <ul className="mb-8 flex-1 space-y-4">
+              {juniorFeatures.map(item => (
+                <li
+                  key={item}
+                  className="flex items-center gap-3 text-sm text-gray-700 dark:text-neutral-300"
+                >
+                  <div
+                    className="rounded-full bg-green-500/10 p-1 text-green-500"
+                    aria-hidden="true"
+                  >
+                    <Check size={12} />
+                  </div>
+                  {item}
+                </li>
+              ))}
+              <li className="flex items-center gap-3 text-sm text-gray-400 line-through decoration-gray-300 dark:text-neutral-500 dark:decoration-neutral-700">
+                <div
+                  className="rounded-full bg-gray-100 p-1 text-gray-400 dark:bg-neutral-800 dark:text-neutral-600"
+                  aria-hidden="true"
+                >
+                  <X size={12} />
                 </div>
+                {t('junior.noYacht')}
+              </li>
+            </ul>
+
+            <Link
+              href="/"
+              className="w-full rounded-xl border border-gray-200 bg-gray-50 py-4 text-center text-xs font-bold tracking-widest text-gray-900 uppercase transition-all hover:bg-gray-100 dark:border-white/10 dark:bg-white/5 dark:text-white dark:hover:bg-white/10"
+            >
+              {t('junior.cta')}
+            </Link>
+          </motion.div>
+
+          <motion.div
+            whileHover={{ y: -5 }}
+            onMouseEnter={() => setActiveShape('heart')}
+            onMouseLeave={() => setActiveShape(null)}
+            onFocus={() => setActiveShape('heart')}
+            onBlur={() => setActiveShape(null)}
+            className="relative z-10 flex flex-col overflow-hidden rounded-3xl border border-[#1e5eff]/30 bg-gradient-to-b from-[#1e5eff]/5 to-white/10 p-8 backdrop-blur-md lg:p-10 dark:border-[#ff2d55]/30 dark:from-[#ff2d55]/10 dark:to-neutral-900/10"
+          >
+            <div className="absolute top-0 right-0 rounded-bl-xl bg-[#1e5eff] px-3 py-1 text-[10px] font-bold tracking-widest text-white uppercase dark:bg-[#ff2d55]">
+              {t('hero.badge')}
+            </div>
 
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-6 lg:gap-12 max-w-4xl mx-auto mb-6">
-
-                    <motion.div
-                        whileHover={{ y: -5 }}
-                        onMouseEnter={() => setActiveShape("brackets")}
-                        onMouseLeave={() => setActiveShape(null)}
-                        onFocus={() => setActiveShape("brackets")}
-                        onBlur={() => setActiveShape(null)}
-                        className="flex flex-col p-8 lg:p-10 rounded-3xl border border-gray-200 dark:border-neutral-800 bg-white/10 dark:bg-neutral-900/10 backdrop-blur-md shadow-sm relative z-10"
-                    >
-                        <div className="mb-6">
-                            <h3 className="text-xl font-bold text-gray-900 dark:text-white mb-2">{t("junior.title")}</h3>
-                            <p className="text-sm text-gray-600 dark:text-neutral-400">{t("junior.description")}</p>
-                        </div>
-                        <div className="mb-8">
-                            <span className="text-4xl lg:text-5xl font-black text-gray-900 dark:text-white">{t("junior.price")}</span>
-                            <span className="text-gray-500 dark:text-neutral-500 font-mono text-sm ml-2">{t("junior.period")}</span>
-                        </div>
-
-                        <ul className="space-y-4 mb-8 flex-1">
-                            {juniorFeatures.map((item) => (
-                                <li key={item} className="flex items-center gap-3 text-sm text-gray-700 dark:text-neutral-300">
-                                    <div className="p-1 rounded-full bg-green-500/10 text-green-500" aria-hidden="true">
-                                        <Check size={12} />
-                                    </div>
-                                    {item}
-                                </li>
-                            ))}
-                             <li className="flex items-center gap-3 text-sm text-gray-400 dark:text-neutral-500 line-through decoration-gray-300 dark:decoration-neutral-700">
-                                    <div className="p-1 rounded-full bg-gray-100 dark:bg-neutral-800 text-gray-400 dark:text-neutral-600" aria-hidden="true">
-                                        <X size={12} />
-                                    </div>
-                                    {t("junior.noYacht")}
-                                </li>
-                        </ul>
-
-                        <Link href="/" className="w-full py-4 rounded-xl border border-gray-200 dark:border-white/10 bg-gray-50 dark:bg-white/5 hover:bg-gray-100 dark:hover:bg-white/10 text-gray-900 dark:text-white font-bold text-center transition-all uppercase tracking-widest text-xs">
-                            {t("junior.cta")}
-                        </Link>
-                    </motion.div>
-
-                    <motion.div
-                        whileHover={{ y: -5 }}
-                        onMouseEnter={() => setActiveShape("heart")}
-                        onMouseLeave={() => setActiveShape(null)}
-                        onFocus={() => setActiveShape("heart")}
-                        onBlur={() => setActiveShape(null)}
-                        className="relative flex flex-col p-8 lg:p-10 rounded-3xl overflow-hidden backdrop-blur-md z-10
-                            border border-[#1e5eff]/30 dark:border-[#ff2d55]/30
-                            bg-gradient-to-b from-[#1e5eff]/5 to-white/10 dark:from-[#ff2d55]/10 dark:to-neutral-900/10"
-                    >
-                        <div className="absolute top-0 right-0 px-3 py-1 rounded-bl-xl uppercase tracking-widest text-[10px] font-bold text-white
-                            bg-[#1e5eff] dark:bg-[#ff2d55]"
-                        >
-                            {t("hero.badge")}
-                        </div>
-
-                        <div className="mb-6">
-                            <h3 className="text-xl font-bold text-gray-900 dark:text-white mb-2 flex items-center gap-2">
-                                {t("hero.title")}
-                                <Heart size={18} className="fill-[#1e5eff] text-[#1e5eff] dark:fill-[#ff2d55] dark:text-[#ff2d55]" aria-label="Supporter" />
-                            </h3>
-                            <p className="text-sm text-neutral-500 dark:text-neutral-400">{t("hero.description")}</p>
-                        </div>
-                        <div className="mb-8">
-                            <span className="text-4xl lg:text-5xl font-black text-[#1e5eff] dark:text-[#ff2d55]">{t("hero.price")}</span>
-                            <span className="text-neutral-500 font-mono text-sm ml-2">{t("hero.period")}</span>
-                        </div>
-
-                        <ul className="space-y-4 mb-8 flex-1">
-                            {heroFeatures.map((item) => (
-                                <li key={item} className="flex items-center gap-3 text-sm text-gray-900 dark:text-white font-medium">
-                                    <div className="p-1 rounded-full bg-[#1e5eff]/20 text-[#1e5eff] dark:bg-[#ff2d55]/20 dark:text-[#ff2d55]" aria-hidden="true">
-                                        <Sparkles size={12} />
-                                    </div>
-                                    {item}
-                                </li>
-                            ))}
-                            <li className="flex items-center gap-3 text-sm text-gray-600 dark:text-neutral-400 italic">
-                                    <div className="p-1 rounded-full bg-gray-200 dark:bg-neutral-800 text-gray-500 dark:text-neutral-500" aria-hidden="true">
-                                        <Server size={12} />
-                                    </div>
-                                    {t("hero.drizzle")}
-                                </li>
-                        </ul>
-
-                        <Link
-                            href="https://github.com/sponsors/DevLoversTeam"
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className="group w-full py-4 rounded-xl text-white font-bold flex items-center justify-center gap-2 transition-all uppercase tracking-widest text-xs
-                                bg-[#1e5eff] hover:bg-[#1e5eff]/90 shadow-[0_0_20px_rgba(30,94,255,0.3)] hover:shadow-[0_0_30px_rgba(30,94,255,0.5)]
-                                dark:bg-[#ff2d55] dark:hover:bg-[#ff2d55]/90 dark:shadow-[0_0_20px_rgba(255,45,85,0.3)] dark:hover:shadow-[0_0_30px_rgba(255,45,85,0.5)]"
-                        >
-                            {t("hero.cta")} <ArrowRight size={14} className="group-hover:translate-x-1 transition-transform" aria-hidden="true" />
-                        </Link>
-                    </motion.div>
+            <div className="mb-6">
+              <h3 className="mb-2 flex items-center gap-2 text-xl font-bold text-gray-900 dark:text-white">
+                {t('hero.title')}
+                <Heart
+                  size={18}
+                  className="fill-[#1e5eff] text-[#1e5eff] dark:fill-[#ff2d55] dark:text-[#ff2d55]"
+                  aria-label="Supporter"
+                />
+              </h3>
+              <p className="text-sm text-neutral-500 dark:text-neutral-400">
+                {t('hero.description')}
+              </p>
+            </div>
+            <div className="mb-8">
+              <span className="text-4xl font-black text-[#1e5eff] lg:text-5xl dark:text-[#ff2d55]">
+                {t('hero.price')}
+              </span>
+              <span className="ml-2 font-mono text-sm text-neutral-500">
+                {t('hero.period')}
+              </span>
+            </div>
 
+            <ul className="mb-8 flex-1 space-y-4">
+              {heroFeatures.map(item => (
+                <li
+                  key={item}
+                  className="flex items-center gap-3 text-sm font-medium text-gray-900 dark:text-white"
+                >
+                  <div
+                    className="rounded-full bg-[#1e5eff]/20 p-1 text-[#1e5eff] dark:bg-[#ff2d55]/20 dark:text-[#ff2d55]"
+                    aria-hidden="true"
+                  >
+                    <Sparkles size={12} />
+                  </div>
+                  {item}
+                </li>
+              ))}
+              <li className="flex items-center gap-3 text-sm text-gray-600 italic dark:text-neutral-400">
+                <div
+                  className="rounded-full bg-gray-200 p-1 text-gray-500 dark:bg-neutral-800 dark:text-neutral-500"
+                  aria-hidden="true"
+                >
+                  <Server size={12} />
                 </div>
-
-                <p className="text-center text-gray-400 dark:text-neutral-600 text-[10px] mb-16 font-mono max-w-lg mx-auto leading-relaxed">
-                    {t("disclaimer")}
-                </p>
-
-                <SponsorsWall sponsors={sponsors} />
-
-            </div>
-        </section>
-    )
-}
\ No newline at end of file
+                {t('hero.drizzle')}
+              </li>
+            </ul>
+
+            <Link
+              href="https://github.com/sponsors/DevLoversTeam"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="group flex w-full items-center justify-center gap-2 rounded-xl bg-[#1e5eff] py-4 text-xs font-bold tracking-widest text-white uppercase shadow-[0_0_20px_rgba(30,94,255,0.3)] transition-all hover:bg-[#1e5eff]/90 hover:shadow-[0_0_30px_rgba(30,94,255,0.5)] dark:bg-[#ff2d55] dark:shadow-[0_0_20px_rgba(255,45,85,0.3)] dark:hover:bg-[#ff2d55]/90 dark:hover:shadow-[0_0_30px_rgba(255,45,85,0.5)]"
+            >
+              {t('hero.cta')}{' '}
+              <ArrowRight
+                size={14}
+                className="transition-transform group-hover:translate-x-1"
+                aria-hidden="true"
+              />
+            </Link>
+          </motion.div>
+        </div>
+
+        <p className="mx-auto mb-16 max-w-lg text-center font-mono text-[10px] leading-relaxed text-gray-400 dark:text-neutral-600">
+          {t('disclaimer')}
+        </p>
+
+        <SponsorsWall sponsors={sponsors} />
+      </div>
+    </section>
+  );
+}
diff --git a/frontend/components/about/SponsorsWall.tsx b/frontend/components/about/SponsorsWall.tsx
index 8eb1cba7..5ea51bd9 100644
--- a/frontend/components/about/SponsorsWall.tsx
+++ b/frontend/components/about/SponsorsWall.tsx
@@ -1,113 +1,143 @@
-"use client"
+'use client';
 
-import { motion } from "framer-motion"
-import Image from "next/image"
-import Link from "next/link"
-import { Plus, Crown, Sparkles } from "lucide-react"
-import { useTranslations } from "next-intl"
-import { cn } from "@/lib/utils"
-import type { Sponsor } from "@/lib/about/github-sponsors"
-import { GradientBadge } from "@/components/ui/gradient-badge"
+import { motion } from 'framer-motion';
+import { Crown, Plus, Sparkles } from 'lucide-react';
+import Image from 'next/image';
+import Link from 'next/link';
+import { useTranslations } from 'next-intl';
+
+import { GradientBadge } from '@/components/ui/gradient-badge';
+import type { Sponsor } from '@/lib/about/github-sponsors';
+import { cn } from '@/lib/utils';
 
 interface SponsorsWallProps {
-  sponsors?: Sponsor[]
+  sponsors?: Sponsor[];
 }
 
-const MAX_SPONSORS = 10
+const MAX_SPONSORS = 10;
 
 export function SponsorsWall({ sponsors = [] }: SponsorsWallProps) {
-  const t = useTranslations("about.sponsors")
-  const displaySponsors = sponsors.slice(0, MAX_SPONSORS)
+  const t = useTranslations('about.sponsors');
+  const displaySponsors = sponsors.slice(0, MAX_SPONSORS);
 
   return (
-    <div className="w-full mt-16 flex flex-col items-center">
+    <div className="mt-16 flex w-full flex-col items-center">
       <div className="mb-4 opacity-100">
-          <GradientBadge icon={Sparkles} text={t("badge")} />
+        <GradientBadge icon={Sparkles} text={t('badge')} />
       </div>
 
       <motion.div
         initial={{ opacity: 0, y: 10 }}
         whileInView={{ opacity: 1, y: 0 }}
         viewport={{ once: true }}
-        className="group relative flex items-center p-2 rounded-full border border-gray-200 dark:border-white/10 bg-white/10 dark:bg-neutral-900/10 backdrop-blur-xl shadow-sm hover:shadow-lg hover:border-[#1e5eff]/20 dark:hover:border-[#ff2d55]/20 transition-all duration-300"
+        className="group relative flex items-center rounded-full border border-gray-200 bg-white/10 p-2 shadow-sm backdrop-blur-xl transition-all duration-300 hover:border-[#1e5eff]/20 hover:shadow-lg dark:border-white/10 dark:bg-neutral-900/10 dark:hover:border-[#ff2d55]/20"
       >
-        <div className="flex -space-x-3 md:-space-x-4 pl-2">
-            {displaySponsors.map((sponsor) => (
-                <SponsorItem key={sponsor.login} sponsor={sponsor} />
-            ))}
-
-             {displaySponsors.length === 0 && (
-                <div className="w-9 h-9 rounded-full bg-gray-100 dark:bg-white/5 border-2 border-white dark:border-black flex items-center justify-center">
-                    <span className="text-[8px] text-gray-400">{t("emptySlot")}</span>
-                </div>
-             )}
+        <div className="flex -space-x-3 pl-2 md:-space-x-4">
+          {displaySponsors.map(sponsor => (
+            <SponsorItem key={sponsor.login} sponsor={sponsor} />
+          ))}
+
+          {displaySponsors.length === 0 && (
+            <div className="flex h-9 w-9 items-center justify-center rounded-full border-2 border-white bg-gray-100 dark:border-black dark:bg-white/5">
+              <span className="text-[8px] text-gray-400">{t('emptySlot')}</span>
+            </div>
+          )}
         </div>
 
-        <div className="h-6 w-[1px] bg-gray-200 dark:bg-white/10 mx-4" />
+        <div className="mx-4 h-6 w-[1px] bg-gray-200 dark:bg-white/10" />
 
         <Link
-            href="https://github.com/sponsors/DevLoversTeam"
-            target="_blank"
-            rel="noopener noreferrer"
-            aria-label={t("ctaAriaLabel")}
-            className="relative flex items-center justify-center w-10 h-10 rounded-full border-2 border-dashed border-gray-300 dark:border-white/20 hover:border-[#1e5eff] dark:hover:border-[#ff2d55] bg-transparent hover:bg-[#1e5eff]/5 dark:hover:bg-[#ff2d55]/5 transition-all group/cta"
+          href="https://github.com/sponsors/DevLoversTeam"
+          target="_blank"
+          rel="noopener noreferrer"
+          aria-label={t('ctaAriaLabel')}
+          className="group/cta relative flex h-10 w-10 items-center justify-center rounded-full border-2 border-dashed border-gray-300 bg-transparent transition-all hover:border-[#1e5eff] hover:bg-[#1e5eff]/5 dark:border-white/20 dark:hover:border-[#ff2d55] dark:hover:bg-[#ff2d55]/5"
         >
-            <Plus size={16} className="text-gray-400 group-hover/cta:text-[#1e5eff] dark:group-hover/cta:text-[#ff2d55] transition-colors" aria-hidden="true" />
-
-            <div className="absolute bottom-full mb-3 left-1/2 -translate-x-1/2 px-2 py-1 bg-[#1e5eff] dark:bg-[#ff2d55] text-white text-[10px] font-bold rounded opacity-0 group-hover/cta:opacity-100 transition-opacity pointer-events-none whitespace-nowrap">
-                {t("yourSpot")}
-                <div className="absolute top-full left-1/2 -translate-x-1/2 border-4 border-transparent border-t-[#1e5eff] dark:border-t-[#ff2d55]" />
-            </div>
+          <Plus
+            size={16}
+            className="text-gray-400 transition-colors group-hover/cta:text-[#1e5eff] dark:group-hover/cta:text-[#ff2d55]"
+            aria-hidden="true"
+          />
+
+          <div className="pointer-events-none absolute bottom-full left-1/2 mb-3 -translate-x-1/2 rounded bg-[#1e5eff] px-2 py-1 text-[10px] font-bold whitespace-nowrap text-white opacity-0 transition-opacity group-hover/cta:opacity-100 dark:bg-[#ff2d55]">
+            {t('yourSpot')}
+            <div className="absolute top-full left-1/2 -translate-x-1/2 border-4 border-transparent border-t-[#1e5eff] dark:border-t-[#ff2d55]" />
+          </div>
         </Link>
 
-        <Link href="https://github.com/sponsors/DevLoversTeam" target="_blank" rel="noopener noreferrer" className="hidden sm:block ml-3 mr-2 text-xs font-bold text-gray-500 hover:text-[#1e5eff] dark:hover:text-[#ff2d55] transition-colors">
-            {t("joinClub")}
+        <Link
+          href="https://github.com/sponsors/DevLoversTeam"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="mr-2 ml-3 hidden text-xs font-bold text-gray-500 transition-colors hover:text-[#1e5eff] sm:block dark:hover:text-[#ff2d55]"
+        >
+          {t('joinClub')}
         </Link>
-
       </motion.div>
 
-      <p className="mt-4 text-[10px] text-gray-500 dark:text-neutral-500 font-mono">
-         {t("fundsNote")}
+      <p className="mt-4 font-mono text-[10px] text-gray-500 dark:text-neutral-500">
+        {t('fundsNote')}
       </p>
-
     </div>
-  )
+  );
 }
 
 function SponsorItem({ sponsor }: { sponsor: Sponsor }) {
-  const ringColor = sponsor.tierColor === 'gold' ? 'ring-[#1e5eff] dark:ring-[#ff2d55]' : 
-                    sponsor.tierColor === 'silver' ? 'ring-gray-400' : 'ring-orange-700/50'
+  const ringColor =
+    sponsor.tierColor === 'gold'
+      ? 'ring-[#1e5eff] dark:ring-[#ff2d55]'
+      : sponsor.tierColor === 'silver'
+        ? 'ring-gray-400'
+        : 'ring-orange-700/50';
 
   return (
-    <Link 
-        href={`https://github.com/${sponsor.login}`}
-        target="_blank"
-        className="group/avatar relative z-0 hover:z-10 transition-transform duration-200 hover:-translate-y-2 hover:scale-110"
+    <Link
+      href={`https://github.com/${sponsor.login}`}
+      target="_blank"
+      className="group/avatar relative z-0 transition-transform duration-200 hover:z-10 hover:-translate-y-2 hover:scale-110"
     >
-        <div className={cn(
-            "relative w-9 h-9 md:w-11 md:h-11 rounded-full border-[3px] overflow-hidden bg-gray-100 dark:bg-[#111] transition-all",
-            "border-white dark:border-black", 
-            (sponsor.tierColor === 'gold' || sponsor.tierColor === 'silver') && `ring-2 ${ringColor} ring-offset-0`
-        )}>
-            <Image src={sponsor.avatarUrl} alt={sponsor.login} fill className="object-cover" />
-            
-            {sponsor.tierColor === 'gold' && (
-                 <div className="absolute inset-0 bg-black/10 flex items-center justify-center opacity-0 group-hover/avatar:opacity-100 transition-opacity">
-                    <Crown size={12} className="text-white fill-white" aria-label="Gold Tier Sponsor" />
-                 </div>
-            )}
-        </div>
+      <div
+        className={cn(
+          'relative h-9 w-9 overflow-hidden rounded-full border-[3px] bg-gray-100 transition-all md:h-11 md:w-11 dark:bg-[#111]',
+          'border-white dark:border-black',
+          (sponsor.tierColor === 'gold' || sponsor.tierColor === 'silver') &&
+            `ring-2 ${ringColor} ring-offset-0`
+        )}
+      >
+        <Image
+          src={sponsor.avatarUrl}
+          alt={sponsor.login}
+          fill
+          className="object-cover"
+        />
+
+        {sponsor.tierColor === 'gold' && (
+          <div className="absolute inset-0 flex items-center justify-center bg-black/10 opacity-0 transition-opacity group-hover/avatar:opacity-100">
+            <Crown
+              size={12}
+              className="fill-white text-white"
+              aria-label="Gold Tier Sponsor"
+            />
+          </div>
+        )}
+      </div>
 
-        <div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 px-3 py-1.5 bg-gray-900 dark:bg-white text-white dark:text-black text-[10px] font-bold rounded-lg opacity-0 group-hover/avatar:opacity-100 transition-all duration-200 pointer-events-none whitespace-nowrap shadow-xl transform translate-y-1 group-hover/avatar:translate-y-0 z-20">
-            <span className="text-gray-300 dark:text-gray-500 font-normal">@{sponsor.login}</span>
-            <span className="mx-1.5 opacity-30">|</span>
-            <span className={cn(
-                "capitalize",
-                sponsor.tierColor === 'gold' ? "text-[#1e5eff] dark:text-[#ff2d55]" : "text-white dark:text-black"
-            )}>
-                {sponsor.tierName}
-            </span>
-        </div>
+      <div className="pointer-events-none absolute bottom-full left-1/2 z-20 mb-2 -translate-x-1/2 translate-y-1 transform rounded-lg bg-gray-900 px-3 py-1.5 text-[10px] font-bold whitespace-nowrap text-white opacity-0 shadow-xl transition-all duration-200 group-hover/avatar:translate-y-0 group-hover/avatar:opacity-100 dark:bg-white dark:text-black">
+        <span className="font-normal text-gray-300 dark:text-gray-500">
+          @{sponsor.login}
+        </span>
+        <span className="mx-1.5 opacity-30">|</span>
+        <span
+          className={cn(
+            'capitalize',
+            sponsor.tierColor === 'gold'
+              ? 'text-[#1e5eff] dark:text-[#ff2d55]'
+              : 'text-white dark:text-black'
+          )}
+        >
+          {sponsor.tierName}
+        </span>
+      </div>
     </Link>
-  )
-}
\ No newline at end of file
+  );
+}
diff --git a/frontend/components/about/TopicsSection.tsx b/frontend/components/about/TopicsSection.tsx
index fce47870..10e28fda 100644
--- a/frontend/components/about/TopicsSection.tsx
+++ b/frontend/components/about/TopicsSection.tsx
@@ -1,101 +1,96 @@
-"use client"
+'use client';
 
-import { motion } from "framer-motion"
-import { ArrowUpRight } from "lucide-react"
-import { useTranslations } from "next-intl"
-import { TOPICS, type Topic } from "@/data/about"
-import Image from "next/image"
-import Link from "next/link"
+import { motion } from 'framer-motion';
+import { ArrowUpRight } from 'lucide-react';
+import Image from 'next/image';
+import Link from 'next/link';
+import { useTranslations } from 'next-intl';
 
-export function TopicsSection() {
-    const t = useTranslations("about.topics")
-
-    return (
-        <section id="topics" className="w-full py-20 lg:py-28 bg-gray-50 dark:bg-transparent">
-            <div className="container-main">
+import { type Topic, TOPICS } from '@/data/about';
 
-                    <div className="mb-16 md:flex md:justify-between md:items-end">
-                        <div className="max-w-2xl">
-                            <motion.div
-                                initial={{ opacity: 0, x: -20 }}
-                                whileInView={{ opacity: 1, x: 0 }}
-                                className="text-blue-600 dark:text-[#ff2d55] font-bold uppercase tracking-widest text-xs mb-4"
-                            >
-                                {t("pretitle")}
-                            </motion.div>
-                            <h2 className="text-4xl md:text-5xl lg:text-6xl font-black text-black dark:text-white tracking-tighter">
-                                {t("titleStart")} <br />
-                                <span className="text-transparent bg-clip-text bg-gradient-to-r from-[#1e5eff] to-[#1e5eff]/70 dark:from-[#ff2d55] dark:to-[#ff2d55]/70">
-                                    {t("titleHighlight")}
-                                </span>
-                            </h2>
-                        </div>
+export function TopicsSection() {
+  const t = useTranslations('about.topics');
 
-                        <p className="hidden md:block text-neutral-600 dark:text-neutral-400 max-w-sm text-base font-normal mt-4 md:mt-0 md:mb-2">
-                             {t("description")}
-                        </p>
-                    </div>
+  return (
+    <section
+      id="topics"
+      className="w-full bg-gray-50 py-20 lg:py-28 dark:bg-transparent"
+    >
+      <div className="container-main">
+        <div className="mb-16 md:flex md:items-end md:justify-between">
+          <div className="max-w-2xl">
+            <motion.div
+              initial={{ opacity: 0, x: -20 }}
+              whileInView={{ opacity: 1, x: 0 }}
+              className="mb-4 text-xs font-bold tracking-widest text-blue-600 uppercase dark:text-[#ff2d55]"
+            >
+              {t('pretitle')}
+            </motion.div>
+            <h2 className="text-4xl font-black tracking-tighter text-black md:text-5xl lg:text-6xl dark:text-white">
+              {t('titleStart')} <br />
+              <span className="bg-gradient-to-r from-[#1e5eff] to-[#1e5eff]/70 bg-clip-text text-transparent dark:from-[#ff2d55] dark:to-[#ff2d55]/70">
+                {t('titleHighlight')}
+              </span>
+            </h2>
+          </div>
 
-                    <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-4">
-                        {TOPICS.map((topic, i) => (
-                            <TopicCard key={topic.id} topic={topic as Topic} index={i} />
-                        ))}
-                    </div>
+          <p className="mt-4 hidden max-w-sm text-base font-normal text-neutral-600 md:mt-0 md:mb-2 md:block dark:text-neutral-400">
+            {t('description')}
+          </p>
+        </div>
 
-            </div>
-        </section>
-    )
+        <div className="grid grid-cols-2 gap-4 md:grid-cols-3 lg:grid-cols-5">
+          {TOPICS.map((topic, i) => (
+            <TopicCard key={topic.id} topic={topic as Topic} index={i} />
+          ))}
+        </div>
+      </div>
+    </section>
+  );
 }
 
-function TopicCard({ topic, index }: { topic: Topic, index: number }) {
-    return (
-        <motion.div
-            initial={{ opacity: 0, y: 20 }}
-            whileInView={{ opacity: 1, y: 0 }}
-            transition={{ delay: index * 0.05 }}
-            viewport={{ once: true, margin: "-50px" }}
-            className="group relative h-full"
+function TopicCard({ topic, index }: { topic: Topic; index: number }) {
+  return (
+    <motion.div
+      initial={{ opacity: 0, y: 20 }}
+      whileInView={{ opacity: 1, y: 0 }}
+      transition={{ delay: index * 0.05 }}
+      viewport={{ once: true, margin: '-50px' }}
+      className="group relative h-full"
+    >
+      <Link href={topic.href} className="block h-full">
+        <div
+          className={`relative h-full overflow-hidden rounded-2xl border border-black/5 bg-white p-6 backdrop-blur-sm transition-all duration-300 ease-out dark:border-white/5 dark:bg-neutral-900/40 ${topic.color} cursor-pointer hover:-translate-y-1 hover:shadow-xl dark:hover:shadow-black/50`}
         >
-            <Link href={topic.href} className="block h-full">
-                <div className={`
-                    relative overflow-hidden
-                    h-full p-6 rounded-2xl 
-                    border border-black/5 dark:border-white/5 
-                    bg-white dark:bg-neutral-900/40 backdrop-blur-sm
-                    transition-all duration-300 ease-out
-                    ${topic.color} 
-                    hover:-translate-y-1 hover:shadow-xl dark:hover:shadow-black/50
-                    cursor-pointer
-                `}>
-                        
-                        <div className="flex justify-between items-start mb-6">
-                            <div className="relative w-10 h-10 grayscale group-hover:grayscale-0 transition-all duration-300 group-hover:scale-110">
-                                <Image
-                                    src={topic.icon}
-                                    alt={topic.name}
-                                    fill
-                                    className="object-contain"
-                                />
-                            </div>
-                            <ArrowUpRight size={16} className="text-neutral-300 dark:text-neutral-700 group-hover:text-black dark:group-hover:text-white transition-colors" />
-                        </div>
+          <div className="mb-6 flex items-start justify-between">
+            <div className="relative h-10 w-10 grayscale transition-all duration-300 group-hover:scale-110 group-hover:grayscale-0">
+              <Image
+                src={topic.icon}
+                alt={topic.name}
+                fill
+                className="object-contain"
+              />
+            </div>
+            <ArrowUpRight
+              size={16}
+              className="text-neutral-300 transition-colors group-hover:text-black dark:text-neutral-700 dark:group-hover:text-white"
+            />
+          </div>
 
-                        <div>
-                            <h3 className="text-sm font-bold text-black dark:text-white mb-1 leading-tight">
-                                {topic.name}
-                            </h3>
-                            <p className="text-[10px] font-mono text-neutral-500 dark:text-neutral-500 uppercase tracking-wider">
-                                {topic.questions}
-                            </p>
-                        </div>
+          <div>
+            <h3 className="mb-1 text-sm leading-tight font-bold text-black dark:text-white">
+              {topic.name}
+            </h3>
+            <p className="font-mono text-[10px] tracking-wider text-neutral-500 uppercase dark:text-neutral-500">
+              {topic.questions}
+            </p>
+          </div>
 
-                        <div className={`
-                            absolute -bottom-6 -right-6 w-20 h-20 rounded-full blur-[40px] opacity-0 
-                            group-hover:opacity-40 transition-opacity duration-500
-                            ${topic.glow}
-                        `} />
-                </div>
-            </Link>
-        </motion.div>
-    )
-}
\ No newline at end of file
+          <div
+            className={`absolute -right-6 -bottom-6 h-20 w-20 rounded-full opacity-0 blur-[40px] transition-opacity duration-500 group-hover:opacity-40 ${topic.glow} `}
+          />
+        </div>
+      </Link>
+    </motion.div>
+  );
+}
diff --git a/frontend/components/auth/AuthErrorBanner.tsx b/frontend/components/auth/AuthErrorBanner.tsx
index 74e76c37..8fbcf8f9 100644
--- a/frontend/components/auth/AuthErrorBanner.tsx
+++ b/frontend/components/auth/AuthErrorBanner.tsx
@@ -1,29 +1,25 @@
 // import type { ReactNode } from "react";
 
 type AuthErrorBannerProps = {
-    message: string;
-    actionLabel?: string;
-    onAction?: () => void;
+  message: string;
+  actionLabel?: string;
+  onAction?: () => void;
 };
 
 export function AuthErrorBanner({
-    message,
-    actionLabel,
-    onAction,
+  message,
+  actionLabel,
+  onAction,
 }: AuthErrorBannerProps) {
-    return (
-        <div className="rounded-md border border-yellow-400 bg-yellow-50 p-3 text-sm text-yellow-800">
-            <p>{message}</p>
+  return (
+    <div className="rounded-md border border-yellow-400 bg-yellow-50 p-3 text-sm text-yellow-800">
+      <p>{message}</p>
 
-            {actionLabel && onAction && (
-                <button
-                    type="button"
-                    onClick={onAction}
-                    className="mt-2 underline"
-                >
-                    {actionLabel}
-                </button>
-            )}
-        </div>
-    );
-}
\ No newline at end of file
+      {actionLabel && onAction && (
+        <button type="button" onClick={onAction} className="mt-2 underline">
+          {actionLabel}
+        </button>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/components/auth/AuthProvidersBlock.tsx b/frontend/components/auth/AuthProvidersBlock.tsx
index 21d0f053..05b10456 100644
--- a/frontend/components/auth/AuthProvidersBlock.tsx
+++ b/frontend/components/auth/AuthProvidersBlock.tsx
@@ -1,22 +1,21 @@
-"use client";
+'use client';
 
-import { useTranslations } from "next-intl";
-import { OAuthButtons } from "@/components/auth/OAuthButtons";
+import { useTranslations } from 'next-intl';
+
+import { OAuthButtons } from '@/components/auth/OAuthButtons';
 
 export function AuthProvidersBlock() {
-    const t = useTranslations("auth");
+  const t = useTranslations('auth');
 
-    return (
-        <>
-            <OAuthButtons />
+  return (
+    <>
+      <OAuthButtons />
 
-            <div className="flex items-center gap-3">
-                <div className="h-px flex-1 bg-gray-200" />
-                <span className="text-xs text-gray-500">
-                    {t("divider")}
-                </span>
-                <div className="h-px flex-1 bg-gray-200" />
-            </div>
-        </>
-    );
-}
\ No newline at end of file
+      <div className="flex items-center gap-3">
+        <div className="h-px flex-1 bg-gray-200" />
+        <span className="text-xs text-gray-500">{t('divider')}</span>
+        <div className="h-px flex-1 bg-gray-200" />
+      </div>
+    </>
+  );
+}
diff --git a/frontend/components/auth/AuthShell.tsx b/frontend/components/auth/AuthShell.tsx
index 1875133f..a9237700 100644
--- a/frontend/components/auth/AuthShell.tsx
+++ b/frontend/components/auth/AuthShell.tsx
@@ -1,31 +1,19 @@
-import type { ReactNode } from "react";
+import type { ReactNode } from 'react';
 
 type AuthShellProps = {
-    title: string;
-    children: ReactNode;
-    footer?: ReactNode;
+  title: string;
+  children: ReactNode;
+  footer?: ReactNode;
 };
 
-export function AuthShell({
-    title,
-    children,
-    footer,
-}: AuthShellProps) {
-    return (
-        <div className="mx-auto max-w-sm py-12">
-            <h1 className="mb-6 text-2xl font-semibold">
-                {title}
-            </h1>
+export function AuthShell({ title, children, footer }: AuthShellProps) {
+  return (
+    <div className="mx-auto max-w-sm py-12">
+      <h1 className="mb-6 text-2xl font-semibold">{title}</h1>
 
-            <div className="space-y-6">
-                {children}
-            </div>
+      <div className="space-y-6">{children}</div>
 
-            {footer && (
-                <div className="mt-6">
-                    {footer}
-                </div>
-            )}
-        </div>
-    );
-}
\ No newline at end of file
+      {footer && <div className="mt-6">{footer}</div>}
+    </div>
+  );
+}
diff --git a/frontend/components/auth/AuthSuccessBanner.tsx b/frontend/components/auth/AuthSuccessBanner.tsx
index 5524ce35..afdddfd4 100644
--- a/frontend/components/auth/AuthSuccessBanner.tsx
+++ b/frontend/components/auth/AuthSuccessBanner.tsx
@@ -1,23 +1,16 @@
-import type { ReactNode } from "react";
+import type { ReactNode } from 'react';
 
 type AuthSuccessBannerProps = {
-    message: ReactNode;
-    footer?: ReactNode;
+  message: ReactNode;
+  footer?: ReactNode;
 };
 
-export function AuthSuccessBanner({
-    message,
-    footer,
-}: AuthSuccessBannerProps) {
-    return (
-        <div className="rounded-md border border-green-400 bg-green-50 p-4 text-sm text-green-800">
-            <div>{message}</div>
+export function AuthSuccessBanner({ message, footer }: AuthSuccessBannerProps) {
+  return (
+    <div className="rounded-md border border-green-400 bg-green-50 p-4 text-sm text-green-800">
+      <div>{message}</div>
 
-            {footer && (
-                <div className="mt-3">
-                    {footer}
-                </div>
-            )}
-        </div>
-    );
-}
\ No newline at end of file
+      {footer && <div className="mt-3">{footer}</div>}
+    </div>
+  );
+}
diff --git a/frontend/components/auth/ForgotPasswordForm.tsx b/frontend/components/auth/ForgotPasswordForm.tsx
index 870ed55c..9f676f93 100644
--- a/frontend/components/auth/ForgotPasswordForm.tsx
+++ b/frontend/components/auth/ForgotPasswordForm.tsx
@@ -1,89 +1,76 @@
-"use client";
+'use client';
 
-import { useState } from "react";
-import { useTranslations } from "next-intl";
-import { Button } from "@/components/ui/button";
-import { AuthShell } from "@/components/auth/AuthShell";
-import { AuthErrorBanner } from "@/components/auth/AuthErrorBanner";
-import { AuthSuccessBanner } from "@/components/auth/AuthSuccessBanner";
-import { EmailField } from "@/components/auth/fields/EmailField";
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
+
+import { AuthErrorBanner } from '@/components/auth/AuthErrorBanner';
+import { AuthShell } from '@/components/auth/AuthShell';
+import { AuthSuccessBanner } from '@/components/auth/AuthSuccessBanner';
+import { EmailField } from '@/components/auth/fields/EmailField';
+import { Button } from '@/components/ui/button';
 
 export function ForgotPasswordForm() {
-    const t = useTranslations("auth.forgotPassword");
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState<string | null>(null);
-    const [emailSent, setEmailSent] = useState(false);
-    const [email, setEmail] = useState("");
+  const t = useTranslations('auth.forgotPassword');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [emailSent, setEmailSent] = useState(false);
+  const [email, setEmail] = useState('');
 
-    async function onSubmit(
-        e: React.FormEvent<HTMLFormElement>
-    ) {
-        e.preventDefault();
-        setLoading(true);
-        setError(null);
+  async function onSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    setLoading(true);
+    setError(null);
 
-        const formData = new FormData(e.currentTarget);
-        const emailValue = String(formData.get("email") || "");
-        setEmail(emailValue);
+    const formData = new FormData(e.currentTarget);
+    const emailValue = String(formData.get('email') || '');
+    setEmail(emailValue);
 
-        try {
-            const res = await fetch(
-                "/api/auth/password-reset",
-                {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    body: JSON.stringify({ email: emailValue }),
-                }
-            );
+    try {
+      const res = await fetch('/api/auth/password-reset', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ email: emailValue }),
+      });
 
-            if (!res.ok) {
-                setError(t("errors.sendFailed"));
-                return;
-            }
+      if (!res.ok) {
+        setError(t('errors.sendFailed'));
+        return;
+      }
 
-            setEmailSent(true);
-        } catch {
-            setError(t("errors.networkError"));
-        } finally {
-            setLoading(false);
-        }
+      setEmailSent(true);
+    } catch {
+      setError(t('errors.networkError'));
+    } finally {
+      setLoading(false);
     }
+  }
 
-    return (
-        <AuthShell title={t("title")}>
-            {emailSent ? (
-                <AuthSuccessBanner
-                    message={
-                        <>
-                            <p>
-                                {t("emailSent")}{" "}
-                                <strong>{email}</strong>.
-                            </p>
-                            <p className="mt-2">
-                                {t("checkInbox")}
-                            </p>
-                        </>
-                    }
-                />
-            ) : (
-                <form onSubmit={onSubmit} className="space-y-4">
-                    <EmailField onChange={setEmail} />
+  return (
+    <AuthShell title={t('title')}>
+      {emailSent ? (
+        <AuthSuccessBanner
+          message={
+            <>
+              <p>
+                {t('emailSent')} <strong>{email}</strong>.
+              </p>
+              <p className="mt-2">{t('checkInbox')}</p>
+            </>
+          }
+        />
+      ) : (
+        <form onSubmit={onSubmit} className="space-y-4">
+          <EmailField onChange={setEmail} />
 
-                    {error && (
-                        <AuthErrorBanner message={error} />
-                    )}
+          {error && <AuthErrorBanner message={error} />}
 
-                    <Button
-                        type="submit"
-                        disabled={loading}
-                        className="w-full"
-                    >
-                        {loading ? t("submitting") : t("submit")}
-                    </Button>
-                </form>
-            )}
-        </AuthShell>
-    );
-}
\ No newline at end of file
+          <Button type="submit" disabled={loading} className="w-full">
+            {loading ? t('submitting') : t('submit')}
+          </Button>
+        </form>
+      )}
+    </AuthShell>
+  );
+}
diff --git a/frontend/components/auth/LoginForm.tsx b/frontend/components/auth/LoginForm.tsx
index baec41b6..cda0b0f7 100644
--- a/frontend/components/auth/LoginForm.tsx
+++ b/frontend/components/auth/LoginForm.tsx
@@ -1,189 +1,171 @@
-"use client";
+'use client';
 
-import { useState } from "react";
-import { useTranslations } from "next-intl";
-import { Link } from "@/i18n/routing";
-import { Button } from "@/components/ui/button";
-import { AuthShell } from "@/components/auth/AuthShell";
-import { AuthProvidersBlock } from "@/components/auth/AuthProvidersBlock";
-import { EmailField } from "@/components/auth/fields/EmailField";
-import { PasswordField } from "@/components/auth/fields/PasswordField";
-import { AuthErrorBanner } from "@/components/auth/AuthErrorBanner";
-import { AuthSuccessBanner } from "@/components/auth/AuthSuccessBanner";
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
 
+import { AuthErrorBanner } from '@/components/auth/AuthErrorBanner';
+import { AuthProvidersBlock } from '@/components/auth/AuthProvidersBlock';
+import { AuthShell } from '@/components/auth/AuthShell';
+import { AuthSuccessBanner } from '@/components/auth/AuthSuccessBanner';
+import { EmailField } from '@/components/auth/fields/EmailField';
+import { PasswordField } from '@/components/auth/fields/PasswordField';
+import { Button } from '@/components/ui/button';
+import { Link } from '@/i18n/routing';
 
 type LoginFormProps = {
-    locale: string;
-    returnTo: string;
+  locale: string;
+  returnTo: string;
 };
 
-export function LoginForm({
-    locale,
-    returnTo,
-}: LoginFormProps) {
-    const t = useTranslations("auth.login");
-    const [loading, setLoading] = useState(false);
-    const [errorMessage, setErrorMessage] =
-        useState<string | null>(null);
-    const [errorCode, setErrorCode] =
-        useState<string | null>(null);
-    const [email, setEmail] = useState("");
-    const [verificationSent, setVerificationSent] =
-        useState(false);
-
-    async function onSubmit(
-        e: React.FormEvent<HTMLFormElement>
-    ) {
-        e.preventDefault();
-        setLoading(true);
-        setErrorMessage(null);
-        setErrorCode(null);
-        setVerificationSent(false);
-
-        const formData = new FormData(e.currentTarget);
-        const emailValue = String(formData.get("email") || "");
-        setEmail(emailValue);
-
-        try {
-            const res = await fetch("/api/auth/login", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({
-                    email: emailValue,
-                    password: formData.get("password"),
-                }),
-            });
-
-            const data = await res.json().catch(() => null);
-
-            if (!res.ok) {
-                setErrorCode(data?.code ?? null);
-
-                if (data?.code === "EMAIL_NOT_VERIFIED") {
-                    setErrorMessage(t("errors.emailNotVerified"));
-                } else {
-                    setErrorMessage(t("errors.invalidCredentials"));
-                }
-                return;
-            }
-
-            window.location.href =
-                returnTo || `/${locale}/dashboard`;
-        } catch (err) {
-            console.error("Login request failed:", err);
-            setErrorMessage(t("errors.networkError"));
-            setErrorCode(null);
-        } finally {
-            setLoading(false);
+export function LoginForm({ locale, returnTo }: LoginFormProps) {
+  const t = useTranslations('auth.login');
+  const [loading, setLoading] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [errorCode, setErrorCode] = useState<string | null>(null);
+  const [email, setEmail] = useState('');
+  const [verificationSent, setVerificationSent] = useState(false);
+
+  async function onSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    setLoading(true);
+    setErrorMessage(null);
+    setErrorCode(null);
+    setVerificationSent(false);
+
+    const formData = new FormData(e.currentTarget);
+    const emailValue = String(formData.get('email') || '');
+    setEmail(emailValue);
+
+    try {
+      const res = await fetch('/api/auth/login', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          email: emailValue,
+          password: formData.get('password'),
+        }),
+      });
+
+      const data = await res.json().catch(() => null);
+
+      if (!res.ok) {
+        setErrorCode(data?.code ?? null);
+
+        if (data?.code === 'EMAIL_NOT_VERIFIED') {
+          setErrorMessage(t('errors.emailNotVerified'));
+        } else {
+          setErrorMessage(t('errors.invalidCredentials'));
         }
+        return;
+      }
+
+      window.location.href = returnTo || `/${locale}/dashboard`;
+    } catch (err) {
+      console.error('Login request failed:', err);
+      setErrorMessage(t('errors.networkError'));
+      setErrorCode(null);
+    } finally {
+      setLoading(false);
     }
-
-    async function resendVerification() {
-        if (!email) return;
-
-        try {
-            const res = await fetch("/api/auth/resend-verification", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ email }),
-            });
-
-            const data = await res.json().catch(() => null);
-
-            if (!res.ok) {
-                setErrorCode(data?.code ?? "RESEND_FAILED");
-                setErrorMessage(data?.error ?? t("errors.resendFailed"));
-                return;
-            }
-
-            setVerificationSent(true);
-            setErrorCode(null);
-            setErrorMessage(null);
-        } catch (err) {
-            console.error("Resend verification failed:", err);
-            setErrorCode("NETWORK_ERROR");
-            setErrorMessage(t("errors.networkError"));
-        }
+  }
+
+  async function resendVerification() {
+    if (!email) return;
+
+    try {
+      const res = await fetch('/api/auth/resend-verification', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ email }),
+      });
+
+      const data = await res.json().catch(() => null);
+
+      if (!res.ok) {
+        setErrorCode(data?.code ?? 'RESEND_FAILED');
+        setErrorMessage(data?.error ?? t('errors.resendFailed'));
+        return;
+      }
+
+      setVerificationSent(true);
+      setErrorCode(null);
+      setErrorMessage(null);
+    } catch (err) {
+      console.error('Resend verification failed:', err);
+      setErrorCode('NETWORK_ERROR');
+      setErrorMessage(t('errors.networkError'));
     }
-
-    return (
-        <AuthShell
-            title={t("title")}
-            footer={
-                <p className="text-sm text-gray-600">
-                    {t("noAccount")}{" "}
-                    <Link
-                        href={
-                            returnTo
-                                ? `/signup?returnTo=${encodeURIComponent(
-                                    returnTo
-                                )}`
-                                : "/signup"
-                        }
-                        className="underline"
-                    >
-                        {t("signupLink")}
-                    </Link>
-                </p>
+  }
+
+  return (
+    <AuthShell
+      title={t('title')}
+      footer={
+        <p className="text-sm text-gray-600">
+          {t('noAccount')}{' '}
+          <Link
+            href={
+              returnTo
+                ? `/signup?returnTo=${encodeURIComponent(returnTo)}`
+                : '/signup'
+            }
+            className="underline"
+          >
+            {t('signupLink')}
+          </Link>
+        </p>
+      }
+    >
+      <AuthProvidersBlock />
+
+      <form onSubmit={onSubmit} className="space-y-4">
+        <EmailField onChange={setEmail} />
+
+        <PasswordField />
+
+        <div className="text-right">
+          <Link
+            href={
+              returnTo
+                ? `/forgot-password?returnTo=${encodeURIComponent(returnTo)}`
+                : '/forgot-password'
+            }
+            className="text-sm text-gray-600 underline"
+          >
+            {t('forgotPassword')}
+          </Link>
+        </div>
+
+        {errorMessage && !verificationSent && (
+          <AuthErrorBanner
+            message={errorMessage}
+            actionLabel={
+              errorCode === 'EMAIL_NOT_VERIFIED'
+                ? t('resendVerification')
+                : undefined
+            }
+            onAction={
+              errorCode === 'EMAIL_NOT_VERIFIED'
+                ? resendVerification
+                : undefined
+            }
+          />
+        )}
+
+        {verificationSent && (
+          <AuthSuccessBanner
+            message={
+              <>
+                {t('verificationSent')} <strong>{email}</strong>
+              </>
             }
-        >
-            <AuthProvidersBlock />
-
-            <form onSubmit={onSubmit} className="space-y-4">
-                <EmailField onChange={setEmail} />
-
-                <PasswordField />
-
-                <div className="text-right">
-                    <Link
-                        href={
-                            returnTo
-                                ? `/forgot-password?returnTo=${encodeURIComponent(
-                                    returnTo
-                                )}`
-                                : "/forgot-password"
-                        }
-                        className="text-sm underline text-gray-600"
-                    >
-                        {t("forgotPassword")}
-                    </Link>
-                </div>
-
-                {errorMessage && !verificationSent && (
-                    <AuthErrorBanner
-                        message={errorMessage}
-                        actionLabel={
-                            errorCode === "EMAIL_NOT_VERIFIED"
-                                ? t("resendVerification")
-                                : undefined
-                        }
-                        onAction={
-                            errorCode === "EMAIL_NOT_VERIFIED"
-                                ? resendVerification
-                                : undefined
-                        }
-                    />
-                )}
-
-                {verificationSent && (
-                    <AuthSuccessBanner
-                        message={
-                            <>
-                                {t("verificationSent")}{" "}
-                                <strong>{email}</strong>
-                            </>
-                        }
-                    />
-                )}
-
-                <Button
-                    type="submit"
-                    disabled={loading}
-                    className="w-full"
-                >
-                    {loading ? t("submitting") : t("submit")}
-                </Button>
-            </form>
-        </AuthShell>
-    );
-}
\ No newline at end of file
+          />
+        )}
+
+        <Button type="submit" disabled={loading} className="w-full">
+          {loading ? t('submitting') : t('submit')}
+        </Button>
+      </form>
+    </AuthShell>
+  );
+}
diff --git a/frontend/components/auth/OAuthButtons.tsx b/frontend/components/auth/OAuthButtons.tsx
index f1088aea..732add73 100644
--- a/frontend/components/auth/OAuthButtons.tsx
+++ b/frontend/components/auth/OAuthButtons.tsx
@@ -1,21 +1,21 @@
-import { ProviderButton } from "./ProviderButton";
-import { GoogleIcon } from "./icons/GoogleIcon";
-import { GitHubIcon } from "./icons/GitHubIcon";
+import { GitHubIcon } from './icons/GitHubIcon';
+import { GoogleIcon } from './icons/GoogleIcon';
+import { ProviderButton } from './ProviderButton';
 
 export function OAuthButtons() {
-    return (
-        <div className="space-y-2">
-            <ProviderButton
-                provider="google"
-                label="Continue with Google"
-                icon={<GoogleIcon className="h-4 w-4" />}
-            />
+  return (
+    <div className="space-y-2">
+      <ProviderButton
+        provider="google"
+        label="Continue with Google"
+        icon={<GoogleIcon className="h-4 w-4" />}
+      />
 
-            <ProviderButton
-                provider="github"
-                label="Continue with GitHub"
-                icon={<GitHubIcon className="h-4 w-4" />}
-            />
-        </div>
-    );
-}
\ No newline at end of file
+      <ProviderButton
+        provider="github"
+        label="Continue with GitHub"
+        icon={<GitHubIcon className="h-4 w-4" />}
+      />
+    </div>
+  );
+}
diff --git a/frontend/components/auth/PostAuthQuizSync.tsx b/frontend/components/auth/PostAuthQuizSync.tsx
index ee4be623..7cdc2aab 100644
--- a/frontend/components/auth/PostAuthQuizSync.tsx
+++ b/frontend/components/auth/PostAuthQuizSync.tsx
@@ -1,63 +1,57 @@
-"use client";
+'use client';
 
-import { useEffect } from "react";
-import { useRouter } from "next/navigation";
-import {
-    getPendingQuizResult,
-    clearPendingQuizResult,
-} from "@/lib/quiz/guest-quiz";
+import { useEffect } from 'react';
 
+import {
+  clearPendingQuizResult,
+  getPendingQuizResult,
+} from '@/lib/quiz/guest-quiz';
 
 export function PostAuthQuizSync() {
-    const router = useRouter();
-
-    useEffect(() => {
-
-        queueMicrotask(() => {
-            const pendingResult = getPendingQuizResult();
-            if (!pendingResult) return;
-
-            (async () => {
-                try {
-                    const res = await fetch("/api/quiz/guest-result", {
-                        method: "POST",
-                        headers: { "Content-Type": "application/json" },
-                        body: JSON.stringify({
-                            quizId: pendingResult.quizId,
-                            answers: pendingResult.answers,
-                            violations: pendingResult.violations,
-                            timeSpentSeconds: pendingResult.timeSpentSeconds,
-                        }),
-                    });
-
-                    if (!res.ok) {
-                        throw new Error(`Failed to save quiz result (${res.status})`);
-                    }
-
-                    const result = await res.json();
-
-                    if (!result?.success) {
-                        throw new Error("Quiz save did not succeed");
-                    }
-
-                    sessionStorage.setItem(
-                        "quiz_just_saved",
-                        JSON.stringify({
-                            score: result.score,
-                            total: result.totalQuestions,
-                            percentage: result.percentage,
-                            pointsAwarded: result.pointsAwarded,
-                            quizSlug: pendingResult.quizSlug,
-                        })
-                    );
-                    clearPendingQuizResult();
-                    router.refresh();
-                } catch (error) {
-                    console.error("Failed to sync guest quiz result:", error);
-                }
-            })();
-        });
-    }, [router]);
-
-    return null;
-}
\ No newline at end of file
+  useEffect(() => {
+    queueMicrotask(() => {
+      const pendingResult = getPendingQuizResult();
+      if (!pendingResult) return;
+
+      (async () => {
+        try {
+          const res = await fetch('/api/quiz/guest-result', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              quizId: pendingResult.quizId,
+              answers: pendingResult.answers,
+              violations: pendingResult.violations,
+              timeSpentSeconds: pendingResult.timeSpentSeconds,
+            }),
+          });
+
+          if (!res.ok) {
+            throw new Error(`Failed to save quiz result (${res.status})`);
+          }
+
+          const result = await res.json();
+
+          if (!result?.success) {
+            throw new Error('Quiz save did not succeed');
+          }
+          sessionStorage.setItem(
+            'quiz_just_saved',
+            JSON.stringify({
+              score: result.score,
+              total: result.totalQuestions,
+              percentage: result.percentage,
+              pointsAwarded: result.pointsAwarded,
+              quizSlug: pendingResult.quizSlug,
+            })
+          );
+          clearPendingQuizResult();
+          window.location.reload();
+        } catch (error) {
+          console.error('Failed to sync guest quiz result:', error);
+        }
+      })();
+    });
+  }, []);
+  return null;
+}
diff --git a/frontend/components/auth/ProviderButton.tsx b/frontend/components/auth/ProviderButton.tsx
index 2a46443c..b874ed45 100644
--- a/frontend/components/auth/ProviderButton.tsx
+++ b/frontend/components/auth/ProviderButton.tsx
@@ -1,32 +1,29 @@
-"use client";
+'use client';
 
-import { Button } from "@/components/ui/button";
-import { ReactNode } from "react";
+import { ReactNode } from 'react';
+
+import { Button } from '@/components/ui/button';
 
 type ProviderButtonProps = {
-    provider: "google" | "github";
-    label: string;
-    icon: ReactNode;
+  provider: 'google' | 'github';
+  label: string;
+  icon: ReactNode;
 };
 
-export function ProviderButton({
-    provider,
-    label,
-    icon,
-}: ProviderButtonProps) {
-    function oauthLogin() {
-        window.location.href = `/api/auth/${provider}`;
-    }
+export function ProviderButton({ provider, label, icon }: ProviderButtonProps) {
+  function oauthLogin() {
+    window.location.href = `/api/auth/${provider}`;
+  }
 
-    return (
-        <Button
-            type="button"
-            variant="outline"
-            className="w-full flex items-center justify-center gap-2"
-            onClick={oauthLogin}
-        >
-            {icon}
-            <span>{label}</span>
-        </Button>
-    );
-}
\ No newline at end of file
+  return (
+    <Button
+      type="button"
+      variant="outline"
+      className="flex w-full items-center justify-center gap-2"
+      onClick={oauthLogin}
+    >
+      {icon}
+      <span>{label}</span>
+    </Button>
+  );
+}
diff --git a/frontend/components/auth/ResetPasswordForm.tsx b/frontend/components/auth/ResetPasswordForm.tsx
index e940a79e..3517c3ed 100644
--- a/frontend/components/auth/ResetPasswordForm.tsx
+++ b/frontend/components/auth/ResetPasswordForm.tsx
@@ -1,83 +1,71 @@
-"use client";
+'use client';
 
-import { useState } from "react";
-import { useTranslations } from "next-intl";
-import { Button } from "@/components/ui/button";
-import { AuthShell } from "@/components/auth/AuthShell";
-import { AuthErrorBanner } from "@/components/auth/AuthErrorBanner";
-import { AuthSuccessBanner } from "@/components/auth/AuthSuccessBanner";
-import { PasswordField } from "@/components/auth/fields/PasswordField";
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
+
+import { AuthErrorBanner } from '@/components/auth/AuthErrorBanner';
+import { AuthShell } from '@/components/auth/AuthShell';
+import { AuthSuccessBanner } from '@/components/auth/AuthSuccessBanner';
+import { PasswordField } from '@/components/auth/fields/PasswordField';
+import { Button } from '@/components/ui/button';
 
 type ResetPasswordFormProps = {
-    token: string;
+  token: string;
 };
 
-export function ResetPasswordForm({
-    token,
-}: ResetPasswordFormProps) {
-    const t = useTranslations("auth.resetPassword");
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState<string | null>(null);
-    const [success, setSuccess] = useState(false);
+export function ResetPasswordForm({ token }: ResetPasswordFormProps) {
+  const t = useTranslations('auth.resetPassword');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [success, setSuccess] = useState(false);
 
-    async function onSubmit(
-        e: React.FormEvent<HTMLFormElement>
-    ) {
-        e.preventDefault();
-        setLoading(true);
-        setError(null);
+  async function onSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    setLoading(true);
+    setError(null);
 
-        const formData = new FormData(e.currentTarget);
+    const formData = new FormData(e.currentTarget);
 
-        try {
-            const res = await fetch(
-                "/api/auth/password-reset/confirm",
-                {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    body: JSON.stringify({
-                        token,
-                        password: formData.get("password"),
-                    }),
-                }
-            );
+    try {
+      const res = await fetch('/api/auth/password-reset/confirm', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          token,
+          password: formData.get('password'),
+        }),
+      });
 
-            if (!res.ok) {
-                setError(t("errors.resetFailed"));
-                return;
-            }
+      if (!res.ok) {
+        setError(t('errors.resetFailed'));
+        return;
+      }
 
-            setSuccess(true);
-        } catch {
-            setError(t("errors.networkError"));
-        } finally {
-            setLoading(false);
-        }
+      setSuccess(true);
+    } catch {
+      setError(t('errors.networkError'));
+    } finally {
+      setLoading(false);
     }
+  }
 
-    return (
-        <AuthShell title={t("title")}>
-            {success ? (
-                <AuthSuccessBanner message={t("success")} />
-            ) : (
-                <form onSubmit={onSubmit} className="space-y-4">
-                    <PasswordField minLength={8} />
+  return (
+    <AuthShell title={t('title')}>
+      {success ? (
+        <AuthSuccessBanner message={t('success')} />
+      ) : (
+        <form onSubmit={onSubmit} className="space-y-4">
+          <PasswordField minLength={8} />
 
-                    {error && (
-                        <AuthErrorBanner message={error} />
-                    )}
+          {error && <AuthErrorBanner message={error} />}
 
-                    <Button
-                        type="submit"
-                        disabled={loading}
-                        className="w-full"
-                    >
-                        {loading ? t("submitting") : t("submit")}
-                    </Button>
-                </form>
-            )}
-        </AuthShell>
-    );
-}
\ No newline at end of file
+          <Button type="submit" disabled={loading} className="w-full">
+            {loading ? t('submitting') : t('submit')}
+          </Button>
+        </form>
+      )}
+    </AuthShell>
+  );
+}
diff --git a/frontend/components/auth/SignupForm.tsx b/frontend/components/auth/SignupForm.tsx
index d798a042..aec0ed7d 100644
--- a/frontend/components/auth/SignupForm.tsx
+++ b/frontend/components/auth/SignupForm.tsx
@@ -1,154 +1,132 @@
-"use client";
-
-import { useState } from "react";
-import { useTranslations } from "next-intl";
-import { Link } from "@/i18n/routing";
-import { Button } from "@/components/ui/button";
-import { AuthShell } from "@/components/auth/AuthShell";
-import { AuthProvidersBlock } from "@/components/auth/AuthProvidersBlock";
-import { EmailField } from "@/components/auth/fields/EmailField";
-import { PasswordField } from "@/components/auth/fields/PasswordField";
-import { NameField } from "@/components/auth/fields/NameField";
-import { AuthErrorBanner } from "@/components/auth/AuthErrorBanner";
-import { AuthSuccessBanner } from "@/components/auth/AuthSuccessBanner";
+'use client';
+
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
+
+import { AuthErrorBanner } from '@/components/auth/AuthErrorBanner';
+import { AuthProvidersBlock } from '@/components/auth/AuthProvidersBlock';
+import { AuthShell } from '@/components/auth/AuthShell';
+import { AuthSuccessBanner } from '@/components/auth/AuthSuccessBanner';
+import { EmailField } from '@/components/auth/fields/EmailField';
+import { NameField } from '@/components/auth/fields/NameField';
+import { PasswordField } from '@/components/auth/fields/PasswordField';
+import { Button } from '@/components/ui/button';
+import { Link } from '@/i18n/routing';
 
 type SignupFormProps = {
-    locale: string;
-    returnTo: string;
+  locale: string;
+  returnTo: string;
 };
 
-export function SignupForm({
-    locale,
-    returnTo,
-}: SignupFormProps) {
-    const t = useTranslations("auth.signup");
-    const [loading, setLoading] = useState(false);
-    const [error, setError] =
-        useState<string | null>(null);
-    const [verificationRequired, setVerificationRequired] =
-        useState(false);
-    const [email, setEmail] = useState("");
-
-    async function onSubmit(
-        e: React.FormEvent<HTMLFormElement>
-    ) {
-        e.preventDefault();
-        setLoading(true);
-        setError(null);
-
-        const formData = new FormData(e.currentTarget);
-        const emailValue = String(formData.get("email") || "");
-        setEmail(emailValue);
-
-        try {
-            const res = await fetch("/api/auth/signup", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({
-                    name: formData.get("name"),
-                    email: emailValue,
-                    password: formData.get("password"),
-                }),
-            });
-
-            const data = await res.json().catch(() => null);
-
-            if (!res.ok) {
-                setError(data?.error ?? t("errors.signupFailed"));
-                return;
-            }
-
-            if (data?.verificationRequired) {
-                setVerificationRequired(true);
-                return;
-            }
-
-            window.location.href =
-                returnTo || `/${locale}/dashboard`;
-        } catch {
-            setError(t("errors.networkError"));
-        } finally {
-            setLoading(false);
-        }
+export function SignupForm({ locale, returnTo }: SignupFormProps) {
+  const t = useTranslations('auth.signup');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [verificationRequired, setVerificationRequired] = useState(false);
+  const [email, setEmail] = useState('');
+
+  async function onSubmit(e: React.FormEvent<HTMLFormElement>) {
+    e.preventDefault();
+    setLoading(true);
+    setError(null);
+
+    const formData = new FormData(e.currentTarget);
+    const emailValue = String(formData.get('email') || '');
+    setEmail(emailValue);
+
+    try {
+      const res = await fetch('/api/auth/signup', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          name: formData.get('name'),
+          email: emailValue,
+          password: formData.get('password'),
+        }),
+      });
+
+      const data = await res.json().catch(() => null);
+
+      if (!res.ok) {
+        setError(data?.error ?? t('errors.signupFailed'));
+        return;
+      }
+
+      if (data?.verificationRequired) {
+        setVerificationRequired(true);
+        return;
+      }
+
+      window.location.href = returnTo || `/${locale}/dashboard`;
+    } catch {
+      setError(t('errors.networkError'));
+    } finally {
+      setLoading(false);
     }
-
-    return (
-        <AuthShell
-            title={t("title")}
-            footer={
-                !verificationRequired && (
-                    <p className="text-sm text-gray-600">
-                        {t("hasAccount")}{" "}
-                        <Link
-                            href={
-                                returnTo
-                                    ? `/login?returnTo=${encodeURIComponent(
-                                        returnTo
-                                    )}`
-                                    : "/login"
-                            }
-                            className="underline"
-                        >
-                            {t("loginLink")}
-                        </Link>
-                    </p>
-                )
-            }
-        >
-            {!verificationRequired && (
-                <AuthProvidersBlock />
-            )}
-
-            {verificationRequired ? (
-                <AuthSuccessBanner
-                    message={
-                        <>
-                            <p>
-                                {t("verificationSent")}{" "}
-                                <strong>{email}</strong>.
-                            </p>
-
-                            <p className="mt-2">
-                                {t("checkInbox")}
-                            </p>
-                        </>
-                    }
-                    footer={
-                        <Link
-                            href={
-                                returnTo
-                                    ? `/login?returnTo=${encodeURIComponent(
-                                        returnTo
-                                    )}`
-                                    : "/login"
-                            }
-                            className="inline-block underline"
-                        >
-                            {t("goToLogin")}
-                        </Link>
-                    }
-                />
-            ) : (
-                <form onSubmit={onSubmit} className="space-y-4">
-                    <NameField />
-
-                    <EmailField />
-
-                    <PasswordField minLength={8} />
-
-                    {error && (
-                        <AuthErrorBanner message={error} />
-                    )}
-
-                    <Button
-                        type="submit"
-                        disabled={loading}
-                        className="w-full"
-                    >
-                        {loading ? t("submitting") : t("submit")}
-                    </Button>
-                </form>
-            )}
-        </AuthShell>
-    );
-}
\ No newline at end of file
+  }
+
+  return (
+    <AuthShell
+      title={t('title')}
+      footer={
+        !verificationRequired && (
+          <p className="text-sm text-gray-600">
+            {t('hasAccount')}{' '}
+            <Link
+              href={
+                returnTo
+                  ? `/login?returnTo=${encodeURIComponent(returnTo)}`
+                  : '/login'
+              }
+              className="underline"
+            >
+              {t('loginLink')}
+            </Link>
+          </p>
+        )
+      }
+    >
+      {!verificationRequired && <AuthProvidersBlock />}
+
+      {verificationRequired ? (
+        <AuthSuccessBanner
+          message={
+            <>
+              <p>
+                {t('verificationSent')} <strong>{email}</strong>.
+              </p>
+
+              <p className="mt-2">{t('checkInbox')}</p>
+            </>
+          }
+          footer={
+            <Link
+              href={
+                returnTo
+                  ? `/login?returnTo=${encodeURIComponent(returnTo)}`
+                  : '/login'
+              }
+              className="inline-block underline"
+            >
+              {t('goToLogin')}
+            </Link>
+          }
+        />
+      ) : (
+        <form onSubmit={onSubmit} className="space-y-4">
+          <NameField />
+
+          <EmailField />
+
+          <PasswordField minLength={8} />
+
+          {error && <AuthErrorBanner message={error} />}
+
+          <Button type="submit" disabled={loading} className="w-full">
+            {loading ? t('submitting') : t('submit')}
+          </Button>
+        </form>
+      )}
+    </AuthShell>
+  );
+}
diff --git a/frontend/components/auth/fields/EmailField.tsx b/frontend/components/auth/fields/EmailField.tsx
index 5a3344f5..e1b3c705 100644
--- a/frontend/components/auth/fields/EmailField.tsx
+++ b/frontend/components/auth/fields/EmailField.tsx
@@ -1,43 +1,37 @@
-"use client";
+'use client';
 
-import { useTranslations } from "next-intl";
+import { useTranslations } from 'next-intl';
 
 type EmailFieldProps = {
-    onChange?: (value: string) => void;
+  onChange?: (value: string) => void;
 };
 
-export function EmailField({
-    onChange,
-}: EmailFieldProps) {
-    const t = useTranslations("auth.fields");
+export function EmailField({ onChange }: EmailFieldProps) {
+  const t = useTranslations('auth.fields');
 
-    const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
-        const input = e.currentTarget;
-        if (input.validity.valueMissing) {
-            input.setCustomValidity(t("validation.required"));
-        } else if (input.validity.typeMismatch) {
-            input.setCustomValidity(t("validation.invalidEmail"));
-        }
-    };
+  const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
+    const input = e.currentTarget;
+    if (input.validity.valueMissing) {
+      input.setCustomValidity(t('validation.required'));
+    } else if (input.validity.typeMismatch) {
+      input.setCustomValidity(t('validation.invalidEmail'));
+    }
+  };
 
-    const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
-        e.currentTarget.setCustomValidity("");
-    };
+  const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
+    e.currentTarget.setCustomValidity('');
+  };
 
-    return (
-        <input
-            name="email"
-            type="email"
-            placeholder={t("email")}
-            required
-            className="w-full rounded border px-3 py-2"
-            onInvalid={handleInvalid}
-            onInput={handleInput}
-            onChange={
-                onChange
-                    ? e => onChange(e.currentTarget.value)
-                    : undefined
-            }
-        />
-    );
+  return (
+    <input
+      name="email"
+      type="email"
+      placeholder={t('email')}
+      required
+      className="w-full rounded border px-3 py-2"
+      onInvalid={handleInvalid}
+      onInput={handleInput}
+      onChange={onChange ? e => onChange(e.currentTarget.value) : undefined}
+    />
+  );
 }
diff --git a/frontend/components/auth/fields/NameField.tsx b/frontend/components/auth/fields/NameField.tsx
index f2ddcee7..0eca8d95 100644
--- a/frontend/components/auth/fields/NameField.tsx
+++ b/frontend/components/auth/fields/NameField.tsx
@@ -1,36 +1,34 @@
-"use client";
+'use client';
 
-import { useTranslations } from "next-intl";
+import { useTranslations } from 'next-intl';
 
 type NameFieldProps = {
-    name?: string;
+  name?: string;
 };
 
-export function NameField({
-    name = "name",
-}: NameFieldProps) {
-    const t = useTranslations("auth.fields");
+export function NameField({ name = 'name' }: NameFieldProps) {
+  const t = useTranslations('auth.fields');
 
-    const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
-        const input = e.currentTarget;
-        if (input.validity.valueMissing) {
-            input.setCustomValidity(t("validation.required"));
-        }
-    };
+  const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
+    const input = e.currentTarget;
+    if (input.validity.valueMissing) {
+      input.setCustomValidity(t('validation.required'));
+    }
+  };
 
-    const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
-        e.currentTarget.setCustomValidity("");
-    };
+  const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
+    e.currentTarget.setCustomValidity('');
+  };
 
-    return (
-        <input
-            name={name}
-            type="text"
-            placeholder={t("name")}
-            required
-            className="w-full rounded border px-3 py-2"
-            onInvalid={handleInvalid}
-            onInput={handleInput}
-        />
-    );
+  return (
+    <input
+      name={name}
+      type="text"
+      placeholder={t('name')}
+      required
+      className="w-full rounded border px-3 py-2"
+      onInvalid={handleInvalid}
+      onInput={handleInput}
+    />
+  );
 }
diff --git a/frontend/components/auth/fields/PasswordField.tsx b/frontend/components/auth/fields/PasswordField.tsx
index 4f78d772..f42a8359 100644
--- a/frontend/components/auth/fields/PasswordField.tsx
+++ b/frontend/components/auth/fields/PasswordField.tsx
@@ -1,56 +1,54 @@
-"use client";
+'use client';
 
-import { useState } from "react";
-import { useTranslations } from "next-intl";
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
 
 type PasswordFieldProps = {
-    name?: string;
-    minLength?: number;
+  name?: string;
+  minLength?: number;
 };
 
 export function PasswordField({
-    name = "password",
-    minLength,
+  name = 'password',
+  minLength,
 }: PasswordFieldProps) {
-    const t = useTranslations("auth.fields");
-    const [visible, setVisible] = useState(false);
+  const t = useTranslations('auth.fields');
+  const [visible, setVisible] = useState(false);
 
-    const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
-        const input = e.currentTarget;
-        if (input.validity.valueMissing) {
-            input.setCustomValidity(t("validation.required"));
-        } else if (input.validity.tooShort && minLength) {
-            input.setCustomValidity(
-                t("validation.passwordTooShort", { minLength })
-            );
-        }
-    };
+  const handleInvalid = (e: React.InvalidEvent<HTMLInputElement>) => {
+    const input = e.currentTarget;
+    if (input.validity.valueMissing) {
+      input.setCustomValidity(t('validation.required'));
+    } else if (input.validity.tooShort && minLength) {
+      input.setCustomValidity(t('validation.passwordTooShort', { minLength }));
+    }
+  };
 
-    const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
-        e.currentTarget.setCustomValidity("");
-    };
+  const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
+    e.currentTarget.setCustomValidity('');
+  };
 
-    return (
-        <div className="relative">
-            <input
-                name={name}
-                type={visible ? "text" : "password"}
-                placeholder={t("password")}
-                required
-                minLength={minLength}
-                className="w-full rounded border px-3 py-2 pr-10"
-                onInvalid={handleInvalid}
-                onInput={handleInput}
-            />
+  return (
+    <div className="relative">
+      <input
+        name={name}
+        type={visible ? 'text' : 'password'}
+        placeholder={t('password')}
+        required
+        minLength={minLength}
+        className="w-full rounded border px-3 py-2 pr-10"
+        onInvalid={handleInvalid}
+        onInput={handleInput}
+      />
 
-            <button
-                type="button"
-                aria-label={visible ? t("hidePassword") : t("showPassword")}
-                onClick={() => setVisible(v => !v)}
-                className="absolute inset-y-0 right-2 flex items-center text-sm text-gray-500"
-            >
-                {visible ? t("hide") : t("show")}
-            </button>
-        </div>
-    );
+      <button
+        type="button"
+        aria-label={visible ? t('hidePassword') : t('showPassword')}
+        onClick={() => setVisible(v => !v)}
+        className="absolute inset-y-0 right-2 flex items-center text-sm text-gray-500"
+      >
+        {visible ? t('hide') : t('show')}
+      </button>
+    </div>
+  );
 }
diff --git a/frontend/components/auth/icons/GitHubIcon.tsx b/frontend/components/auth/icons/GitHubIcon.tsx
index 57b5bf87..2aba759a 100644
--- a/frontend/components/auth/icons/GitHubIcon.tsx
+++ b/frontend/components/auth/icons/GitHubIcon.tsx
@@ -1,13 +1,13 @@
 export function GitHubIcon({ className }: { className?: string }) {
-    return (
-        <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            className={className}
-            fill="currentColor"
-            aria-hidden="true"
-        >
-            <path d="M12 .5C5.73.5.75 5.67.75 12.1c0 5.16 3.33 9.53 7.95 11.07.58.11.79-.26.79-.56v-2.1c-3.23.72-3.91-1.41-3.91-1.41-.53-1.36-1.29-1.72-1.29-1.72-1.05-.74.08-.73.08-.73 1.16.08 1.77 1.21 1.77 1.21 1.03 1.8 2.7 1.28 3.36.98.1-.77.4-1.28.72-1.58-2.58-.3-5.29-1.32-5.29-5.86 0-1.29.45-2.35 1.19-3.18-.12-.3-.52-1.52.11-3.17 0 0 .97-.32 3.18 1.22.92-.26 1.9-.39 2.88-.4.98.01 1.96.14 2.88.4 2.2-1.54 3.17-1.22 3.17-1.22.64 1.65.24 2.87.12 3.17.74.83 1.18 1.89 1.18 3.18 0 4.55-2.72 5.56-5.31 5.86.41.36.77 1.08.77 2.18v3.23c0 .31.21.68.8.56 4.61-1.54 7.93-5.9 7.93-11.06C23.25 5.67 18.27.5 12 .5z" />
-        </svg>
-    );
-}
\ No newline at end of file
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      className={className}
+      fill="currentColor"
+      aria-hidden="true"
+    >
+      <path d="M12 .5C5.73.5.75 5.67.75 12.1c0 5.16 3.33 9.53 7.95 11.07.58.11.79-.26.79-.56v-2.1c-3.23.72-3.91-1.41-3.91-1.41-.53-1.36-1.29-1.72-1.29-1.72-1.05-.74.08-.73.08-.73 1.16.08 1.77 1.21 1.77 1.21 1.03 1.8 2.7 1.28 3.36.98.1-.77.4-1.28.72-1.58-2.58-.3-5.29-1.32-5.29-5.86 0-1.29.45-2.35 1.19-3.18-.12-.3-.52-1.52.11-3.17 0 0 .97-.32 3.18 1.22.92-.26 1.9-.39 2.88-.4.98.01 1.96.14 2.88.4 2.2-1.54 3.17-1.22 3.17-1.22.64 1.65.24 2.87.12 3.17.74.83 1.18 1.89 1.18 3.18 0 4.55-2.72 5.56-5.31 5.86.41.36.77 1.08.77 2.18v3.23c0 .31.21.68.8.56 4.61-1.54 7.93-5.9 7.93-11.06C23.25 5.67 18.27.5 12 .5z" />
+    </svg>
+  );
+}
diff --git a/frontend/components/auth/icons/GoogleIcon.tsx b/frontend/components/auth/icons/GoogleIcon.tsx
index bebc244e..515085b6 100644
--- a/frontend/components/auth/icons/GoogleIcon.tsx
+++ b/frontend/components/auth/icons/GoogleIcon.tsx
@@ -1,15 +1,27 @@
 export function GoogleIcon({ className }: { className?: string }) {
-    return (
-        <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 48 48"
-            className={className}
-            aria-hidden="true"
-        >
-            <path fill="#4285F4" d="M24 9.5c3.54 0 6.3 1.54 7.74 2.82l5.64-5.64C33.92 3.52 29.4 1.5 24 1.5 14.88 1.5 7.04 6.78 3.38 14.44l6.56 5.1C11.6 13.48 17.34 9.5 24 9.5z" />
-            <path fill="#34A853" d="M46.5 24.5c0-1.34-.12-2.62-.34-3.86H24v7.32h12.7c-.54 2.9-2.18 5.36-4.66 7.02l7.2 5.58c4.2-3.88 6.26-9.6 6.26-16.06z" />
-            <path fill="#FBBC05" d="M9.94 28.56a14.3 14.3 0 010-9.12l-6.56-5.1a23.97 23.97 0 000 19.32l6.56-5.1z" />
-            <path fill="#EA4335" d="M24 46.5c5.4 0 9.92-1.78 13.22-4.84l-7.2-5.58c-2 1.34-4.56 2.14-6.02 2.14-6.66 0-12.4-3.98-14.06-9.04l-6.56 5.1C7.04 41.22 14.88 46.5 24 46.5z" />
-        </svg>
-    );
-}
\ No newline at end of file
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 48 48"
+      className={className}
+      aria-hidden="true"
+    >
+      <path
+        fill="#4285F4"
+        d="M24 9.5c3.54 0 6.3 1.54 7.74 2.82l5.64-5.64C33.92 3.52 29.4 1.5 24 1.5 14.88 1.5 7.04 6.78 3.38 14.44l6.56 5.1C11.6 13.48 17.34 9.5 24 9.5z"
+      />
+      <path
+        fill="#34A853"
+        d="M46.5 24.5c0-1.34-.12-2.62-.34-3.86H24v7.32h12.7c-.54 2.9-2.18 5.36-4.66 7.02l7.2 5.58c4.2-3.88 6.26-9.6 6.26-16.06z"
+      />
+      <path
+        fill="#FBBC05"
+        d="M9.94 28.56a14.3 14.3 0 010-9.12l-6.56-5.1a23.97 23.97 0 000 19.32l6.56-5.1z"
+      />
+      <path
+        fill="#EA4335"
+        d="M24 46.5c5.4 0 9.92-1.78 13.22-4.84l-7.2-5.58c-2 1.34-4.56 2.14-6.02 2.14-6.66 0-12.4-3.98-14.06-9.04l-6.56 5.1C7.04 41.22 14.88 46.5 24 46.5z"
+      />
+    </svg>
+  );
+}
diff --git a/frontend/components/auth/logoutButton.tsx b/frontend/components/auth/logoutButton.tsx
index c132f1af..5ad86246 100644
--- a/frontend/components/auth/logoutButton.tsx
+++ b/frontend/components/auth/logoutButton.tsx
@@ -1,8 +1,9 @@
 'use client';
 
+import { LogOut } from 'lucide-react';
 import { useLocale } from 'next-intl';
 import { useTranslations } from 'next-intl';
-import { LogOut } from 'lucide-react';
+
 import { logout } from '@/lib/logout';
 
 type LogoutButtonProps = {
@@ -25,7 +26,7 @@ export function LogoutButton({ iconOnly = false }: LogoutButtonProps) {
         onClick={handleLogout}
         aria-label={t('logout')}
         title={t('logout')}
-        className="flex h-10 w-10 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-secondary hover:text-foreground active:bg-secondary active:text-foreground"
+        className="text-muted-foreground hover:bg-secondary hover:text-foreground active:bg-secondary active:text-foreground flex h-10 w-10 items-center justify-center rounded-md transition-colors"
       >
         <LogOut className="h-5 w-5" />
       </button>
@@ -36,7 +37,7 @@ export function LogoutButton({ iconOnly = false }: LogoutButtonProps) {
     <button
       type="button"
       onClick={handleLogout}
-      className="group relative inline-flex w-fit items-center gap-2 overflow-hidden rounded-lg bg-secondary px-4 py-2 text-sm font-medium text-secondary-foreground transition-all duration-500 hover:text-white active:text-white"
+      className="group bg-secondary text-secondary-foreground relative inline-flex w-fit items-center gap-2 overflow-hidden rounded-lg px-4 py-2 text-sm font-medium transition-all duration-500 hover:text-white active:text-white"
     >
       <span
         className="absolute inset-0 opacity-0 transition-opacity duration-500 ease-out group-hover:opacity-100 group-active:opacity-100"
diff --git a/frontend/components/blog/BlogCard.tsx b/frontend/components/blog/BlogCard.tsx
index 646f282e..b145a1c4 100644
--- a/frontend/components/blog/BlogCard.tsx
+++ b/frontend/components/blog/BlogCard.tsx
@@ -1,15 +1,17 @@
 'use client';
 
-import { useMemo } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useTranslations } from 'next-intl';
+import { useMemo } from 'react';
+
 import { formatBlogDate } from '@/lib/blog/date';
+
 import type {
   Author,
-  Post,
   PortableTextBlock,
   PortableTextSpan,
+  Post,
 } from './BlogFilters';
 
 export default function BlogCard({
@@ -22,6 +24,24 @@ export default function BlogCard({
   disableHoverColor?: boolean;
 }) {
   const t = useTranslations('blog');
+
+  const getCategoryLabel = (categoryName: string): string => {
+    const key = categoryName.toLowerCase() as
+      | 'tech'
+      | 'career'
+      | 'insights'
+      | 'news'
+      | 'growth';
+    const categoryTranslations: Record<string, string> = {
+      tech: t('categories.tech'),
+      career: t('categories.career'),
+      insights: t('categories.insights'),
+      news: t('categories.news'),
+      growth: t('categories.growth'),
+    };
+    return categoryTranslations[key] || categoryName;
+  };
+
   const excerpt =
     (post.body ?? [])
       .filter((b): b is PortableTextBlock => b._type === 'block')
@@ -34,85 +54,54 @@ export default function BlogCard({
     () => formatBlogDate(post.publishedAt),
     [post.publishedAt]
   );
-  const categoryLabel =
+  const rawCategory =
     post.categories?.[0] === 'Growth' ? 'Career' : post.categories?.[0];
+  const categoryLabel = rawCategory ? getCategoryLabel(rawCategory) : undefined;
 
   return (
-    <article
-      className="
-        group
-        bg-transparent
-        border-0
-        shadow-none
-        rounded-none
-        overflow-visible
-        flex flex-col
-        h-full
-        transition
-      "
-    >
+    <article className="group flex h-full flex-col overflow-visible rounded-none border-0 bg-transparent shadow-none transition">
       {post.mainImage && (
         <Link
           href={`/blog/${post.slug.current}`}
-          className="
-            relative w-full aspect-[16/9]
-            overflow-hidden
-            rounded-lg
-            bg-gray-100
-            shadow-[0_8px_24px_rgba(0,0,0,0.08)]
-            dark:border dark:border-[rgba(56,189,248,0.4)] dark:border-[0.5px]
-            transition-transform duration-300
-          "
+          className="relative aspect-[16/9] w-full overflow-hidden rounded-lg bg-gray-100 shadow-[0_8px_24px_rgba(0,0,0,0.08)] transition-transform duration-300 dark:border dark:border-[0.5px] dark:border-[rgba(56,189,248,0.4)]"
         >
           <Image
             src={post.mainImage}
             alt={post.title}
             fill
-            className="object-cover brightness-95 contrast-110 scale-[1.03] transition-transform duration-300 group-hover:scale-[1.06]"
+            className="scale-[1.03] object-cover brightness-95 contrast-110 transition-transform duration-300 group-hover:scale-[1.06]"
             priority={false}
           />
         </Link>
       )}
 
-      <div className="pt-2 px-1 flex flex-col flex-1">
+      <div className="flex flex-1 flex-col px-1 pt-2">
         <Link
           href={`/blog/${post.slug.current}`}
-          className={`
-            block
-            text-[18px] md:text-[22px]
-            font-semibold
-            tracking-tight
-            leading-[1.15]
-            text-gray-950 dark:text-gray-100
-            transition
-            hover:underline
-            group-hover:underline
-            underline-offset-4
-            ${
-              disableHoverColor
-                ? ''
-                : 'hover:text-[var(--accent-primary)] group-hover:text-[var(--accent-primary)]'
-            }
-          `}
+          className={`block text-[18px] leading-[1.15] font-semibold tracking-tight text-gray-950 underline-offset-4 transition group-hover:underline hover:underline md:text-[22px] dark:text-gray-100 ${
+            disableHoverColor
+              ? ''
+              : 'group-hover:text-[var(--accent-primary)] hover:text-[var(--accent-primary)]'
+          } `}
           style={{ fontFamily: 'ui-rounded, system-ui, -apple-system' }}
         >
           {post.title}
         </Link>
 
         {excerpt && (
-          <p className="mt-2 text-[15px] md:text-[16px] leading-[1.55] text-gray-700 dark:text-gray-300 max-w-[60ch] line-clamp-2 whitespace-pre-line">
+          <p className="mt-2 line-clamp-2 max-w-[60ch] text-[15px] leading-[1.55] whitespace-pre-line text-gray-700 md:text-[16px] dark:text-gray-300">
             {excerpt}
           </p>
         )}
 
         <div className="mt-auto pt-3">
           {(post.author?.name || formattedDate || categoryLabel) && (
-            <div className="mb-2 flex flex-wrap items-center gap-2 text-[12px] md:text-[13px] text-gray-500 dark:text-gray-400">
+            <div className="mb-2 flex flex-wrap items-center gap-2 text-[12px] text-gray-500 md:text-[13px] dark:text-gray-400">
               {post.author?.name && (
                 <button
                   type="button"
                   onClick={() => post.author && onAuthorSelect(post.author)}
-                  className="flex items-center gap-2 hover:text-[var(--accent-primary)] hover:underline underline-offset-4 transition"
+                  className="flex items-center gap-2 underline-offset-4 transition hover:text-[var(--accent-primary)] hover:underline"
                 >
                   {post.author?.image && (
                     <span className="relative h-5 w-5 overflow-hidden rounded-full">
diff --git a/frontend/components/blog/BlogCategoryGrid.tsx b/frontend/components/blog/BlogCategoryGrid.tsx
index 2786f4e6..9bad4036 100644
--- a/frontend/components/blog/BlogCategoryGrid.tsx
+++ b/frontend/components/blog/BlogCategoryGrid.tsx
@@ -1,8 +1,9 @@
 'use client';
 
 import { useCallback } from 'react';
-import BlogGrid from '@/components/blog/BlogGrid';
+
 import type { Author, Post } from '@/components/blog/BlogFilters';
+import BlogGrid from '@/components/blog/BlogGrid';
 import { useRouter } from '@/i18n/routing';
 
 export function BlogCategoryGrid({ posts }: { posts: Post[] }) {
diff --git a/frontend/components/blog/BlogCategoryLinks.tsx b/frontend/components/blog/BlogCategoryLinks.tsx
index 1289dfee..cff9cd4a 100644
--- a/frontend/components/blog/BlogCategoryLinks.tsx
+++ b/frontend/components/blog/BlogCategoryLinks.tsx
@@ -1,11 +1,12 @@
 'use client';
 
-import { useTranslations } from 'next-intl';
-import { usePathname } from '@/i18n/routing';
 import { Home } from 'lucide-react';
-import { cn } from '@/lib/utils';
+import { useTranslations } from 'next-intl';
+
 import { AnimatedNavLink } from '@/components/shared/AnimatedNavLink';
 import { HeaderButton } from '@/components/shared/HeaderButton';
+import { usePathname } from '@/i18n/routing';
+import { cn } from '@/lib/utils';
 
 type Category = {
   _id: string;
diff --git a/frontend/components/blog/BlogFilters.tsx b/frontend/components/blog/BlogFilters.tsx
index 9c44f154..ed127b2f 100644
--- a/frontend/components/blog/BlogFilters.tsx
+++ b/frontend/components/blog/BlogFilters.tsx
@@ -1,24 +1,25 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import Image from 'next/image';
-import { useLocale, useTranslations } from 'next-intl';
-import { useSearchParams } from 'next/navigation';
 import {
   Dribbble,
   Facebook,
   Github,
   Globe,
   Instagram,
-  Linkedin,
   Link as LinkIcon,
+  Linkedin,
   Send,
   Twitter,
   Youtube,
 } from 'lucide-react';
-import { usePathname, useRouter } from '@/i18n/routing';
+import Image from 'next/image';
+import { useSearchParams } from 'next/navigation';
+import { useLocale, useTranslations } from 'next-intl';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
 import BlogGrid from '@/components/blog/BlogGrid';
 import { BlogPagination } from '@/components/blog/BlogPagination';
+import { usePathname, useRouter } from '@/i18n/routing';
 import { Link } from '@/i18n/routing';
 import { formatBlogDate } from '@/lib/blog/date';
 
@@ -304,7 +305,7 @@ export default function BlogFilters({
         params.set('page', String(page));
       }
       const nextPath = params.toString() ? `${pathname}?${params}` : pathname;
-    router.replace(nextPath, { scroll: false });
+      router.replace(nextPath, { scroll: false });
     },
     [pathname, router, searchParams]
   );
@@ -441,7 +442,10 @@ export default function BlogFilters({
       return true;
     });
   }, [posts, resolvedAuthor, resolvedCategory, searchQueryNormalized]);
-  const totalPages = Math.max(1, Math.ceil(filteredPosts.length / POSTS_PER_PAGE));
+  const totalPages = Math.max(
+    1,
+    Math.ceil(filteredPosts.length / POSTS_PER_PAGE)
+  );
   const paginatedPosts = useMemo(() => {
     const start = (currentPage - 1) * POSTS_PER_PAGE;
     return filteredPosts.slice(start, start + POSTS_PER_PAGE);
@@ -490,34 +494,38 @@ export default function BlogFilters({
                 href={`/blog/${featuredPost.slug.current}`}
                 className="group block"
               >
-                <div className="overflow-hidden rounded-3xl shadow-[0_12px_30px_rgba(0,0,0,0.12)] h-[300px] sm:h-[340px] md:h-full md:min-h-[400px] lg:min-h-[440px] border-0">
+                <div className="h-[300px] overflow-hidden rounded-3xl border-0 shadow-[0_12px_30px_rgba(0,0,0,0.12)] sm:h-[340px] md:h-full md:min-h-[400px] lg:min-h-[440px]">
                   <img
                     src={featuredPost.mainImage}
                     alt={featuredPost.title}
-                    className="block w-full h-full object-cover transition-transform duration-300 scale-[1.02] group-hover:scale-[1.05] border-0"
+                    className="block h-full w-full scale-[1.02] border-0 object-cover transition-transform duration-300 group-hover:scale-[1.05]"
                   />
                 </div>
               </Link>
             )}
-            <div className="relative flex flex-col h-full pt-8">
+            <div className="relative flex h-full flex-col pt-8">
               {featuredPost.categories?.[0] && (
-                <div className="absolute top-0 left-0 text-xs font-bold uppercase tracking-[0.2em] text-[var(--accent-primary)]">
-                  {featuredPost.categories[0]}
+                <div className="absolute top-0 left-0 text-xs font-bold tracking-[0.2em] text-[var(--accent-primary)] uppercase">
+                  {getCategoryLabel(
+                    featuredPost.categories[0] === 'Growth'
+                      ? 'Career'
+                      : featuredPost.categories[0]
+                  )}
                 </div>
               )}
               <div className="my-auto">
                 <Link
                   href={`/blog/${featuredPost.slug.current}`}
-                  className="mt-3 block text-3xl font-semibold leading-tight text-gray-900 transition hover:underline underline-offset-4 dark:text-gray-100 md:text-4xl"
+                  className="mt-3 block text-3xl leading-tight font-semibold text-gray-900 underline-offset-4 transition hover:underline md:text-4xl dark:text-gray-100"
                 >
                   {featuredPost.title}
                 </Link>
-                <p className="mt-4 text-base leading-relaxed text-gray-600 dark:text-gray-400 line-clamp-3 whitespace-pre-line">
+                <p className="mt-4 line-clamp-3 text-base leading-relaxed whitespace-pre-line text-gray-600 dark:text-gray-400">
                   {plainTextExcerpt(featuredPost.body)}
                 </p>
               </div>
               {featuredPost.publishedAt && (
-                <div className="mt-auto pt-8 flex items-center justify-between text-xs tracking-[0.25em] text-gray-500 dark:text-gray-400">
+                <div className="mt-auto flex items-center justify-between pt-8 text-xs tracking-[0.25em] text-gray-500 dark:text-gray-400">
                   <time
                     dateTime={featuredPost.publishedAt}
                     className="uppercase"
@@ -526,7 +534,7 @@ export default function BlogFilters({
                   </time>
                   <Link
                     href={`/blog/${featuredPost.slug.current}`}
-                    className="text-sm font-medium tracking-normal text-[var(--accent-primary)] transition hover:underline underline-offset-4"
+                    className="text-sm font-medium tracking-normal text-[var(--accent-primary)] underline-offset-4 transition hover:underline"
                   >
                     {t('readMore')} <span aria-hidden="true">→</span>
                   </Link>
@@ -543,7 +551,7 @@ export default function BlogFilters({
             <button
               type="button"
               onClick={clearAll}
-              className="transition hover:text-[var(--accent-primary)] hover:underline underline-offset-4"
+              className="underline-offset-4 transition hover:text-[var(--accent-primary)] hover:underline"
             >
               {tNav('blog')}
             </button>
@@ -569,7 +577,7 @@ export default function BlogFilters({
                 {selectedAuthorData.name && (
                   <h2
                     ref={authorHeadingRef}
-                    className="text-2xl font-semibold text-gray-900 dark:text-gray-100 scroll-mt-24"
+                    className="scroll-mt-24 text-2xl font-semibold text-gray-900 dark:text-gray-100"
                   >
                     {selectedAuthorData.name}
                   </h2>
@@ -588,7 +596,7 @@ export default function BlogFilters({
                   </p>
                 )}
                 {authorBioText && (
-                  <p className="mt-3 whitespace-pre-line text-sm leading-relaxed text-gray-600 dark:text-gray-400">
+                  <p className="mt-3 text-sm leading-relaxed whitespace-pre-line text-gray-600 dark:text-gray-400">
                     {authorBioText}
                   </p>
                 )}
@@ -602,7 +610,7 @@ export default function BlogFilters({
                           href={item.url}
                           target="_blank"
                           rel="noopener noreferrer"
-                          className="group inline-flex items-center gap-2 rounded-full border border-gray-200 px-3 py-1 text-xs text-gray-600 transition hover:text-[var(--accent-primary)] hover:border-[var(--accent-primary)] dark:border-gray-700 dark:text-gray-300 dark:hover:text-[var(--accent-primary)] dark:hover:border-[var(--accent-primary)]"
+                          className="group inline-flex items-center gap-2 rounded-full border border-gray-200 px-3 py-1 text-xs text-gray-600 transition hover:border-[var(--accent-primary)] hover:text-[var(--accent-primary)] dark:border-gray-700 dark:text-gray-300 dark:hover:border-[var(--accent-primary)] dark:hover:text-[var(--accent-primary)]"
                         >
                           <SocialIcon platform={item.platform} />
                           {item.platform || 'link'}
@@ -638,8 +646,8 @@ export default function BlogFilters({
               onClick={() => setSelectedCategory(null)}
               className={
                 !resolvedCategory
-                  ? 'rounded-full border border-transparent px-4 py-2 text-sm font-medium text-[var(--accent-primary)] transition whitespace-nowrap sm:border-[var(--accent-primary)]'
-                  : 'rounded-full border border-transparent px-4 py-2 text-sm text-gray-600 transition whitespace-nowrap dark:text-gray-300 sm:border-gray-300 sm:text-gray-700 sm:dark:border-gray-700 sm:dark:text-gray-200 hover:bg-secondary hover:text-foreground'
+                  ? 'rounded-full border border-transparent px-4 py-2 text-sm font-medium whitespace-nowrap text-[var(--accent-primary)] transition sm:border-[var(--accent-primary)]'
+                  : 'hover:bg-secondary hover:text-foreground rounded-full border border-transparent px-4 py-2 text-sm whitespace-nowrap text-gray-600 transition sm:border-gray-300 sm:text-gray-700 dark:text-gray-300 sm:dark:border-gray-700 sm:dark:text-gray-200'
               }
             >
               {t('all')}
@@ -657,8 +665,8 @@ export default function BlogFilters({
                 }
                 className={
                   resolvedCategory?.norm === category.norm
-                    ? 'rounded-full border border-transparent px-4 py-2 text-sm font-medium text-[var(--accent-primary)] transition whitespace-nowrap sm:border-[var(--accent-primary)]'
-                    : 'rounded-full border border-transparent px-4 py-2 text-sm text-gray-600 transition whitespace-nowrap dark:text-gray-300 sm:border-gray-300 sm:text-gray-700 sm:dark:border-gray-700 sm:dark:text-gray-200 hover:bg-secondary hover:text-foreground'
+                    ? 'rounded-full border border-transparent px-4 py-2 text-sm font-medium whitespace-nowrap text-[var(--accent-primary)] transition sm:border-[var(--accent-primary)]'
+                    : 'hover:bg-secondary hover:text-foreground rounded-full border border-transparent px-4 py-2 text-sm whitespace-nowrap text-gray-600 transition sm:border-gray-300 sm:text-gray-700 dark:text-gray-300 sm:dark:border-gray-700 sm:dark:text-gray-200'
                 }
               >
                 {getCategoryLabel(category.name)}
diff --git a/frontend/components/blog/BlogGrid.tsx b/frontend/components/blog/BlogGrid.tsx
index 9c0fc7b7..f02160bf 100644
--- a/frontend/components/blog/BlogGrid.tsx
+++ b/frontend/components/blog/BlogGrid.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
+
 import BlogCard from '@/components/blog/BlogCard';
 import type { Author, Post } from '@/components/blog/BlogFilters';
 
@@ -20,7 +21,7 @@ export default function BlogGrid({
   }
 
   return (
-    <div className="grid sm:grid-cols-2 lg:grid-cols-3 gap-12">
+    <div className="grid gap-12 sm:grid-cols-2 lg:grid-cols-3">
       {posts.map(post => (
         <BlogCard
           key={post._id}
diff --git a/frontend/components/blog/BlogHeaderSearch.tsx b/frontend/components/blog/BlogHeaderSearch.tsx
index 42ac9d35..c73d34f7 100644
--- a/frontend/components/blog/BlogHeaderSearch.tsx
+++ b/frontend/components/blog/BlogHeaderSearch.tsx
@@ -1,8 +1,9 @@
 'use client';
 
-import { useEffect, useMemo, useRef, useState } from 'react';
 import { Search } from 'lucide-react';
 import { useLocale, useTranslations } from 'next-intl';
+import { useEffect, useMemo, useRef, useState } from 'react';
+
 import { useRouter } from '@/i18n/routing';
 
 type PostSearchItem = {
@@ -42,6 +43,7 @@ function normalizeSearchText(value: string) {
 
 export function BlogHeaderSearch() {
   const t = useTranslations('blog');
+  const tAria = useTranslations('aria');
   const locale = useLocale();
   const [open, setOpen] = useState(false);
   const [value, setValue] = useState('');
@@ -100,7 +102,9 @@ export function BlogHeaderSearch() {
     if (debounceRef.current) window.clearTimeout(debounceRef.current);
     debounceRef.current = window.setTimeout(() => {
       const query = value.trim();
-      router.replace(query ? `/blog?search=${encodeURIComponent(query)}` : '/blog');
+      router.replace(
+        query ? `/blog?search=${encodeURIComponent(query)}` : '/blog'
+      );
     }, 300);
     return () => {
       if (debounceRef.current) window.clearTimeout(debounceRef.current);
@@ -157,8 +161,8 @@ export function BlogHeaderSearch() {
             return next;
           })
         }
-        className="flex h-9 w-9 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-secondary hover:text-foreground"
-        aria-label="Search blog"
+        className="text-muted-foreground hover:bg-secondary hover:text-foreground flex h-9 w-9 items-center justify-center rounded-md transition-colors"
+        aria-label={tAria('searchBlog')}
       >
         <Search className="h-4 w-4" aria-hidden="true" />
       </button>
@@ -166,7 +170,7 @@ export function BlogHeaderSearch() {
       {open && (
         <div
           id="wrap"
-          className="absolute right-0 top-12 z-50 w-72 overflow-hidden rounded-lg border border-border bg-background shadow-lg"
+          className="border-border bg-background absolute top-12 right-0 z-50 w-72 overflow-hidden rounded-lg border shadow-lg"
         >
           <form
             action=""
@@ -187,22 +191,24 @@ export function BlogHeaderSearch() {
                   startLoading();
                 }
               }}
-                onKeyDown={event => {
-                  if (event.key === 'Escape') setOpen(false);
-                }}
+              onKeyDown={event => {
+                if (event.key === 'Escape') setOpen(false);
+              }}
               placeholder={t('searchPlaceholder')}
-              className="w-full bg-transparent text-sm text-foreground outline-none"
-              style={{ fontFamily: 'Lato, system-ui, -apple-system, sans-serif' }}
+              className="text-foreground w-full bg-transparent text-sm outline-none"
+              style={{
+                fontFamily: 'Lato, system-ui, -apple-system, sans-serif',
+              }}
             />
             <input
               id="search_submit"
               value=""
               type="submit"
-              className="text-sm font-medium text-muted-foreground hover:text-foreground"
+              className="text-muted-foreground hover:text-foreground text-sm font-medium"
             />
           </form>
           {value && results.length > 0 && (
-            <div className="max-h-56 overflow-auto border-t border-border py-2">
+            <div className="border-border max-h-56 overflow-auto border-t py-2">
               {results.map(result => (
                 <button
                   key={result._id}
@@ -218,13 +224,13 @@ export function BlogHeaderSearch() {
                     }
                     setOpen(false);
                   }}
-                  className="block w-full px-3 py-2 text-left text-sm text-muted-foreground hover:bg-secondary hover:text-foreground"
+                  className="text-muted-foreground hover:bg-secondary hover:text-foreground block w-full px-3 py-2 text-left text-sm"
                 >
-                  <div className="font-medium text-foreground">
+                  <div className="text-foreground font-medium">
                     {result.title}
                   </div>
                   {result.snippet && (
-                    <div className="mt-1 text-xs text-muted-foreground">
+                    <div className="text-muted-foreground mt-1 text-xs">
                       {result.snippet}
                     </div>
                   )}
@@ -233,7 +239,7 @@ export function BlogHeaderSearch() {
             </div>
           )}
           {value && !results.length && !isLoading && (
-            <div className="border-t border-border px-3 py-2 text-xs text-muted-foreground">
+            <div className="border-border text-muted-foreground border-t px-3 py-2 text-xs">
               {t('noMatches')}
             </div>
           )}
diff --git a/frontend/components/blog/BlogNavLinks.tsx b/frontend/components/blog/BlogNavLinks.tsx
index b2cb7456..62740260 100644
--- a/frontend/components/blog/BlogNavLinks.tsx
+++ b/frontend/components/blog/BlogNavLinks.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import { useEffect, useMemo, useState } from 'react';
-import { usePathname, Link } from '@/i18n/routing';
-import { useSearchParams } from 'next/navigation';
 import groq from 'groq';
+import { useSearchParams } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
+
 import { client } from '@/client';
+import { Link, usePathname } from '@/i18n/routing';
 import { cn } from '@/lib/utils';
 
 type Category = {
@@ -80,7 +81,9 @@ export function BlogNavLinks({
           aria-current={category.isActive ? 'page' : undefined}
           className={cn(
             baseLink,
-            category.isActive ? 'bg-muted text-foreground' : 'text-muted-foreground'
+            category.isActive
+              ? 'bg-muted text-foreground'
+              : 'text-muted-foreground'
           )}
         >
           {category.title}
diff --git a/frontend/components/blog/BlogPageHeader.tsx b/frontend/components/blog/BlogPageHeader.tsx
index 3a2ff306..df3c07cc 100644
--- a/frontend/components/blog/BlogPageHeader.tsx
+++ b/frontend/components/blog/BlogPageHeader.tsx
@@ -14,7 +14,7 @@ export function BlogPageHeader({ title, subtitle }: BlogPageHeaderProps) {
 
   return (
     <>
-      <h1 className="text-5xl font-extrabold mb-3 text-center leading-[1.1] bg-gradient-to-b from-[color-mix(in_srgb,var(--accent-primary)_70%,white)] to-[var(--accent-hover)] bg-clip-text text-transparent">
+      <h1 className="mb-3 bg-gradient-to-b from-[color-mix(in_srgb,var(--accent-primary)_70%,white)] to-[var(--accent-hover)] bg-clip-text text-center text-5xl leading-[1.1] font-extrabold text-transparent">
         {title}
       </h1>
       <p className="mx-auto mb-10 max-w-2xl text-center text-base text-gray-500 dark:text-gray-400">
diff --git a/frontend/components/blog/BlogPagination.tsx b/frontend/components/blog/BlogPagination.tsx
index e65e3e65..9101bb5c 100644
--- a/frontend/components/blog/BlogPagination.tsx
+++ b/frontend/components/blog/BlogPagination.tsx
@@ -1,7 +1,8 @@
 'use client';
 
-import { useEffect, useState } from 'react';
 import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
+
 import { cn } from '@/lib/utils';
 
 interface BlogPaginationProps {
@@ -73,7 +74,7 @@ export function BlogPagination({
 
   return (
     <nav
-      className="flex items-center justify-center gap-1 mt-8 sm:gap-2"
+      className="mt-8 flex items-center justify-center gap-1 sm:gap-2"
       style={
         {
           '--qa-accent': accentColor,
@@ -87,18 +88,18 @@ export function BlogPagination({
         onClick={() => onPageChange(currentPage - 1)}
         disabled={currentPage === 1}
         className={cn(
-          'px-2 py-2 text-sm font-medium rounded-lg transition-colors sm:px-3',
+          'rounded-lg px-2 py-2 text-sm font-medium transition-colors sm:px-3',
           'border border-gray-300 bg-white/90 dark:border-gray-700 dark:bg-neutral-900/80',
           currentPage === 1
-            ? 'text-gray-400 dark:text-gray-600 cursor-not-allowed'
-            : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+            ? 'cursor-not-allowed text-gray-400 dark:text-gray-600'
+            : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
         )}
         aria-label={t('previousPage')}
       >
         ← <span className="hidden sm:inline">{t('previous')}</span>
       </button>
 
-      <div className="flex items-center gap-1 mx-1 sm:mx-2">
+      <div className="mx-1 flex items-center gap-1 sm:mx-2">
         {pages.map((page, index) =>
           page === 'ellipsis' ? (
             <span
@@ -113,10 +114,10 @@ export function BlogPagination({
               onClick={() => onPageChange(page)}
               disabled={page === currentPage}
               className={cn(
-                'min-w-[40px] px-3 py-2 text-sm font-medium rounded-lg transition-colors border border-transparent overflow-hidden bg-white/90 dark:bg-neutral-900/80',
+                'min-w-[40px] overflow-hidden rounded-lg border border-transparent bg-white/90 px-3 py-2 text-sm font-medium transition-colors dark:bg-neutral-900/80',
                 page === currentPage
-                  ? 'shadow-sm text-gray-700 dark:text-gray-300'
-                  : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+                  ? 'text-gray-700 shadow-sm dark:text-gray-300'
+                  : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
               )}
               style={
                 page === currentPage
@@ -140,11 +141,11 @@ export function BlogPagination({
         onClick={() => onPageChange(currentPage + 1)}
         disabled={currentPage === totalPages}
         className={cn(
-          'px-2 py-2 text-sm font-medium rounded-lg transition-colors sm:px-3',
+          'rounded-lg px-2 py-2 text-sm font-medium transition-colors sm:px-3',
           'border border-gray-300 bg-white/90 dark:border-gray-700 dark:bg-neutral-900/80',
           currentPage === totalPages
-            ? 'text-gray-400 dark:text-gray-600 cursor-not-allowed'
-            : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+            ? 'cursor-not-allowed text-gray-400 dark:text-gray-600'
+            : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
         )}
         aria-label={t('nextPage')}
       >
diff --git a/frontend/components/blog/FeaturedPostCtaButton.tsx b/frontend/components/blog/FeaturedPostCtaButton.tsx
index 76d3fe3f..20a41444 100644
--- a/frontend/components/blog/FeaturedPostCtaButton.tsx
+++ b/frontend/components/blog/FeaturedPostCtaButton.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { ArrowUpRight } from 'lucide-react';
+
 import { HeaderButton } from '@/components/shared/HeaderButton';
 
 type FeaturedPostCtaButtonProps = {
diff --git a/frontend/components/dashboard/ProfileCard.tsx b/frontend/components/dashboard/ProfileCard.tsx
index 1eb2b638..c5c276d0 100644
--- a/frontend/components/dashboard/ProfileCard.tsx
+++ b/frontend/components/dashboard/ProfileCard.tsx
@@ -1,6 +1,6 @@
-"use client";
+'use client';
 
-import { useTranslations } from "next-intl";
+import { useTranslations } from 'next-intl';
 
 interface ProfileCardProps {
   user: {
@@ -14,7 +14,7 @@ interface ProfileCardProps {
 }
 
 export function ProfileCard({ user, locale }: ProfileCardProps) {
-  const t = useTranslations("dashboard.profile");
+  const t = useTranslations('dashboard.profile');
 
   const cardStyles = `
     relative overflow-hidden rounded-[2rem]
@@ -29,10 +29,10 @@ export function ProfileCard({ user, locale }: ProfileCardProps) {
     <section className={cardStyles} aria-labelledby="profile-heading">
       <div className="flex items-start gap-6">
         <div
-          className="relative p-[3px] rounded-full bg-gradient-to-br from-sky-400 to-pink-400"
+          className="relative rounded-full bg-gradient-to-br from-sky-400 to-pink-400 p-[3px]"
           aria-hidden="true"
         >
-          <div className="h-20 w-20 rounded-full bg-white dark:bg-slate-900 flex items-center justify-center text-3xl font-bold text-slate-700 dark:text-slate-200">
+          <div className="flex h-20 w-20 items-center justify-center rounded-full bg-white text-3xl font-bold text-slate-700 dark:bg-slate-900 dark:text-slate-200">
             {user.name?.[0]?.toUpperCase() || user.email[0].toUpperCase()}
           </div>
         </div>
@@ -42,33 +42,33 @@ export function ProfileCard({ user, locale }: ProfileCardProps) {
             id="profile-heading"
             className="text-2xl font-bold text-slate-800 dark:text-slate-100"
           >
-            {user.name || t("defaultName")}
+            {user.name || t('defaultName')}
           </h2>
-          <p className="text-slate-500 dark:text-slate-400 text-sm font-mono">
+          <p className="font-mono text-sm text-slate-500 dark:text-slate-400">
             {user.email}
           </p>
 
-          <div className="mt-3 inline-flex items-center px-3 py-1 rounded-full text-xs font-bold uppercase tracking-wider bg-sky-100 dark:bg-sky-900/30 text-sky-700 dark:text-sky-300">
-            {user.role || t("defaultRole")}
+          <div className="mt-3 inline-flex items-center rounded-full bg-sky-100 px-3 py-1 text-xs font-bold tracking-wider text-sky-700 uppercase dark:bg-sky-900/30 dark:text-sky-300">
+            {user.role || t('defaultRole')}
           </div>
         </div>
       </div>
 
-      <dl className="mt-8 pt-6 border-t border-slate-100 dark:border-slate-800/50 grid grid-cols-2 gap-6">
+      <dl className="mt-8 grid grid-cols-2 gap-6 border-t border-slate-100 pt-6 dark:border-slate-800/50">
         <div>
-          <dt className="text-xs font-semibold text-slate-400 uppercase tracking-wider">
-            {t("totalPoints")}
+          <dt className="text-xs font-semibold tracking-wider text-slate-400 uppercase">
+            {t('totalPoints')}
           </dt>
 
-          <dd className="text-3xl font-black text-slate-800 dark:text-white mt-1">
+          <dd className="mt-1 text-3xl font-black text-slate-800 dark:text-white">
             {user.points}
           </dd>
         </div>
         <div>
-          <dt className="text-xs font-semibold text-slate-400 uppercase tracking-wider">
-            {t("joined")}
+          <dt className="text-xs font-semibold tracking-wider text-slate-400 uppercase">
+            {t('joined')}
           </dt>
-          <dd className="text-lg font-medium text-slate-700 dark:text-slate-300 mt-2">
+          <dd className="mt-2 text-lg font-medium text-slate-700 dark:text-slate-300">
             {user.createdAt
               ? new Date(user.createdAt).toLocaleDateString(locale)
               : '-'}
diff --git a/frontend/components/dashboard/QuizSavedBanner.tsx b/frontend/components/dashboard/QuizSavedBanner.tsx
index 20c6e4eb..4bae4a13 100644
--- a/frontend/components/dashboard/QuizSavedBanner.tsx
+++ b/frontend/components/dashboard/QuizSavedBanner.tsx
@@ -1,8 +1,9 @@
 'use client';
 
-import { useEffect, useState } from 'react';
 import { useTranslations } from 'next-intl';
-import { Link } from '@/i18n/routing'
+import { useEffect, useState } from 'react';
+
+import { Link } from '@/i18n/routing';
 
 interface SavedQuizInfo {
   score: number;
@@ -18,44 +19,56 @@ export function QuizSavedBanner() {
 
   useEffect(() => {
     const saved = sessionStorage.getItem('quiz_just_saved');
-    if (saved) {
-       try {
-       setInfo(JSON.parse(saved));
+    if (!saved) return;
+
+    try {
+      const parsed = JSON.parse(saved) as SavedQuizInfo;
+      const timer = setTimeout(() => {
+        setInfo(parsed);
         sessionStorage.removeItem('quiz_just_saved');
-     } catch (error) {
-       console.error('Failed to parse quiz_just_saved from sessionStorage:', error);
+      }, 0);
+      return () => clearTimeout(timer);
+    } catch (error) {
+      console.error('Failed to parse quiz info:', error);
       sessionStorage.removeItem('quiz_just_saved');
     }
-    }
   }, []);
 
   if (!info) return null;
 
   return (
-    <div className="mb-6 p-4 rounded-xl bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800">
-      <div className="text-center space-y-2">
-        <p className="text-green-800 dark:text-green-200 font-medium text-lg">
+    <div className="mb-6 rounded-xl border border-green-200 bg-green-50 p-4 dark:border-green-800 dark:bg-green-900/20">
+      <div className="space-y-2 text-center">
+        <p className="text-lg font-medium text-green-800 dark:text-green-200">
           🎉 {t('title')}
         </p>
         <p className="text-green-700 dark:text-green-300">
-          {t('scored')} <strong>{info.score}/{info.total}</strong> ({info.percentage.toFixed(0)}%)
+          {t('scored')}{' '}
+          <strong>
+            {info.score}/{info.total}
+          </strong>{' '}
+          ({info.percentage.toFixed(0)}%)
           {info.pointsAwarded > 0 && (
-            <> • <strong>{t('pointsAwarded', { points: info.pointsAwarded })}</strong></>
-          )}
-          {info.pointsAwarded === 0 && (
-            <> • {t('noPoints')}</>
+            <>
+              {' '}
+              •{' '}
+              <strong>
+                {t('pointsAwarded', { points: info.pointsAwarded })}
+              </strong>
+            </>
           )}
+          {info.pointsAwarded === 0 && <> • {t('noPoints')}</>}
         </p>
-        <div className="flex gap-3 justify-center pt-2">
+        <div className="flex justify-center gap-3 pt-2">
           <Link
             href="/leaderboard"
-            className="text-green-600 dark:text-green-400 underline hover:no-underline"
+            className="text-green-600 underline hover:no-underline dark:text-green-400"
           >
             {t('viewLeaderboard')}
           </Link>
           <Link
             href={`/quiz/${info.quizSlug}`}
-            className="text-green-600 dark:text-green-400 underline hover:no-underline"
+            className="text-green-600 underline hover:no-underline dark:text-green-400"
           >
             {t('tryAgain')}
           </Link>
diff --git a/frontend/components/dashboard/StatsCard.tsx b/frontend/components/dashboard/StatsCard.tsx
index 7cfb19d3..2679c3f1 100644
--- a/frontend/components/dashboard/StatsCard.tsx
+++ b/frontend/components/dashboard/StatsCard.tsx
@@ -1,8 +1,9 @@
-"use client";
+'use client';
+
+import { History, TrendingUp } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 
-import { useTranslations } from "next-intl";
 import { Link } from '@/i18n/routing';
-import { TrendingUp, History } from 'lucide-react';
 
 interface StatsCardProps {
   stats?: {
@@ -13,7 +14,7 @@ interface StatsCardProps {
 }
 
 export function StatsCard({ stats }: StatsCardProps) {
-  const t = useTranslations("dashboard.stats");
+  const t = useTranslations('dashboard.stats');
   const hasActivity = stats && stats.totalAttempts > 0;
 
   const cardStyles = `
@@ -38,7 +39,7 @@ export function StatsCard({ stats }: StatsCardProps) {
   return (
     <section className={cardStyles} aria-labelledby="stats-heading">
       <div
-        className="mb-6 p-4 rounded-full bg-slate-50 dark:bg-slate-800/50 shadow-inner"
+        className="mb-6 rounded-full bg-slate-50 p-4 shadow-inner dark:bg-slate-800/50"
         aria-hidden="true"
       >
         <span className="text-4xl">📊</span>
@@ -46,38 +47,38 @@ export function StatsCard({ stats }: StatsCardProps) {
 
       <h3
         id="stats-heading"
-        className="text-xl font-bold text-slate-800 dark:text-slate-100 mb-2"
+        className="mb-2 text-xl font-bold text-slate-800 dark:text-slate-100"
       >
-        {t("title")}
+        {t('title')}
       </h3>
 
       {!hasActivity ? (
         <>
-          <p className="text-slate-500 dark:text-slate-400 mb-8 max-w-xs mx-auto">
-            {t("noActivity")}
+          <p className="mx-auto mb-8 max-w-xs text-slate-500 dark:text-slate-400">
+            {t('noActivity')}
           </p>
           <Link href="/quizzes" className={primaryBtnStyles}>
-            <span className="relative z-10">{t("startQuiz")}</span>
+            <span className="relative z-10">{t('startQuiz')}</span>
             <span
-              className="absolute inset-0 rounded-full bg-gradient-to-r from-white/20 to-transparent opacity-0 group-hover:opacity-100 transition-opacity"
+              className="absolute inset-0 rounded-full bg-gradient-to-r from-white/20 to-transparent opacity-0 transition-opacity group-hover:opacity-100"
               aria-hidden="true"
             />
           </Link>
         </>
       ) : (
-        <dl className="w-full grid grid-cols-2 gap-4 mt-2">
-          <div className="p-4 rounded-2xl bg-slate-50/50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-700">
-            <dt className="flex items-center justify-center gap-2 text-xs font-semibold text-slate-400 uppercase tracking-wider mb-1">
-              <History className="w-3 h-3" /> {t("attempts")}
+        <dl className="mt-2 grid w-full grid-cols-2 gap-4">
+          <div className="rounded-2xl border border-slate-100 bg-slate-50/50 p-4 dark:border-slate-700 dark:bg-slate-800/50">
+            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-slate-400 uppercase">
+              <History className="h-3 w-3" /> {t('attempts')}
             </dt>
             <dd className="text-2xl font-black text-slate-800 dark:text-white">
               {stats?.totalAttempts}
             </dd>
           </div>
 
-          <div className="p-4 rounded-2xl bg-slate-50/50 dark:bg-slate-800/50 border border-slate-100 dark:border-slate-700">
-            <dt className="flex items-center justify-center gap-2 text-xs font-semibold text-slate-400 uppercase tracking-wider mb-1">
-              <TrendingUp className="w-3 h-3" /> {t("avgScore")}
+          <div className="rounded-2xl border border-slate-100 bg-slate-50/50 p-4 dark:border-slate-700 dark:bg-slate-800/50">
+            <dt className="mb-1 flex items-center justify-center gap-2 text-xs font-semibold tracking-wider text-slate-400 uppercase">
+              <TrendingUp className="h-3 w-3" /> {t('avgScore')}
             </dt>
             <dd className="text-2xl font-black text-slate-800 dark:text-white">
               {stats?.averageScore}%
@@ -86,7 +87,7 @@ export function StatsCard({ stats }: StatsCardProps) {
 
           <div className="col-span-2 mt-4">
             <Link href="/q&a" className={primaryBtnStyles}>
-              <span className="relative z-10">{t("continueLearning")}</span>
+              <span className="relative z-10">{t('continueLearning')}</span>
             </Link>
           </div>
         </dl>
diff --git a/frontend/components/header/AppChrome.tsx b/frontend/components/header/AppChrome.tsx
index 55a68e77..7689c93a 100644
--- a/frontend/components/header/AppChrome.tsx
+++ b/frontend/components/header/AppChrome.tsx
@@ -1,10 +1,10 @@
 'use client';
 
-import React from 'react';
 import { useSelectedLayoutSegments } from 'next/navigation';
+import React from 'react';
 
 import { UnifiedHeader } from '@/components/header/UnifiedHeader';
-import { CartProvider } from '@/components/shop/cart-provider';
+import { CartProvider } from '@/components/shop/CartProvider';
 
 type AppChromeProps = {
   userExists: boolean;
diff --git a/frontend/components/header/AppMobileMenu.tsx b/frontend/components/header/AppMobileMenu.tsx
index 45b91f45..9fbce6b0 100644
--- a/frontend/components/header/AppMobileMenu.tsx
+++ b/frontend/components/header/AppMobileMenu.tsx
@@ -1,14 +1,14 @@
 'use client';
 
-import { Menu, X, LogIn, ShoppingBag, Home } from 'lucide-react';
-import { useEffect, useMemo, useState } from 'react';
-import { useTranslations } from 'next-intl';
+import { Home, LogIn, Menu, ShoppingBag, X } from 'lucide-react';
 import { useSearchParams } from 'next/navigation';
-import { Link, usePathname } from '@/i18n/routing';
+import { useTranslations } from 'next-intl';
+import { useEffect, useMemo, useState } from 'react';
 
-import { SITE_LINKS } from '@/lib/navigation';
 import { LogoutButton } from '@/components/auth/logoutButton';
 import { HeaderButton } from '@/components/shared/HeaderButton';
+import { Link, usePathname } from '@/i18n/routing';
+import { SITE_LINKS } from '@/lib/navigation';
 
 export type AppMobileMenuVariant = 'platform' | 'shop' | 'blog';
 
@@ -30,7 +30,25 @@ export function AppMobileMenu({
   const tMobileMenu = useTranslations('mobileMenu');
   const tCategories = useTranslations('shop.catalog.categories');
   const tProducts = useTranslations('shop.products');
+  const tBlog = useTranslations('blog');
   const pathname = usePathname();
+
+  const getBlogCategoryLabel = (categoryName: string): string => {
+    const key = categoryName.toLowerCase() as
+      | 'tech'
+      | 'career'
+      | 'insights'
+      | 'news'
+      | 'growth';
+    const categoryTranslations: Record<string, string> = {
+      tech: tBlog('categories.tech'),
+      career: tBlog('categories.career'),
+      insights: tBlog('categories.insights'),
+      news: tBlog('categories.news'),
+      growth: tBlog('categories.growth'),
+    };
+    return categoryTranslations[key] || categoryName;
+  };
   const searchParams = useSearchParams();
   const currentCategory = searchParams.get('category');
   const [open, setOpen] = useState(false);
@@ -61,12 +79,27 @@ export function AppMobileMenu({
     return () => window.removeEventListener('keydown', onKeyDown);
   }, [open]);
 
-  const shopLinks = useMemo(() => [
-    { href: '/shop/products', label: tProducts('title'), category: null },
-    { href: '/shop/products?category=apparel', label: tCategories('apparel'), category: 'apparel' },
-    { href: '/shop/products?category=lifestyle', label: tCategories('lifestyle'), category: 'lifestyle' },
-    { href: '/shop/products?category=collectibles', label: tCategories('collectibles'), category: 'collectibles' },
-  ], [tProducts, tCategories]);
+  const shopLinks = useMemo(
+    () => [
+      { href: '/shop/products', label: tProducts('title'), category: null },
+      {
+        href: '/shop/products?category=apparel',
+        label: tCategories('apparel'),
+        category: 'apparel',
+      },
+      {
+        href: '/shop/products?category=lifestyle',
+        label: tCategories('lifestyle'),
+        category: 'lifestyle',
+      },
+      {
+        href: '/shop/products?category=collectibles',
+        label: tCategories('collectibles'),
+        category: 'collectibles',
+      },
+    ],
+    [tProducts, tCategories]
+  );
 
   const links = useMemo(() => {
     if (variant === 'shop') return shopLinks;
@@ -113,7 +146,7 @@ export function AppMobileMenu({
       <button
         type="button"
         onClick={toggle}
-        className="flex h-9 w-9 items-center justify-center rounded-md transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-accent-primary"
+        className="focus-visible:ring-accent-primary flex h-9 w-9 items-center justify-center rounded-md transition-colors focus:outline-none focus-visible:ring-2"
         style={{
           color: open ? 'var(--accent-primary)' : 'var(--muted-foreground)',
         }}
@@ -127,7 +160,7 @@ export function AppMobileMenu({
       {open && (
         <>
           <div
-            className={`fixed inset-x-0 top-16 bottom-0 z-40 bg-black/50 backdrop-blur-sm lg:hidden transition-opacity duration-200 ${
+            className={`fixed inset-x-0 top-16 bottom-0 z-40 bg-black/50 backdrop-blur-sm transition-opacity duration-200 lg:hidden ${
               isAnimating ? 'opacity-100' : 'opacity-0'
             }`}
             onClick={close}
@@ -136,7 +169,7 @@ export function AppMobileMenu({
 
           <nav
             id="app-mobile-nav"
-            className={`fixed left-0 right-0 top-16 z-50 h-[calc(100dvh-4rem)] overflow-y-auto bg-background px-4 sm:px-6 lg:px-8 py-4 lg:hidden overscroll-contain transition-transform duration-300 ease-out ${
+            className={`bg-background fixed top-16 right-0 left-0 z-50 h-[calc(100dvh-4rem)] overflow-y-auto overscroll-contain px-4 py-4 transition-transform duration-300 ease-out sm:px-6 lg:hidden lg:px-8 ${
               isAnimating ? 'translate-y-0' : '-translate-y-4'
             }`}
             style={{
@@ -151,8 +184,11 @@ export function AppMobileMenu({
                     {t('home')}
                   </HeaderButton>
                   {links.map(link => {
-                    const isActive = pathname === '/shop/products' &&
-                      ('category' in link ? link.category === currentCategory : currentCategory === null);
+                    const isActive =
+                      pathname === '/shop/products' &&
+                      ('category' in link
+                        ? link.category === currentCategory
+                        : currentCategory === null);
                     return (
                       <Link
                         key={link.href}
@@ -176,6 +212,8 @@ export function AppMobileMenu({
                     const slug = slugify(category.title || '');
                     const href = `/blog/category/${slug}`;
                     const isActive = pathname === href;
+                    const displayTitle =
+                      category.title === 'Growth' ? 'Career' : category.title;
                     return (
                       <Link
                         key={category._id}
@@ -183,7 +221,7 @@ export function AppMobileMenu({
                         onClick={close}
                         className={linkClass(isActive)}
                       >
-                        {category.title}
+                        {getBlogCategoryLabel(displayTitle)}
                       </Link>
                     );
                   })}
@@ -226,7 +264,7 @@ export function AppMobileMenu({
                 </Link>
               ) : null}
 
-              <div className="my-2 h-px bg-border" />
+              <div className="bg-border my-2 h-px" />
 
               {userExists ? (
                 <>
diff --git a/frontend/components/header/DesktopActions.tsx b/frontend/components/header/DesktopActions.tsx
index d0e627f2..7fbda96c 100644
--- a/frontend/components/header/DesktopActions.tsx
+++ b/frontend/components/header/DesktopActions.tsx
@@ -1,14 +1,14 @@
 'use client';
 
-import { useTranslations } from 'next-intl';
 import { LogIn, Settings, User } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 
-import { HeaderButton } from '@/components/shared/HeaderButton';
-import { GitHubStarButton } from '@/components/shared/GitHubStarButton';
-import LanguageSwitcher from '@/components/shared/LanguageSwitcher';
 import { LogoutButton } from '@/components/auth/logoutButton';
-import { CartButton } from '@/components/shop/header/cart-button';
 import { BlogHeaderSearch } from '@/components/blog/BlogHeaderSearch';
+import { GitHubStarButton } from '@/components/shared/GitHubStarButton';
+import { HeaderButton } from '@/components/shared/HeaderButton';
+import LanguageSwitcher from '@/components/shared/LanguageSwitcher';
+import { CartButton } from '@/components/shop/header/CartButton';
 
 type DesktopActionsProps = {
   variant: 'platform' | 'shop' | 'blog';
@@ -22,6 +22,7 @@ export function DesktopActions({
   showAdminLink = false,
 }: DesktopActionsProps) {
   const t = useTranslations('navigation');
+  const tAria = useTranslations('aria');
   const isShop = variant === 'shop';
   const isBlog = variant === 'blog';
 
@@ -32,7 +33,7 @@ export function DesktopActions({
           variant="icon"
           href="/dashboard"
           icon={User}
-          label="Dashboard"
+          label={tAria('dashboard')}
         />
       )}
 
@@ -41,7 +42,7 @@ export function DesktopActions({
           variant="icon"
           href="/shop/admin"
           icon={Settings}
-          label="Shop admin"
+          label={tAria('shopAdmin')}
         />
       )}
 
diff --git a/frontend/components/header/DesktopNav.tsx b/frontend/components/header/DesktopNav.tsx
index 957fc6ef..2b82ebe0 100644
--- a/frontend/components/header/DesktopNav.tsx
+++ b/frontend/components/header/DesktopNav.tsx
@@ -1,13 +1,13 @@
 'use client';
 
-import { useTranslations } from 'next-intl';
 import { ShoppingBag } from 'lucide-react';
-import { SITE_LINKS } from '@/lib/navigation';
+import { useTranslations } from 'next-intl';
 
+import { BlogCategoryLinks } from '@/components/blog/BlogCategoryLinks';
 import { NavLink } from '@/components/header/NavLink';
 import { HeaderButton } from '@/components/shared/HeaderButton';
-import { NavLinks } from '@/components/shop/header/nav-links';
-import { BlogCategoryLinks } from '@/components/blog/BlogCategoryLinks';
+import { NavLinks } from '@/components/shop/header/NavLinks';
+import { SITE_LINKS } from '@/lib/navigation';
 
 type Category = {
   _id: string;
diff --git a/frontend/components/header/MainSwitcher.tsx b/frontend/components/header/MainSwitcher.tsx
index 63a313e0..37d7894c 100644
--- a/frontend/components/header/MainSwitcher.tsx
+++ b/frontend/components/header/MainSwitcher.tsx
@@ -1,7 +1,8 @@
 'use client';
 
-import type { ReactNode } from 'react';
 import { usePathname } from 'next/navigation';
+import type { ReactNode } from 'react';
+
 import { UnifiedHeader } from '@/components/header/UnifiedHeader';
 
 function isShopPath(pathname: string): boolean {
@@ -27,6 +28,12 @@ function isHomePath(pathname: string): boolean {
   );
 }
 
+function isQuizzesPath(pathname: string): boolean {
+  const segments = pathname.split('/').filter(Boolean);
+  return segments[0] === 'quizzes' || segments[1] === 'quizzes' ||
+         segments[0] === 'quiz' || segments[1] === 'quiz';
+}
+
 type MainSwitcherProps = {
   children: ReactNode;
   userExists: boolean;
@@ -55,13 +62,15 @@ export function MainSwitcher({
           showAdminLink={showAdminLink}
           blogCategories={blogCategories}
         />
-        <main className="mx-auto px-6 min-h-[80vh]">{children}</main>
+        <main className="mx-auto min-h-[80vh] px-4 sm:px-6 lg:px-8">
+          {children}
+        </main>
       </>
     );
   }
 
   return (
-    <main className={isQa || isHome ? 'mx-auto' : 'mx-auto px-6 min-h-[80vh]'}>
+    <main className={isQa || isHome || isQuizzesPath(pathname) ? 'mx-auto' : 'mx-auto min-h-[80vh] px-6'}>
       {children}
     </main>
   );
diff --git a/frontend/components/header/MobileActions.tsx b/frontend/components/header/MobileActions.tsx
index 76cf49c9..5e19652b 100644
--- a/frontend/components/header/MobileActions.tsx
+++ b/frontend/components/header/MobileActions.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import LanguageSwitcher from '@/components/shared/LanguageSwitcher';
-import { CartButton } from '@/components/shop/header/cart-button';
 import { BlogHeaderSearch } from '@/components/blog/BlogHeaderSearch';
 import { AppMobileMenu } from '@/components/header/AppMobileMenu';
+import LanguageSwitcher from '@/components/shared/LanguageSwitcher';
+import { CartButton } from '@/components/shop/header/CartButton';
 
 type Category = {
   _id: string;
diff --git a/frontend/components/header/NavLink.tsx b/frontend/components/header/NavLink.tsx
index 9d66f983..3ac4d786 100644
--- a/frontend/components/header/NavLink.tsx
+++ b/frontend/components/header/NavLink.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { usePathname } from 'next/navigation';
+
 import { AnimatedNavLink } from '@/components/shared/AnimatedNavLink';
 
 interface NavLinkProps {
diff --git a/frontend/components/header/UnifiedHeader.tsx b/frontend/components/header/UnifiedHeader.tsx
index 4b5d85aa..5d3be135 100644
--- a/frontend/components/header/UnifiedHeader.tsx
+++ b/frontend/components/header/UnifiedHeader.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import { Logo } from '@/components/shared/Logo';
-import { DesktopNav } from '@/components/header/DesktopNav';
 import { DesktopActions } from '@/components/header/DesktopActions';
+import { DesktopNav } from '@/components/header/DesktopNav';
 import { MobileActions } from '@/components/header/MobileActions';
+import { Logo } from '@/components/shared/Logo';
 
 export type UnifiedHeaderVariant = 'platform' | 'shop' | 'blog';
 
@@ -24,7 +24,7 @@ export function UnifiedHeader({
     variant === 'shop' ? '/shop' : variant === 'blog' ? '/blog' : '/';
 
   return (
-    <header className="sticky top-0 z-50 w-full border-b border-border bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
+    <header className="border-border bg-background/95 supports-[backdrop-filter]:bg-background/60 sticky top-0 z-50 w-full border-b backdrop-blur">
       <div className="container-main flex h-16 items-center justify-between">
         <Logo href={brandHref} />
 
diff --git a/frontend/components/home/CodeCard.tsx b/frontend/components/home/CodeCard.tsx
index f66efbf2..1e60b02f 100644
--- a/frontend/components/home/CodeCard.tsx
+++ b/frontend/components/home/CodeCard.tsx
@@ -12,23 +12,23 @@ export function CodeCard({ fileName, snippet, className }: CodeCardProps) {
       className={`pointer-events-none absolute hidden lg:block ${className} animate-card-breathe`}
       aria-hidden="true"
     >
-      <div className="absolute top-1/3 -left-4 -right-4 -bottom-6 bg-[var(--accent-primary)]/8 rounded-3xl blur-2xl" />
+      <div className="absolute top-1/3 -right-4 -bottom-6 -left-4 rounded-3xl bg-[var(--accent-primary)]/8 blur-2xl" />
 
-      <div className="absolute top-1/2 -left-2 -right-2 -bottom-4 bg-[var(--accent-primary)]/12 rounded-2xl blur-xl" />
+      <div className="absolute top-1/2 -right-2 -bottom-4 -left-2 rounded-2xl bg-[var(--accent-primary)]/12 blur-xl" />
 
-      <div className="absolute top-2/3 -left-1 -right-1 -bottom-2 bg-[var(--accent-primary)]/15 rounded-2xl blur-md" />
+      <div className="absolute top-2/3 -right-1 -bottom-2 -left-1 rounded-2xl bg-[var(--accent-primary)]/15 blur-md" />
 
-      <div className="relative rounded-2xl border border-[var(--accent-primary)]/20 bg-card/90 backdrop-blur-xl shadow-2xl dark:shadow-[var(--accent-primary)]/10 px-3.5 py-3 min-w-[180px] max-w-[200px] overflow-hidden">
-        <div className="flex items-center justify-between mb-2 text-[9px] text-muted-foreground/80">
+      <div className="bg-card/90 relative max-w-[200px] min-w-[180px] overflow-hidden rounded-2xl border border-[var(--accent-primary)]/20 px-3.5 py-3 shadow-2xl backdrop-blur-xl dark:shadow-[var(--accent-primary)]/10">
+        <div className="text-muted-foreground/80 mb-2 flex items-center justify-between text-[9px]">
           <div className="flex items-center gap-1">
             <span className="h-1.5 w-1.5 rounded-full bg-red-400/80 shadow-sm" />
             <span className="h-1.5 w-1.5 rounded-full bg-yellow-400/80 shadow-sm" />
             <span className="h-1.5 w-1.5 rounded-full bg-green-400/80 shadow-sm" />
           </div>
-          <span className="font-medium text-[8.5px]">{fileName}</span>
+          <span className="text-[8.5px] font-medium">{fileName}</span>
         </div>
 
-        <code className="text-[10px] whitespace-pre leading-relaxed font-mono text-foreground/85 block relative z-10">
+        <code className="text-foreground/85 relative z-10 block font-mono text-[10px] leading-relaxed whitespace-pre">
           {snippet}
         </code>
       </div>
diff --git a/frontend/components/home/HeroBackground.tsx b/frontend/components/home/HeroBackground.tsx
index 56caf61b..06e360d2 100644
--- a/frontend/components/home/HeroBackground.tsx
+++ b/frontend/components/home/HeroBackground.tsx
@@ -4,15 +4,15 @@ export function HeroBackground() {
       <div className="pointer-events-none absolute inset-0 opacity-60">
         <div className="absolute -top-32 left-1/2 h-96 w-[36rem] -translate-x-1/2 rounded-full bg-[var(--accent-primary)]/20 blur-3xl" />
         <div className="absolute bottom-[-12rem] left-1/4 h-[22rem] w-[22rem] rounded-full bg-[var(--accent-hover)]/15 blur-3xl" />
-        <div className="absolute bottom-[-10rem] right-0 h-[26rem] w-[26rem] rounded-full bg-[var(--accent-primary)]/25 blur-3xl" />
+        <div className="absolute right-0 bottom-[-10rem] h-[26rem] w-[26rem] rounded-full bg-[var(--accent-primary)]/25 blur-3xl" />
       </div>
 
       <div className="pointer-events-none absolute inset-0 opacity-40 dark:opacity-60">
-        <span className="absolute left-[10%] top-[18%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute left-[35%] top-[8%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute left-[70%] top-[16%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
-        <span className="absolute left-[80%] top-[40%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
-        <span className="absolute left-[18%] top-[60%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[18%] left-[10%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[8%] left-[35%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
+        <span className="absolute top-[16%] left-[70%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
+        <span className="absolute top-[40%] left-[80%] h-1 w-1 rounded-full bg-[var(--accent-hover)]" />
+        <span className="absolute top-[60%] left-[18%] h-1 w-1 rounded-full bg-[var(--accent-primary)]" />
       </div>
     </>
   );
diff --git a/frontend/components/home/HeroCodeCards.tsx b/frontend/components/home/HeroCodeCards.tsx
index 8e696b93..106a2e95 100644
--- a/frontend/components/home/HeroCodeCards.tsx
+++ b/frontend/components/home/HeroCodeCards.tsx
@@ -5,7 +5,7 @@ export function HeroCodeCards() {
     <>
       <CodeCard
         fileName="arrays.ts"
-        className="lg:left-16 lg:top-0"
+        className="lg:top-0 lg:left-16"
         snippet={
           <>
             <span className="text-[var(--accent-primary)]">type</span> Arr1 = [
diff --git a/frontend/components/home/HeroSection.tsx b/frontend/components/home/HeroSection.tsx
index 8fee2a71..90998053 100644
--- a/frontend/components/home/HeroSection.tsx
+++ b/frontend/components/home/HeroSection.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
+
 import { HeroBackground } from './HeroBackground';
 import { HeroCodeCards } from './HeroCodeCards';
 import { InteractiveCTAButton } from './InteractiveCTAButton';
@@ -9,35 +10,24 @@ export default function HeroSection() {
   const t = useTranslations('homepage');
 
   return (
-    <section
-      className="
-        relative
-        overflow-hidden
-        min-h-[calc(100vh-260px)]
-sm:min-h-[calc(100vh-280px)] md:min-h-[85vh] lg:min-h-[100vh]
-        flex
-        items-center
-        bg-gray-50 dark:bg-black
-        transition-colors duration-300
-      "
-    >
+    <section className="relative flex min-h-[calc(100vh-260px)] items-center overflow-hidden bg-gray-50 transition-colors duration-300 sm:min-h-[calc(100vh-280px)] md:min-h-[85vh] lg:min-h-[100vh] dark:bg-black">
       <HeroBackground />
 
-      <div className="relative max-w-5xl mx-auto w-full px-6 py-8 sm:py-12 md:py-28 lg:py-[7.5rem] xl:py-32 flex flex-col items-center text-center">
+      <div className="relative mx-auto flex w-full max-w-5xl flex-col items-center px-6 py-8 text-center sm:py-12 md:py-28 lg:py-[7.5rem] xl:py-32">
         <HeroCodeCards />
 
-        <p className="text-[11px] sm:text-xs lg:text-sm tracking-[0.35em] uppercase text-foreground/90 font-bold">
+        <p className="text-foreground/90 text-[11px] font-bold tracking-[0.35em] uppercase sm:text-xs lg:text-sm">
           {t('subtitle')}
         </p>
 
-        <div className="mt-6 sm:mt-8 lg:mt-14 relative inline-block">
-          <h1 className="min-[375px]:text-[3.5rem] text-5xl sm:text-7xl md:text-[5rem] lg:text-8xl xl:text-[100px] font-black tracking-tight relative inline-block px-4">
+        <div className="relative mt-6 inline-block sm:mt-8 lg:mt-14">
+          <h1 className="relative inline-block px-4 text-5xl font-black tracking-tight min-[375px]:text-[3.5rem] sm:text-7xl md:text-[5rem] lg:text-8xl xl:text-[100px]">
             <span className="relative inline-block bg-gradient-to-r from-[var(--accent-primary)]/70 via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 to-[var(--accent-hover)]/70 bg-clip-text text-transparent">
               DevLovers
             </span>
 
             <span
-              className="absolute inset-0 inline-block bg-gradient-to-r from-[var(--accent-primary)] via-[color-mix(in_srgb,var(--accent-primary)_70%,white)] to-[var(--accent-hover)] bg-clip-text text-transparent wave-text-gradient"
+              className="wave-text-gradient absolute inset-0 inline-block bg-gradient-to-r from-[var(--accent-primary)] via-[color-mix(in_srgb,var(--accent-primary)_70%,white)] to-[var(--accent-hover)] bg-clip-text text-transparent"
               aria-hidden="true"
             >
               DevLovers
@@ -45,7 +35,7 @@ sm:min-h-[calc(100vh-280px)] md:min-h-[85vh] lg:min-h-[100vh]
           </h1>
         </div>
 
-        <p className="mt-4 sm:mt-6 md:mt-10 lg:mt-12 md:max-w-xl lg:max-w-2xl text-sm sm:text-sm lg:text-base text-muted-foreground font-light">
+        <p className="text-muted-foreground mt-4 text-sm font-light sm:mt-6 sm:text-sm md:mt-10 md:max-w-xl lg:mt-12 lg:max-w-2xl lg:text-base">
           {t('description')}
         </p>
 
diff --git a/frontend/components/home/InteractiveCTAButton.tsx b/frontend/components/home/InteractiveCTAButton.tsx
index d0426479..80d3dc2d 100644
--- a/frontend/components/home/InteractiveCTAButton.tsx
+++ b/frontend/components/home/InteractiveCTAButton.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import React from 'react';
+import { AnimatePresence, motion } from 'framer-motion';
+import { Heart } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+import React from 'react';
+
 import { Link } from '@/i18n/routing';
-import { motion, AnimatePresence } from 'framer-motion';
-import { Heart } from 'lucide-react';
 
 export function InteractiveCTAButton() {
   const t = useTranslations('homepage');
@@ -12,13 +13,15 @@ export function InteractiveCTAButton() {
   const [variantIndex, setVariantIndex] = React.useState(1);
   const [isHovered, setIsHovered] = React.useState(false);
 
-  // Тимчасово для тестування - цифри замість текстів
   const textVariants = [
-    `${t('cta')} 1`,
-    `${t('cta')} 2`,
-    `${t('cta')} 3`,
-    `${t('cta')} 4`,
-    `${t('cta')} 5`,
+    t('ctaVariants.1'),
+    t('ctaVariants.2'),
+    t('ctaVariants.3'),
+    t('ctaVariants.4'),
+    t('ctaVariants.5'),
+    t('ctaVariants.6'),
+    t('ctaVariants.7'),
+    t('ctaVariants.8'),
   ];
 
   const defaultVariant = t('cta');
@@ -35,7 +38,6 @@ export function InteractiveCTAButton() {
     setVariantIndex(prev => (prev + 1) % textVariants.length);
   };
 
-  // Орбітальні частинки
   const particles = Array.from({ length: 12 }, (_, i) => ({
     id: i,
     angle: (i * 360) / 8,
@@ -46,20 +48,7 @@ export function InteractiveCTAButton() {
       href="/q&a"
       onMouseEnter={handleEnter}
       onMouseLeave={handleLeave}
-      className="
-        group relative inline-flex items-center justify-center overflow-visible rounded-2xl
-        px-8 sm:px-10 md:px-12 py-3 md:py-3.5 lg:py-4
-        text-xs md:text-sm font-semibold tracking-[0.25em] uppercase text-white
-        shadow-[0_18px_45px_rgba(30,94,255,0.35)]
-        dark:shadow-[0_22px_60px_rgba(255,45,85,0.5)]
-        hover:shadow-[0_22px_55px_rgba(30,94,255,0.45)]
-        dark:hover:shadow-[0_28px_70px_rgba(255,45,85,0.6)]
-        transition-shadow duration-500 ease-out
-        active:scale-95
-        active:brightness-110
-        active:shadow-xl
-        focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--accent-primary)] focus-visible:ring-offset-2
-      "
+      className="group relative inline-flex items-center justify-center overflow-visible rounded-2xl px-8 py-3 text-xs font-semibold tracking-[0.25em] text-white uppercase shadow-[0_18px_45px_rgba(30,94,255,0.35)] transition-shadow duration-500 ease-out hover:shadow-[0_22px_55px_rgba(30,94,255,0.45)] focus-visible:ring-2 focus-visible:ring-[var(--accent-primary)] focus-visible:ring-offset-2 focus-visible:outline-none active:scale-95 active:shadow-xl active:brightness-110 sm:px-10 md:px-12 md:py-3.5 md:text-sm lg:py-4 dark:shadow-[0_22px_60px_rgba(255,45,85,0.5)] dark:hover:shadow-[0_28px_70px_rgba(255,45,85,0.6)]"
     >
       {/* Базовий градієнт з анімацією */}
       <motion.span
@@ -87,7 +76,7 @@ export function InteractiveCTAButton() {
 
       {/* М'яка неонова підсвітка */}
       <motion.span
-        className="absolute inset-0 rounded-2xl pointer-events-none"
+        className="pointer-events-none absolute inset-0 rounded-2xl"
         initial={{ opacity: 0 }}
         animate={{
           opacity: isHovered ? [0.15, 0.25, 0.15] : 0,
@@ -111,7 +100,7 @@ export function InteractiveCTAButton() {
           particles.map(particle => (
             <motion.span
               key={particle.id}
-              className="absolute w-3 h-3 pointer-events-none"
+              className="pointer-events-none absolute h-3 w-3"
               style={{
                 left: '50%',
                 top: '50%',
diff --git a/frontend/components/leaderboard/LeaderboardClient.tsx b/frontend/components/leaderboard/LeaderboardClient.tsx
index 970644a9..ac15ab8f 100644
--- a/frontend/components/leaderboard/LeaderboardClient.tsx
+++ b/frontend/components/leaderboard/LeaderboardClient.tsx
@@ -2,10 +2,12 @@
 
 import { motion } from 'framer-motion';
 import { useTranslations } from 'next-intl';
+
 import { DynamicGridBackground } from '@/components/shared/DynamicGridBackground';
+
 import { LeaderboardPodium } from './LeaderboardPodium';
 import { LeaderboardTable } from './LeaderboardTable';
-import { User, CurrentUser } from './types';
+import { CurrentUser, User } from './types';
 
 interface LeaderboardClientProps {
   initialUsers: User[];
@@ -27,18 +29,18 @@ export default function LeaderboardClient({
       <div className="fixed inset-0 z-0">
         <DynamicGridBackground
           showStaticGrid
-          className="w-full h-full bg-gray-50 transition-colors duration-300 dark:bg-transparent"
+          className="h-full w-full bg-gray-50 transition-colors duration-300 dark:bg-transparent"
         />
       </div>
 
-      <div className="relative z-10 w-full max-w-5xl mx-auto px-4 sm:px-6 lg:px-8 flex flex-col items-center pt-20 pb-10">
-        <header className="text-center mb-16 max-w-3xl">
+      <div className="relative z-10 mx-auto flex w-full max-w-5xl flex-col items-center px-4 pt-20 pb-10 sm:px-6 lg:px-8">
+        <header className="mb-16 max-w-3xl text-center">
           <motion.div
             initial={{ y: 20, opacity: 0 }}
             animate={{ y: 0, opacity: 1 }}
             transition={{ duration: 0.6 }}
           >
-            <h1 className="text-4xl md:text-6xl lg:text-7xl font-black tracking-tight text-[var(--accent-primary)] mb-6 drop-shadow-sm">
+            <h1 className="mb-6 text-4xl font-black tracking-tight text-[var(--accent-primary)] drop-shadow-sm md:text-6xl lg:text-7xl">
               {t('title')}
             </h1>
           </motion.div>
@@ -47,24 +49,24 @@ export default function LeaderboardClient({
             initial={{ y: 20, opacity: 0 }}
             animate={{ y: 0, opacity: 1 }}
             transition={{ duration: 0.6, delay: 0.1 }}
-            className="text-lg md:text-xl text-gray-600 dark:text-gray-400 font-light leading-relaxed"
+            className="text-lg leading-relaxed font-light text-gray-600 md:text-xl dark:text-gray-400"
           >
             {t('subtitle')}
           </motion.p>
         </header>
 
-        <div className="w-full flex flex-col items-center">
-          <div className="w-full mb-24">
+        <div className="flex w-full flex-col items-center">
+          <div className="mb-24 w-full">
             {hasResults ? (
               <LeaderboardPodium topThree={topThree} />
             ) : (
               <motion.div
                 initial={{ opacity: 0, scale: 0.95 }}
                 animate={{ opacity: 1, scale: 1 }}
-                className="text-center py-20 rounded-2xl border border-gray-200 dark:border-white/10 bg-white/60 dark:bg-[#111]/60 backdrop-blur-xl shadow-xl"
+                className="rounded-2xl border border-gray-200 bg-white/60 py-20 text-center shadow-xl backdrop-blur-xl dark:border-white/10 dark:bg-[#111]/60"
               >
-                <p className="text-6xl mb-4 grayscale opacity-50">🏆</p>
-                <h2 className="text-2xl font-bold text-gray-900 dark:text-white mb-2">
+                <p className="mb-4 text-6xl opacity-50 grayscale">🏆</p>
+                <h2 className="mb-2 text-2xl font-bold text-gray-900 dark:text-white">
                   {t('noResults')}
                 </h2>
                 <p className="text-gray-600 dark:text-gray-400">
@@ -74,7 +76,7 @@ export default function LeaderboardClient({
             )}
           </div>
 
-          <div className="w-full animate-in fade-in slide-in-from-bottom-8 duration-700 delay-200">
+          <div className="animate-in fade-in slide-in-from-bottom-8 w-full delay-200 duration-700">
             <LeaderboardTable users={allUsers} currentUser={currentUser} />
           </div>
         </div>
diff --git a/frontend/components/leaderboard/LeaderboardPodium.tsx b/frontend/components/leaderboard/LeaderboardPodium.tsx
index 67d9d294..92fc89c1 100644
--- a/frontend/components/leaderboard/LeaderboardPodium.tsx
+++ b/frontend/components/leaderboard/LeaderboardPodium.tsx
@@ -1,9 +1,11 @@
 'use client';
 
-import Image from 'next/image';
 import { motion } from 'framer-motion';
 import { Crown } from 'lucide-react';
+import Image from 'next/image';
+
 import { cn } from '@/lib/utils';
+
 import { User } from './types';
 
 const rankConfig = {
@@ -50,7 +52,7 @@ export function LeaderboardPodium({ topThree }: { topThree: User[] }) {
   ].filter(Boolean) as User[];
 
   return (
-    <div className="flex items-end justify-center gap-4 md:gap-8 h-[350px] w-full max-w-3xl mx-auto">
+    <div className="mx-auto flex h-[350px] w-full max-w-3xl items-end justify-center gap-4 md:gap-8">
       {podiumOrder.map(user => {
         const rank = user.rank as 1 | 2 | 3;
         const isFirst = rank === 1;
@@ -61,29 +63,29 @@ export function LeaderboardPodium({ topThree }: { topThree: User[] }) {
         return (
           <div
             key={user.id}
-            className="relative flex flex-col items-center justify-end w-1/3 h-full"
+            className="relative flex h-full w-1/3 flex-col items-center justify-end"
           >
             <motion.div
               initial={{ opacity: 0, y: 20 }}
               animate={{ opacity: 1, y: 0 }}
               transition={{ delay: delay + 0.5, duration: 0.5 }}
-              className="mb-3 md:mb-4 flex flex-col items-center text-center z-10"
+              className="z-10 mb-3 flex flex-col items-center text-center md:mb-4"
             >
               <div className="relative mb-2">
                 {isFirst && (
                   <Crown
-                    className="absolute -top-6 md:-top-8 left-1/2 -translate-x-1/2 w-5 h-5 md:w-6 md:h-6 text-yellow-500 animate-bounce"
+                    className="absolute -top-6 left-1/2 h-5 w-5 -translate-x-1/2 animate-bounce text-yellow-500 md:-top-8 md:h-6 md:w-6"
                     fill="currentColor"
                   />
                 )}
 
                 <div
                   className={cn(
-                    'relative w-14 h-14 md:w-20 md:h-20 rounded-full p-1 transition-colors duration-300 border-2',
+                    'relative h-14 w-14 rounded-full border-2 p-1 transition-colors duration-300 md:h-20 md:w-20',
                     style.ring
                   )}
                 >
-                  <div className="relative w-full h-full rounded-full overflow-hidden bg-gray-100 dark:bg-black">
+                  <div className="relative h-full w-full overflow-hidden rounded-full bg-gray-100 dark:bg-black">
                     <Image
                       src={user.avatar}
                       alt={user.username}
@@ -94,7 +96,7 @@ export function LeaderboardPodium({ topThree }: { topThree: User[] }) {
 
                   <div
                     className={cn(
-                      'absolute -bottom-2 left-1/2 -translate-x-1/2 w-5 h-5 md:w-6 md:h-6 rounded-full flex items-center justify-center text-[10px] md:text-xs font-bold text-white shadow-sm transition-colors duration-300',
+                      'absolute -bottom-2 left-1/2 flex h-5 w-5 -translate-x-1/2 items-center justify-center rounded-full text-[10px] font-bold text-white shadow-sm transition-colors duration-300 md:h-6 md:w-6 md:text-xs',
                       style.badge
                     )}
                   >
@@ -103,13 +105,13 @@ export function LeaderboardPodium({ topThree }: { topThree: User[] }) {
                 </div>
               </div>
 
-              <div className="font-bold text-gray-900 dark:text-white text-xs md:text-base truncate max-w-[90px] md:max-w-[140px]">
+              <div className="max-w-[90px] truncate text-xs font-bold text-gray-900 md:max-w-[140px] md:text-base dark:text-white">
                 {user.username}
               </div>
 
               <div
                 className={cn(
-                  'font-mono font-bold mt-0.5 text-base md:text-lg',
+                  'mt-0.5 font-mono text-base font-bold md:text-lg',
                   style.text
                 )}
               >
@@ -128,7 +130,7 @@ export function LeaderboardPodium({ topThree }: { topThree: User[] }) {
                 damping: 15,
               }}
               className={cn(
-                'w-full rounded-t-xl md:rounded-t-2xl relative overflow-hidden backdrop-blur-md border-x border-t transition-colors duration-300',
+                'relative w-full overflow-hidden rounded-t-xl border-x border-t backdrop-blur-md transition-colors duration-300 md:rounded-t-2xl',
                 style.bg,
                 style.border
               )}
diff --git a/frontend/components/leaderboard/LeaderboardTable.tsx b/frontend/components/leaderboard/LeaderboardTable.tsx
index ed7361b8..d4fbd92a 100644
--- a/frontend/components/leaderboard/LeaderboardTable.tsx
+++ b/frontend/components/leaderboard/LeaderboardTable.tsx
@@ -1,10 +1,12 @@
 'use client';
 
-import { TrendingUp, Trophy, Medal } from 'lucide-react';
 import { motion } from 'framer-motion';
+import { Medal, TrendingUp, Trophy } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+
 import { cn } from '@/lib/utils';
-import { User, CurrentUser } from './types';
+
+import { CurrentUser, User } from './types';
 
 interface LeaderboardTableProps {
   users: User[];
@@ -31,21 +33,21 @@ export function LeaderboardTable({
   const isUserInTop = currentUserRank > 0 && currentUserRank <= 10;
 
   return (
-    <div className="w-full flex flex-col gap-4">
-      <div className="bg-white dark:bg-white/5 backdrop-blur-md rounded-2xl border border-slate-200 dark:border-white/10 overflow-hidden shadow-lg dark:shadow-2xl">
+    <div className="flex w-full flex-col gap-4">
+      <div className="overflow-hidden rounded-2xl border border-slate-200 bg-white shadow-lg backdrop-blur-md dark:border-white/10 dark:bg-white/5 dark:shadow-2xl">
         <div className="w-full">
-          <table className="w-full text-left border-separate border-spacing-0 table-fixed">
+          <table className="w-full table-fixed border-separate border-spacing-0 text-left">
             <caption className="sr-only">{t('tableCaption')}</caption>
 
             <thead className="bg-slate-50/80 dark:bg-white/5">
               <tr>
-                <th className="px-2 sm:px-6 py-3 sm:py-5 text-center text-[10px] sm:text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest w-[15%] sm:w-[12%] border-b border-slate-200 dark:border-white/10">
+                <th className="w-[15%] border-b border-slate-200 px-2 py-3 text-center text-[10px] font-bold tracking-widest text-slate-500 uppercase sm:w-[12%] sm:px-6 sm:py-5 sm:text-xs dark:border-white/10 dark:text-slate-400">
                   {t('rank')}
                 </th>
-                <th className="px-2 sm:px-6 py-3 sm:py-5 text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest w-auto border-b border-slate-200 dark:border-white/10">
+                <th className="w-auto border-b border-slate-200 px-2 py-3 text-xs font-bold tracking-widest text-slate-500 uppercase sm:px-6 sm:py-5 dark:border-white/10 dark:text-slate-400">
                   {t('user')}
                 </th>
-                <th className="pl-2 pr-4 sm:px-6 py-3 sm:py-5 text-right text-xs font-bold text-slate-500 dark:text-slate-400 uppercase tracking-widest w-[25%] sm:w-[20%] border-b border-slate-200 dark:border-white/10">
+                <th className="w-[25%] border-b border-slate-200 py-3 pr-4 pl-2 text-right text-xs font-bold tracking-widest text-slate-500 uppercase sm:w-[20%] sm:px-6 sm:py-5 dark:border-white/10 dark:text-slate-400">
                   {t('score')}
                 </th>
               </tr>
@@ -73,13 +75,13 @@ export function LeaderboardTable({
 
       {!isUserInTop && matchedUser && (
         <>
-          <div className="text-center text-slate-400 dark:text-slate-600 text-xl font-bold tracking-widest select-none py-2">
+          <div className="py-2 text-center text-xl font-bold tracking-widest text-slate-400 select-none dark:text-slate-600">
             • • •
           </div>
 
-          <div className="bg-white dark:bg-white/5 backdrop-blur-md rounded-2xl border-2 border-[var(--accent-primary)] overflow-hidden shadow-[0_0_20px_var(--accent-primary)]">
+          <div className="overflow-hidden rounded-2xl border-2 border-[var(--accent-primary)] bg-white shadow-[0_0_20px_var(--accent-primary)] backdrop-blur-md dark:bg-white/5">
             <div className="w-full">
-              <table className="w-full text-left border-separate border-spacing-0 table-fixed">
+              <table className="w-full table-fixed border-separate border-spacing-0 text-left">
                 <tbody>
                   <TableRow user={matchedUser} isCurrentUser={true} t={t} />
                 </tbody>
@@ -122,38 +124,38 @@ function TableRow({
       )}
     >
       <td className={cn(cellClass, leftBorderClass)}>
-        <div className="flex justify-center items-center">
+        <div className="flex items-center justify-center">
           <RankBadge rank={user.rank} />
         </div>
       </td>
 
       <td className={cellClass}>
-        <div className="flex items-center gap-2 sm:gap-4 overflow-hidden">
+        <div className="flex items-center gap-2 overflow-hidden sm:gap-4">
           <div
             className={cn(
-              'w-8 h-8 sm:w-10 sm:h-10 rounded-full border flex-shrink-0 flex items-center justify-center text-xs sm:text-sm font-bold transition-all duration-300',
+              'flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full border text-xs font-bold transition-all duration-300 sm:h-10 sm:w-10 sm:text-sm',
               isCurrentUser
-                ? 'bg-[var(--accent-primary)] border-[var(--accent-primary)] text-white shadow-[0_0_1px_var(--accent-primary)]'
-                : 'bg-slate-100 border-slate-200 text-slate-600 dark:bg-gradient-to-br dark:from-slate-800 dark:to-slate-900 dark:border-white/10 dark:text-slate-300 group-hover:border-[var(--accent-primary)] group-hover:text-[var(--accent-primary)]'
+                ? 'border-[var(--accent-primary)] bg-[var(--accent-primary)] text-white shadow-[0_0_1px_var(--accent-primary)]'
+                : 'border-slate-200 bg-slate-100 text-slate-600 group-hover:border-[var(--accent-primary)] group-hover:text-[var(--accent-primary)] dark:border-white/10 dark:bg-gradient-to-br dark:from-slate-800 dark:to-slate-900 dark:text-slate-300'
             )}
             aria-hidden="true"
           >
             {user.username.slice(0, 1).toUpperCase()}
           </div>
 
-          <div className="flex flex-col min-w-0">
+          <div className="flex min-w-0 flex-col">
             <span
               className={cn(
-                'font-medium text-sm transition-colors flex items-center gap-1 sm:gap-2',
+                'flex items-center gap-1 text-sm font-medium transition-colors sm:gap-2',
                 isCurrentUser
-                  ? 'text-[var(--accent-primary)] font-black text-sm sm:text-base'
-                  : 'text-slate-700 dark:text-slate-200 group-hover:text-[var(--accent-primary)] dark:group-hover:text-[var(--accent-primary)]'
+                  ? 'text-sm font-black text-[var(--accent-primary)] sm:text-base'
+                  : 'text-slate-700 group-hover:text-[var(--accent-primary)] dark:text-slate-200 dark:group-hover:text-[var(--accent-primary)]'
               )}
             >
               <span className="truncate">{user.username}</span>
 
               {isCurrentUser && (
-                <div className="relative flex-shrink-0 flex items-center justify-center w-5 h-5 sm:w-8 sm:h-8 ml-1">
+                <div className="relative ml-1 flex h-5 w-5 flex-shrink-0 items-center justify-center sm:h-8 sm:w-8">
                   <motion.div
                     animate={{ scale: [1, 1.2, 1] }}
                     transition={{
@@ -166,7 +168,7 @@ function TableRow({
                     <svg
                       viewBox="0 0 24 24"
                       fill="currentColor"
-                      className="w-full h-full drop-shadow-md"
+                      className="h-full w-full drop-shadow-md"
                     >
                       <path d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
                     </svg>
@@ -176,8 +178,8 @@ function TableRow({
             </span>
 
             {user.change > 0 && (
-              <span className="hidden sm:flex items-center gap-1 text-[10px] text-emerald-600 dark:text-emerald-400 font-bold uppercase tracking-wide opacity-70 group-hover:opacity-100 transition-opacity">
-                <TrendingUp className="w-3 h-3" aria-hidden="true" />
+              <span className="hidden items-center gap-1 text-[10px] font-bold tracking-wide text-emerald-600 uppercase opacity-70 transition-opacity group-hover:opacity-100 sm:flex dark:text-emerald-400">
+                <TrendingUp className="h-3 w-3" aria-hidden="true" />
                 {t('rising')}
               </span>
             )}
@@ -186,14 +188,14 @@ function TableRow({
       </td>
 
       <td
-        className={cn(cellClass, 'text-right pr-4 sm:pr-6', rightBorderClass)}
+        className={cn(cellClass, 'pr-4 text-right sm:pr-6', rightBorderClass)}
       >
         <span
           className={cn(
-            'font-mono font-bold inline-block transition-all',
+            'inline-block font-mono font-bold transition-all',
             isCurrentUser
-              ? 'text-[var(--accent-primary)] scale-110 drop-shadow-sm text-sm sm:text-lg'
-              : 'text-slate-700 dark:text-slate-300 group-hover:scale-105 text-sm sm:text-base'
+              ? 'scale-110 text-sm text-[var(--accent-primary)] drop-shadow-sm sm:text-lg'
+              : 'text-sm text-slate-700 group-hover:scale-105 sm:text-base dark:text-slate-300'
           )}
         >
           {user.points.toLocaleString()}
@@ -206,37 +208,37 @@ function TableRow({
 function RankBadge({ rank }: { rank: number }) {
   if (rank === 1) {
     return (
-      <div className="relative w-8 h-6 sm:w-14 sm:h-8 flex items-center justify-center gap-0.5 sm:gap-1.5 rounded-md sm:rounded-lg bg-yellow-100 dark:bg-yellow-500/20 border border-yellow-500/50 shadow-[0_0_10px_rgba(234,179,8,0.3)]">
-        <span className="font-black text-xs sm:text-base text-yellow-700 dark:text-yellow-400">
+      <div className="relative flex h-6 w-8 items-center justify-center gap-0.5 rounded-md border border-yellow-500/50 bg-yellow-100 shadow-[0_0_10px_rgba(234,179,8,0.3)] sm:h-8 sm:w-14 sm:gap-1.5 sm:rounded-lg dark:bg-yellow-500/20">
+        <span className="text-xs font-black text-yellow-700 sm:text-base dark:text-yellow-400">
           1
         </span>
-        <Trophy className="w-2.5 h-2.5 sm:w-4 sm:h-4 text-yellow-600 dark:text-yellow-400" />
-        <div className="absolute -top-1 -right-1 w-1.5 h-1.5 sm:w-2 sm:h-2 bg-yellow-400 rounded-full animate-pulse" />
+        <Trophy className="h-2.5 w-2.5 text-yellow-600 sm:h-4 sm:w-4 dark:text-yellow-400" />
+        <div className="absolute -top-1 -right-1 h-1.5 w-1.5 animate-pulse rounded-full bg-yellow-400 sm:h-2 sm:w-2" />
       </div>
     );
   }
   if (rank === 2) {
     return (
-      <div className="w-8 h-6 sm:w-14 sm:h-8 flex items-center justify-center gap-0.5 sm:gap-1.5 rounded-md sm:rounded-lg bg-slate-100 dark:bg-slate-400/10 border border-slate-300 dark:border-slate-400/30">
-        <span className="font-black text-xs sm:text-base text-slate-600 dark:text-slate-300">
+      <div className="flex h-6 w-8 items-center justify-center gap-0.5 rounded-md border border-slate-300 bg-slate-100 sm:h-8 sm:w-14 sm:gap-1.5 sm:rounded-lg dark:border-slate-400/30 dark:bg-slate-400/10">
+        <span className="text-xs font-black text-slate-600 sm:text-base dark:text-slate-300">
           2
         </span>
-        <Medal className="w-2.5 h-2.5 sm:w-4 sm:h-4 text-slate-500 dark:text-slate-300" />
+        <Medal className="h-2.5 w-2.5 text-slate-500 sm:h-4 sm:w-4 dark:text-slate-300" />
       </div>
     );
   }
   if (rank === 3) {
     return (
-      <div className="w-8 h-6 sm:w-14 sm:h-8 flex items-center justify-center gap-0.5 sm:gap-1.5 rounded-md sm:rounded-lg bg-orange-50 dark:bg-orange-500/10 border border-orange-300 dark:border-orange-500/30">
-        <span className="font-black text-xs sm:text-base text-orange-700 dark:text-orange-400">
+      <div className="flex h-6 w-8 items-center justify-center gap-0.5 rounded-md border border-orange-300 bg-orange-50 sm:h-8 sm:w-14 sm:gap-1.5 sm:rounded-lg dark:border-orange-500/30 dark:bg-orange-500/10">
+        <span className="text-xs font-black text-orange-700 sm:text-base dark:text-orange-400">
           3
         </span>
-        <Medal className="w-2.5 h-2.5 sm:w-4 sm:h-4 text-orange-600 dark:text-orange-400" />
+        <Medal className="h-2.5 w-2.5 text-orange-600 sm:h-4 sm:w-4 dark:text-orange-400" />
       </div>
     );
   }
   return (
-    <span className="flex items-center justify-center w-6 h-6 sm:w-8 sm:h-8 rounded-full bg-slate-100 dark:bg-white/5 font-bold text-xs sm:text-sm text-slate-500 dark:text-slate-500">
+    <span className="flex h-6 w-6 items-center justify-center rounded-full bg-slate-100 text-xs font-bold text-slate-500 sm:h-8 sm:w-8 sm:text-sm dark:bg-white/5 dark:text-slate-500">
       {rank}
     </span>
   );
diff --git a/frontend/components/leaderboard/types.ts b/frontend/components/leaderboard/types.ts
index ce0d77c6..38c64958 100644
--- a/frontend/components/leaderboard/types.ts
+++ b/frontend/components/leaderboard/types.ts
@@ -10,4 +10,4 @@ export interface User {
 export interface CurrentUser {
   id: string;
   username: string;
-}
\ No newline at end of file
+}
diff --git a/frontend/components/legal/LegalBlock.tsx b/frontend/components/legal/LegalBlock.tsx
index 7fd607b9..034588b5 100644
--- a/frontend/components/legal/LegalBlock.tsx
+++ b/frontend/components/legal/LegalBlock.tsx
@@ -8,18 +8,13 @@ export default function LegalBlock({ id, title, children }: Props) {
   return (
     <section
       id={id}
-      className="
-        py-8 sm:py-10
-        border-b border-gray-200/60
-        dark:border-neutral-800/60
-        last:border-b-0
-      "
+      className="border-b border-gray-200/60 py-8 last:border-b-0 sm:py-10 dark:border-neutral-800/60"
     >
-      <h2 className="text-2xl sm:text-3xl font-semibold tracking-tight text-slate-900 dark:text-slate-100">
+      <h2 className="text-2xl font-semibold tracking-tight text-slate-900 sm:text-3xl dark:text-slate-100">
         {title}
       </h2>
 
-      <div className="mt-4 pb-4 max-w-3xl text-slate-700 dark:text-slate-200 leading-7">
+      <div className="mt-4 max-w-3xl pb-4 leading-7 text-slate-700 dark:text-slate-200">
         {children}
       </div>
     </section>
diff --git a/frontend/components/legal/LegalPageShell.tsx b/frontend/components/legal/LegalPageShell.tsx
index 0a0a9269..ce32a938 100644
--- a/frontend/components/legal/LegalPageShell.tsx
+++ b/frontend/components/legal/LegalPageShell.tsx
@@ -1,6 +1,7 @@
-import { Link } from '@/i18n/routing';
 import { getTranslations } from 'next-intl/server';
 
+import { Link } from '@/i18n/routing';
+
 type Props = {
   title: string;
   lastUpdated: string;
@@ -15,43 +16,21 @@ export default async function LegalPageShell({
   const t = await getTranslations('legal');
 
   return (
-    <main
-      className="
-        relative min-h-screen overflow-hidden
-        bg-white text-slate-900
-        dark:bg-neutral-950 dark:text-slate-100
-      "
-    >
+    <main className="relative min-h-screen overflow-hidden bg-white text-slate-900 dark:bg-neutral-950 dark:text-slate-100">
       <div
         aria-hidden="true"
-        className="
-          pointer-events-none absolute inset-0
-          dark:opacity-80 opacity-100
-          [background-image:
-            radial-gradient(1000px_700px_at_20%_10%,rgba(59,130,246,0.10),transparent),
-            radial-gradient(900px_600px_at_80%_20%,rgba(168,85,247,0.10),transparent)
-          ]
-          dark:[background-image:
-            radial-gradient(1000px_700px_at_20%_10%,rgba(59,130,246,0.18),transparent),
-            radial-gradient(900px_600px_at_80%_20%,rgba(168,85,247,0.16),transparent)
-          ]
-        "
+        className="[background-image: radial-gradient(1000px_700px_at_20%_10%,rgba(59,130,246,0.10),transparent), radial-gradient(900px_600px_at_80%_20%,rgba(168,85,247,0.10),transparent) ] dark:[background-image: radial-gradient(1000px_700px_at_20%_10%,rgba(59,130,246,0.18),transparent), radial-gradient(900px_600px_at_80%_20%,rgba(168,85,247,0.16),transparent) ] pointer-events-none absolute inset-0 opacity-100 dark:opacity-80"
       />
       <div
         aria-hidden="true"
-        className="
-          pointer-events-none absolute inset-0
-          opacity-0 dark:opacity-40
-          [background-image:radial-gradient(circle,rgba(148,163,184,0.18)_1px,transparent_1px)]
-          [background-size:22px_22px]
-        "
+        className="pointer-events-none absolute inset-0 [background-image:radial-gradient(circle,rgba(148,163,184,0.18)_1px,transparent_1px)] [background-size:22px_22px] opacity-0 dark:opacity-40"
       />
 
       <div className="relative mx-auto max-w-4xl px-6 py-12 sm:py-16">
         <header className="space-y-5">
           <Link
             href="/"
-            className="inline-flex text-sm text-slate-600 hover:text-blue-600 transition-colors dark:text-slate-300 dark:hover:text-white"
+            className="inline-flex text-sm text-slate-600 transition-colors hover:text-blue-600 dark:text-slate-300 dark:hover:text-white"
           >
             ← {t('back')}
           </Link>
@@ -66,14 +45,15 @@ export default async function LegalPageShell({
             <address className="not-italic">
               <a
                 href={`mailto:${t('contactEmail')}`}
-                className="underline underline-offset-4 hover:text-blue-600 dark:hover:text-white transition-colors"
+                className="underline underline-offset-4 transition-colors hover:text-blue-600 dark:hover:text-white"
               >
                 {t('contactEmail')}
               </a>
             </address>
             <span className="opacity-60">•</span>
             <span>
-              {t('lastUpdated')}: <span className="font-medium">{lastUpdated}</span>
+              {t('lastUpdated')}:{' '}
+              <span className="font-medium">{lastUpdated}</span>
             </span>
           </div>
         </header>
diff --git a/frontend/components/legal/PrivacyPolicyContent.tsx b/frontend/components/legal/PrivacyPolicyContent.tsx
index caf35978..3ab756b9 100644
--- a/frontend/components/legal/PrivacyPolicyContent.tsx
+++ b/frontend/components/legal/PrivacyPolicyContent.tsx
@@ -1,4 +1,5 @@
 import { getTranslations } from 'next-intl/server';
+
 import LegalBlock from './LegalBlock';
 
 export const PRIVACY_LAST_UPDATED = '2025-12-14';
@@ -24,7 +25,7 @@ export default async function PrivacyPolicyContent() {
       </LegalBlock>
 
       <LegalBlock id="data-we-collect" title={t('dataWeCollect.title')}>
-        <ul className="list-disc pl-5 space-y-2">
+        <ul className="list-disc space-y-2 pl-5">
           <li>
             <strong>{t('dataWeCollect.accountData')}</strong>{' '}
             {t('dataWeCollect.accountDataDesc')}
@@ -41,7 +42,7 @@ export default async function PrivacyPolicyContent() {
       </LegalBlock>
 
       <LegalBlock id="why-we-collect" title={t('whyWeCollect.title')}>
-        <ul className="list-disc pl-5 space-y-2">
+        <ul className="list-disc space-y-2 pl-5">
           <li>{t('whyWeCollect.reason1')}</li>
           <li>{t('whyWeCollect.reason2')}</li>
           <li>{t('whyWeCollect.reason3')}</li>
@@ -72,7 +73,7 @@ export default async function PrivacyPolicyContent() {
 
       <LegalBlock id="gdpr" title={t('gdpr.title')}>
         <p className="mb-4">{t('gdpr.intro')}</p>
-        <ul className="list-disc pl-5 space-y-2">
+        <ul className="list-disc space-y-2 pl-5">
           <li>
             <strong>{t('gdpr.rightAccess')}</strong> {t('gdpr.rightAccessDesc')}
           </li>
@@ -81,7 +82,8 @@ export default async function PrivacyPolicyContent() {
             {t('gdpr.rightRectificationDesc')}
           </li>
           <li>
-            <strong>{t('gdpr.rightErasure')}</strong> {t('gdpr.rightErasureDesc')}
+            <strong>{t('gdpr.rightErasure')}</strong>{' '}
+            {t('gdpr.rightErasureDesc')}
           </li>
           <li>
             <strong>{t('gdpr.rightRestriction')}</strong>{' '}
diff --git a/frontend/components/legal/TermsOfServiceContent.tsx b/frontend/components/legal/TermsOfServiceContent.tsx
index 44d1f194..040d8a01 100644
--- a/frontend/components/legal/TermsOfServiceContent.tsx
+++ b/frontend/components/legal/TermsOfServiceContent.tsx
@@ -1,4 +1,5 @@
 import { getTranslations } from 'next-intl/server';
+
 import LegalBlock from './LegalBlock';
 
 export const TERMS_LAST_UPDATED = '2025-12-14';
@@ -22,7 +23,7 @@ export default async function TermsOfServiceContent() {
       </LegalBlock>
 
       <LegalBlock id="features" title={t('features.title')}>
-        <ul className="list-disc pl-5 space-y-2">
+        <ul className="list-disc space-y-2 pl-5">
           <li>{t('features.feature1')}</li>
           <li>{t('features.feature2')}</li>
           <li>{t('features.feature3')}</li>
@@ -30,7 +31,7 @@ export default async function TermsOfServiceContent() {
       </LegalBlock>
 
       <LegalBlock id="prohibited" title={t('prohibited.title')}>
-        <ul className="list-disc pl-5 space-y-2">
+        <ul className="list-disc space-y-2 pl-5">
           <li>{t('prohibited.item1')}</li>
           <li>{t('prohibited.item2')}</li>
         </ul>
diff --git a/frontend/components/q&a/AIWordHelper.tsx b/frontend/components/q&a/AIWordHelper.tsx
index a860ecd2..9a31059a 100644
--- a/frontend/components/q&a/AIWordHelper.tsx
+++ b/frontend/components/q&a/AIWordHelper.tsx
@@ -1,34 +1,34 @@
 'use client';
 
-import React, { useState, useEffect, useCallback, useRef } from 'react';
-import { useTranslations } from 'next-intl';
-import { useParams } from 'next/navigation';
 import {
-  X,
-  Loader2,
-  RefreshCw,
-  Sparkles,
-  GripHorizontal,
+  BookOpen,
   Clock,
-  Coffee,
   CloudOff,
-  Wrench,
-  Star,
+  Coffee,
   Github,
+  GripHorizontal,
   Heart,
-  BookOpen,
+  Loader2,
+  RefreshCw,
+  Sparkles,
+  Star,
+  Wrench,
+  X,
 } from 'lucide-react';
-import { cn } from '@/lib/utils';
+import { useParams } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+
 import { Link } from '@/i18n/routing';
 import {
   getCachedExplanation,
   setCachedExplanation,
 } from '@/lib/ai/explainCache';
 import type { ExplanationResponse } from '@/lib/ai/prompts';
-
-import ukMessages from '@/messages/uk.json';
+import { cn } from '@/lib/utils';
 import enMessages from '@/messages/en.json';
 import plMessages from '@/messages/pl.json';
+import ukMessages from '@/messages/uk.json';
 
 type Locale = 'uk' | 'en' | 'pl';
 
@@ -303,7 +303,6 @@ export default function AIWordHelper({
 
     if (isOpen) {
       document.addEventListener('keydown', handleKeyDown);
-      // Calculate scrollbar width and add padding to prevent layout shift
       const scrollbarWidth =
         window.innerWidth - document.documentElement.clientWidth;
       document.body.style.overflow = 'hidden';
@@ -432,7 +431,7 @@ export default function AIWordHelper({
           'bg-white dark:bg-neutral-900',
           'rounded-xl',
           'border border-gray-200 dark:border-neutral-800',
-          'max-w-lg w-full',
+          'w-full max-w-lg',
           'max-h-[80vh] overflow-hidden',
           'flex flex-col',
           'animate-in zoom-in-95 duration-200',
@@ -446,7 +445,7 @@ export default function AIWordHelper({
       >
         <div
           className={cn(
-            'flex items-center justify-between p-4 border-b border-gray-200 dark:border-neutral-800',
+            'flex items-center justify-between border-b border-gray-200 p-4 dark:border-neutral-800',
             'cursor-grab active:cursor-grabbing',
             'select-none'
           )}
@@ -469,7 +468,7 @@ export default function AIWordHelper({
               'text-gray-500 dark:text-gray-400',
               'hover:bg-gray-100 dark:hover:bg-neutral-800',
               'transition-colors',
-              'focus:outline-none focus:ring-2 focus:ring-[var(--accent-primary)]'
+              'focus:ring-2 focus:ring-[var(--accent-primary)] focus:outline-none'
             )}
             aria-label={t('close')}
           >
@@ -582,14 +581,12 @@ export default function AIWordHelper({
                             )}
                           </button>
 
-                          {/* Activity suggestions while waiting */}
-                          <div className="mt-4 w-full border-t border-gray-200 dark:border-neutral-700 pt-4">
-                            <p className="text-center text-xs font-medium text-gray-500 dark:text-gray-400 mb-3">
+                          <div className="mt-4 w-full border-t border-gray-200 pt-4 dark:border-neutral-700">
+                            <p className="mb-3 text-center text-xs font-medium text-gray-500 dark:text-gray-400">
                               {messages.rateLimit.whileWaiting}
                             </p>
 
                             {rateLimitState.retryAttempts < 3 ? (
-                              // First suggestions: Take Quiz & Star GitHub
                               <div className="flex flex-col gap-2">
                                 <Link
                                   href="/quizzes"
@@ -640,7 +637,6 @@ export default function AIWordHelper({
                                 </a>
                               </div>
                             ) : (
-                              // After 3+ attempts: Sponsor & Review
                               <div className="flex flex-col gap-2">
                                 <a
                                   href="https://github.com/sponsors/DevLoversTeam"
@@ -773,8 +769,8 @@ export default function AIWordHelper({
                 })()}
 
               {explanation && !isLoading && !error && (
-                <div className="prose prose-sm max-w-none dark:prose-invert">
-                  <div className="whitespace-pre-wrap leading-relaxed text-gray-800 dark:text-gray-200 [&>*]:my-2">
+                <div className="prose prose-sm dark:prose-invert max-w-none">
+                  <div className="leading-relaxed whitespace-pre-wrap text-gray-800 dark:text-gray-200 [&>*]:my-2">
                     {formatExplanation(explanation[activeLocale])}
                   </div>
                 </div>
diff --git a/frontend/components/q&a/AccordionList.tsx b/frontend/components/q&a/AccordionList.tsx
index bd642099..c68a50b7 100644
--- a/frontend/components/q&a/AccordionList.tsx
+++ b/frontend/components/q&a/AccordionList.tsx
@@ -1,26 +1,18 @@
 'use client';
 
 import {
-  useState,
-  useCallback,
-  useEffect,
   type CSSProperties,
   type ReactNode,
+  useCallback,
+  useEffect,
+  useState,
 } from 'react';
-import {
-  Accordion,
-  AccordionItem,
-  AccordionTrigger,
-  AccordionContent,
-} from '@/components/ui/accordion';
-import { categoryTabStyles } from '@/data/categoryStyles';
 
+import AIWordHelper from '@/components/q&a/AIWordHelper';
 import CodeBlock from '@/components/q&a/CodeBlock';
-import SelectableText from '@/components/q&a/SelectableText';
 import FloatingExplainButton from '@/components/q&a/FloatingExplainButton';
-import AIWordHelper from '@/components/q&a/AIWordHelper';
 import HighlightCachedTerms from '@/components/q&a/HighlightCachedTerms';
-import { getCachedTerms, CACHE_KEY } from '@/lib/ai/explainCache';
+import SelectableText from '@/components/q&a/SelectableText';
 import type {
   AnswerBlock,
   BulletListBlock,
@@ -35,6 +27,14 @@ import type {
   TableBlock,
   TextNode,
 } from '@/components/q&a/types';
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from '@/components/ui/accordion';
+import { categoryTabStyles } from '@/data/categoryStyles';
+import { CACHE_KEY, getCachedTerms } from '@/lib/ai/explainCache';
 
 function isListItemBlock(value: ListEntry): value is ListItemBlock {
   return (
diff --git a/frontend/components/q&a/CodeBlock.tsx b/frontend/components/q&a/CodeBlock.tsx
index 9c765b1d..6bd4965f 100644
--- a/frontend/components/q&a/CodeBlock.tsx
+++ b/frontend/components/q&a/CodeBlock.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import { Highlight, themes } from 'prism-react-renderer';
+import { Check, Copy } from 'lucide-react';
 import { useTheme } from 'next-themes';
+import { Highlight, themes } from 'prism-react-renderer';
 import { useState } from 'react';
-import { Copy, Check } from 'lucide-react';
 
 type Props = {
   code: string;
@@ -30,11 +30,11 @@ export default function CodeBlock({ code, language }: Props) {
     >
       {({ className, style, tokens, getLineProps, getTokenProps }) => (
         <pre
-          className={`${className} relative rounded-lg p-4 text-sm overflow-x-auto`}
+          className={`${className} relative overflow-x-auto rounded-lg p-4 text-sm`}
           style={style}
         >
           {language && (
-            <div className="absolute left-3 top-2 text-xs uppercase text-gray-400 font-mono">
+            <div className="absolute top-2 left-3 font-mono text-xs text-gray-400 uppercase">
               {language}
             </div>
           )}
@@ -42,10 +42,7 @@ export default function CodeBlock({ code, language }: Props) {
           <button
             onClick={handleCopy}
             aria-label="Copy code"
-            className="absolute right-3 top-2 flex items-center gap-1 rounded-md px-2 py-1 text-xs
-              text-gray-400 hover:text-gray-700 dark:hover:text-gray-200
-              bg-white/70 dark:bg-black/40 backdrop-blur
-              transition-colors cursor-pointer"
+            className="absolute top-2 right-3 flex cursor-pointer items-center gap-1 rounded-md bg-white/70 px-2 py-1 text-xs text-gray-400 backdrop-blur transition-colors hover:text-gray-700 dark:bg-black/40 dark:hover:text-gray-200"
           >
             {copied ? (
               <>
diff --git a/frontend/components/q&a/FloatingExplainButton.tsx b/frontend/components/q&a/FloatingExplainButton.tsx
index a5f8d0ef..e04d6384 100644
--- a/frontend/components/q&a/FloatingExplainButton.tsx
+++ b/frontend/components/q&a/FloatingExplainButton.tsx
@@ -1,7 +1,8 @@
 'use client';
 
-import { useEffect, useRef } from 'react';
 import { useTranslations } from 'next-intl';
+import { useEffect, useRef } from 'react';
+
 import { cn } from '@/lib/utils';
 
 interface FloatingExplainButtonProps {
@@ -64,7 +65,7 @@ export default function FloatingExplainButton({
         'hover:bg-[var(--accent-hover)]',
         'transition-all duration-200',
         'animate-in fade-in-0 zoom-in-95',
-        'focus:outline-none focus:ring-2 focus:ring-[var(--accent-primary)] focus:ring-offset-2'
+        'focus:ring-2 focus:ring-[var(--accent-primary)] focus:ring-offset-2 focus:outline-none'
       )}
       style={{
         left: `${position.x}px`,
diff --git a/frontend/components/q&a/HighlightCachedTerms.tsx b/frontend/components/q&a/HighlightCachedTerms.tsx
index b8bd4776..7a77bb28 100644
--- a/frontend/components/q&a/HighlightCachedTerms.tsx
+++ b/frontend/components/q&a/HighlightCachedTerms.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import React, { useMemo } from 'react';
+
 import { cn } from '@/lib/utils';
 
 interface HighlightCachedTermsProps {
@@ -95,9 +96,9 @@ export default function HighlightCachedTerms({
               'border-b border-dashed border-emerald-500/60',
               'bg-emerald-50/50 dark:bg-emerald-900/20',
               'hover:bg-emerald-100 dark:hover:bg-emerald-900/40',
-              'focus:outline-none focus:ring-2 focus:ring-emerald-500/50 focus:ring-offset-1',
+              'focus:ring-2 focus:ring-emerald-500/50 focus:ring-offset-1 focus:outline-none',
               'transition-colors duration-150',
-              'rounded-sm px-0.5 -mx-0.5'
+              '-mx-0.5 rounded-sm px-0.5'
             )}
             title="Click to see explanation (cached)"
           >
diff --git a/frontend/components/q&a/Pagination.tsx b/frontend/components/q&a/Pagination.tsx
index 6487d9a7..5d905300 100644
--- a/frontend/components/q&a/Pagination.tsx
+++ b/frontend/components/q&a/Pagination.tsx
@@ -1,7 +1,8 @@
 'use client';
 
-import { useEffect, useState } from 'react';
 import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
+
 import { cn } from '@/lib/utils';
 
 interface PaginationProps {
@@ -82,7 +83,7 @@ export function Pagination({
 
   return (
     <nav
-      className="flex items-center justify-center gap-1 mt-8 sm:gap-2"
+      className="mt-8 flex items-center justify-center gap-1 sm:gap-2"
       style={
         {
           '--qa-accent': accentColor,
@@ -96,18 +97,18 @@ export function Pagination({
         onClick={() => onPageChange(currentPage - 1)}
         disabled={currentPage === 1}
         className={cn(
-          'px-2 py-2 text-sm font-medium rounded-lg transition-colors sm:px-3',
+          'rounded-lg px-2 py-2 text-sm font-medium transition-colors sm:px-3',
           'border border-gray-300 bg-white/90 dark:border-gray-700 dark:bg-neutral-900/80',
           currentPage === 1
-            ? 'text-gray-400 dark:text-gray-600 cursor-not-allowed'
-            : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+            ? 'cursor-not-allowed text-gray-400 dark:text-gray-600'
+            : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
         )}
         aria-label={t('previousPage')}
       >
         ← <span className="hidden sm:inline">{t('previous')}</span>
       </button>
 
-      <div className="flex items-center gap-1 mx-1 sm:mx-2">
+      <div className="mx-1 flex items-center gap-1 sm:mx-2">
         {pages.map((page, index) =>
           page === 'ellipsis' ? (
             <span
@@ -122,10 +123,10 @@ export function Pagination({
               onClick={() => onPageChange(page)}
               disabled={page === currentPage}
               className={cn(
-                'min-w-[40px] px-3 py-2 text-sm font-medium rounded-lg transition-colors border border-transparent overflow-hidden bg-white/90 dark:bg-neutral-900/80',
+                'min-w-[40px] overflow-hidden rounded-lg border border-transparent bg-white/90 px-3 py-2 text-sm font-medium transition-colors dark:bg-neutral-900/80',
                 page === currentPage
-                  ? 'shadow-sm text-gray-700 dark:text-gray-300'
-                  : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+                  ? 'text-gray-700 shadow-sm dark:text-gray-300'
+                  : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
               )}
               style={
                 page === currentPage
@@ -149,11 +150,11 @@ export function Pagination({
         onClick={() => onPageChange(currentPage + 1)}
         disabled={currentPage === totalPages}
         className={cn(
-          'px-2 py-2 text-sm font-medium rounded-lg transition-colors sm:px-3',
+          'rounded-lg px-2 py-2 text-sm font-medium transition-colors sm:px-3',
           'border border-gray-300 bg-white/90 dark:border-gray-700 dark:bg-neutral-900/80',
           currentPage === totalPages
-            ? 'text-gray-400 dark:text-gray-600 cursor-not-allowed'
-            : 'text-gray-700 dark:text-gray-300 hover:bg-[var(--qa-accent-soft)]'
+            ? 'cursor-not-allowed text-gray-400 dark:text-gray-600'
+            : 'text-gray-700 hover:bg-[var(--qa-accent-soft)] dark:text-gray-300'
         )}
         aria-label={t('nextPage')}
       >
diff --git a/frontend/components/q&a/QaSection.tsx b/frontend/components/q&a/QaSection.tsx
index 09c255f6..ddbc64af 100644
--- a/frontend/components/q&a/QaSection.tsx
+++ b/frontend/components/q&a/QaSection.tsx
@@ -1,15 +1,16 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
+
 import AccordionList from '@/components/q&a/AccordionList';
 import { Pagination } from '@/components/q&a/Pagination';
-import { Tabs, TabsList, TabsContent } from '@/components/ui/tabs';
-import { categoryData } from '@/data/category';
+import type { CategorySlug } from '@/components/q&a/types';
 import { useQaTabs } from '@/components/q&a/useQaTabs';
 import { CategoryTabButton } from '@/components/shared/CategoryTabButton';
+import { Tabs, TabsContent, TabsList } from '@/components/ui/tabs';
+import { categoryData } from '@/data/category';
 import { categoryTabStyles } from '@/data/categoryStyles';
 import { cn } from '@/lib/utils';
-import type { CategorySlug } from '@/components/q&a/types';
 
 export default function TabsSection() {
   const t = useTranslations('qa');
@@ -27,22 +28,22 @@ export default function TabsSection() {
   return (
     <div className="w-full">
       <Tabs value={active} onValueChange={handleCategoryChange}>
-        <TabsList className="!bg-transparent !p-0 !h-auto !w-full flex flex-wrap items-stretch justify-start gap-3 mb-6">
+        <TabsList className="mb-6 flex !h-auto !w-full flex-wrap items-stretch justify-start gap-3 !bg-transparent !p-0">
           {categoryData.map(category => {
             const slug = category.slug as keyof typeof categoryTabStyles;
             const value = slug as CategorySlug;
             return (
-            <CategoryTabButton
-              key={slug}
-              value={value}
-              label={
-                category.translations[localeKey] ??
-                category.translations.en ??
-                value
-              }
-              style={categoryTabStyles[slug]}
-              isActive={active === value}
-            />
+              <CategoryTabButton
+                key={slug}
+                value={value}
+                label={
+                  category.translations[localeKey] ??
+                  category.translations.en ??
+                  value
+                }
+                style={categoryTabStyles[slug]}
+                isActive={active === value}
+              />
             );
           })}
         </TabsList>
@@ -51,7 +52,7 @@ export default function TabsSection() {
           <TabsContent key={category.slug} value={category.slug}>
             {isLoading && (
               <div className="flex justify-center py-12">
-                <div className="animate-spin h-8 w-8 border-b-2" />
+                <div className="h-8 w-8 animate-spin border-b-2" />
               </div>
             )}
             <div
@@ -64,9 +65,7 @@ export default function TabsSection() {
               {items.length ? (
                 <AccordionList items={items} />
               ) : (
-                <p className="text-center py-12">
-                  {t('noQuestions')}
-                </p>
+                <p className="py-12 text-center">{t('noQuestions')}</p>
               )}
             </div>
           </TabsContent>
@@ -78,7 +77,9 @@ export default function TabsSection() {
           currentPage={currentPage}
           totalPages={totalPages}
           onPageChange={handlePageChange}
-          accentColor={categoryTabStyles[active as keyof typeof categoryTabStyles].accent}
+          accentColor={
+            categoryTabStyles[active as keyof typeof categoryTabStyles].accent
+          }
         />
       )}
     </div>
diff --git a/frontend/components/q&a/SelectableText.tsx b/frontend/components/q&a/SelectableText.tsx
index f864d6e0..f2ece70c 100644
--- a/frontend/components/q&a/SelectableText.tsx
+++ b/frontend/components/q&a/SelectableText.tsx
@@ -19,7 +19,6 @@ export default function SelectableText({
   const onTextSelectRef = useRef(onTextSelect);
   const onSelectionClearRef = useRef(onSelectionClear);
 
-  // Keep refs updated with latest callbacks
   useEffect(() => {
     onTextSelectRef.current = onTextSelect;
     onSelectionClearRef.current = onSelectionClear;
diff --git a/frontend/components/q&a/types.ts b/frontend/components/q&a/types.ts
index 3c097667..7c9b550f 100644
--- a/frontend/components/q&a/types.ts
+++ b/frontend/components/q&a/types.ts
@@ -33,7 +33,11 @@ export type NumberedListBlock = {
   children: ListEntry[];
 };
 
-export type ListItemChild = TextNode | CodeBlock | BulletListBlock | NumberedListBlock;
+export type ListItemChild =
+  | TextNode
+  | CodeBlock
+  | BulletListBlock
+  | NumberedListBlock;
 
 export type ListItemBlock = {
   type: 'listItem';
diff --git a/frontend/components/q&a/useQaTabs.ts b/frontend/components/q&a/useQaTabs.ts
index 0a7c4510..8a9af778 100644
--- a/frontend/components/q&a/useQaTabs.ts
+++ b/frontend/components/q&a/useQaTabs.ts
@@ -1,10 +1,9 @@
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
 import { useSearchParams } from 'next/navigation';
 import { useLocale } from 'next-intl';
-import { useRouter } from '@/i18n/routing';
-import { categoryData } from '@/data/category';
+import { useCallback, useEffect, useState } from 'react';
+
 import {
   type CategorySlug,
   type Locale,
@@ -12,6 +11,8 @@ import {
   type QuestionApiItem,
   type QuestionEntry,
 } from '@/components/q&a/types';
+import { categoryData } from '@/data/category';
+import { useRouter } from '@/i18n/routing';
 
 const CATEGORY_SLUGS = categoryData.map(category => category.slug);
 const DEFAULT_CATEGORY = CATEGORY_SLUGS[0] || 'html';
diff --git a/frontend/components/quiz/CountdownTimer.tsx b/frontend/components/quiz/CountdownTimer.tsx
index 18aec648..8d286c97 100644
--- a/frontend/components/quiz/CountdownTimer.tsx
+++ b/frontend/components/quiz/CountdownTimer.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { TriangleAlert } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
+
 import { cn } from '@/lib/utils';
-import { AlertTriangle } from 'lucide-react';
 
 interface CountdownTimerProps {
   timeLimitSeconds: number;
@@ -90,14 +91,14 @@ export function CountdownTimer({
         percentage <= 10 && 'animate-pulse'
       )}
     >
-      <div className="flex items-center justify-between mb-2">
+      <div className="mb-2 flex items-center justify-between">
         <span className="text-sm font-medium">{t('label')}</span>
-        <span className="text-2xl font-bold font-mono">
+        <span className="font-mono text-2xl font-bold">
           {String(minutes).padStart(2, '0')}:{String(seconds).padStart(2, '0')}
         </span>
       </div>
 
-      <div className="h-2 bg-gray-200 dark:bg-gray-700 rounded-full overflow-hidden">
+      <div className="h-2 overflow-hidden rounded-full bg-gray-200 dark:bg-gray-700">
         <div
           className={cn(
             'h-full transition-all duration-1000 ease-linear',
@@ -108,10 +109,13 @@ export function CountdownTimer({
       </div>
 
       {percentage <= 30 && (
-        <p className="text-xs mt-2 font-medium">
+        <p className="mt-2 text-xs font-medium">
           {percentage <= 10 ? (
             <>
-              <AlertTriangle className="w-4 h-4 inline text-amber-500" />{' '}
+              <TriangleAlert
+                className="inline h-4 w-4 text-amber-500"
+                aria-hidden="true"
+              />{' '}
               {t('almostDone')}
             </>
           ) : (
diff --git a/frontend/components/quiz/ExplanationRenderer.tsx b/frontend/components/quiz/ExplanationRenderer.tsx
index b58d7425..a80b65ac 100644
--- a/frontend/components/quiz/ExplanationRenderer.tsx
+++ b/frontend/components/quiz/ExplanationRenderer.tsx
@@ -29,8 +29,7 @@ const renderText = (node: TextNode, index: number) => {
     text = (
       <code
         key={index}
-        className="px-1.5 py-0.5 bg-gray-100 dark:bg-gray-800 rounded text-sm
-  font-mono"
+        className="rounded bg-gray-100 px-1.5 py-0.5 font-mono text-sm dark:bg-gray-800"
       >
         {node.text}
       </code>
@@ -77,9 +76,9 @@ export default function ExplanationRenderer({
             return (
               <pre
                 key={blockIndex}
-                className="bg-gray-900 text-gray-100 p-6 rounded-lg overflow-x-auto"
+                className="overflow-x-auto rounded-lg bg-gray-900 p-6 text-gray-100"
               >
-                <code className="text-sm font-mono block leading-relaxed">
+                <code className="block font-mono text-sm leading-relaxed">
                   {block.children
                     .map(child => (child as TextNode).text)
                     .join('')}
@@ -91,7 +90,7 @@ export default function ExplanationRenderer({
             return (
               <ol
                 key={blockIndex}
-                className="list-decimal list-inside space-y-2 ml-4"
+                className="ml-4 list-inside list-decimal space-y-2"
               >
                 {renderChildren(block.children)}
               </ol>
@@ -101,7 +100,7 @@ export default function ExplanationRenderer({
             return (
               <ul
                 key={blockIndex}
-                className="list-disc list-inside space-y-2 ml-4"
+                className="ml-4 list-inside list-disc space-y-2"
               >
                 {renderChildren(block.children)}
               </ul>
diff --git a/frontend/components/quiz/PendingResultHandler.tsx b/frontend/components/quiz/PendingResultHandler.tsx
deleted file mode 100644
index 1bfe65a5..00000000
--- a/frontend/components/quiz/PendingResultHandler.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-'use client';
-
-import { useEffect } from 'react';
-import { getPendingQuizResult, clearPendingQuizResult } from '@/lib/quiz/guest-quiz';
-
-interface Props {
-  userId: string;
-}
-
-export function PendingResultHandler({ userId }: Props) {
-  useEffect(() => {
-    const pending = getPendingQuizResult();
-    if (!pending) return;
-
-    if (pending) {
-      fetch("/api/quiz/guest-result", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          userId,
-          quizId: pending.quizId,
-          answers: pending.answers,
-          violations: pending.violations,
-          timeSpentSeconds: pending.timeSpentSeconds,
-        }),
-      })
-        .then(async (res) => {
-          if (res.ok) {
-            clearPendingQuizResult();
-          } else {
-            console.error("Guest-result API error:", res.status);
-          }
-        })
-        .catch(err => {
-          console.error("Guest-result fetch error:", err);
-        });
-    }
-  }, [userId]);
-
-  return null;
-}
\ No newline at end of file
diff --git a/frontend/components/quiz/QuizCard.tsx b/frontend/components/quiz/QuizCard.tsx
index 10a39370..bd28c20b 100644
--- a/frontend/components/quiz/QuizCard.tsx
+++ b/frontend/components/quiz/QuizCard.tsx
@@ -1,10 +1,11 @@
 'use client';
 
+import { Clock, FileText } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { Link } from '@/i18n/routing';
+
 import { Badge } from '@/components/ui/badge';
-import { FileText, Clock } from 'lucide-react';
 import { categoryTabStyles } from '@/data/categoryStyles';
+import { Link } from '@/i18n/routing';
 
 interface QuizCardProps {
   quiz: {
@@ -27,7 +28,8 @@ interface QuizCardProps {
 export function QuizCard({ quiz, userProgress }: QuizCardProps) {
   const t = useTranslations('quiz.card');
   const slug = quiz.categorySlug as keyof typeof categoryTabStyles | null;
-  const style = slug && categoryTabStyles[slug] ? categoryTabStyles[slug] : null;
+  const style =
+    slug && categoryTabStyles[slug] ? categoryTabStyles[slug] : null;
   const accentColor = style?.accent ?? '#3B82F6'; // fallback blue
 
   const percentage =
@@ -36,16 +38,16 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
       : 0;
 
   return (
-    <div 
-      className="group/card relative flex flex-col rounded-xl border border-black/10 dark:border-white/10 hover:!border-[var(--accent)] bg-white dark:bg-neutral-900 p-5 shadow-sm overflow-hidden transition-all duration-300 hover:-translate-y-1 hover:shadow-xl"
+    <div
+      className="group/card relative flex flex-col overflow-hidden rounded-xl border border-black/10 bg-white p-5 shadow-sm transition-all duration-300 hover:-translate-y-1 hover:!border-[var(--accent)] hover:shadow-xl dark:border-white/10 dark:bg-neutral-900"
       style={{ '--accent': `${accentColor}60` } as React.CSSProperties}
     >
       <span
-        className="pointer-events-none absolute -top-6 -right-6 w-24 h-24 rounded-full blur-[40px] opacity-0 group-hover/card:opacity-20 transition-opacity duration-500"
+        className="pointer-events-none absolute -top-6 -right-6 h-24 w-24 rounded-full opacity-0 blur-[40px] transition-opacity duration-500 group-hover/card:opacity-20"
         style={{ backgroundColor: accentColor }}
       />
       <div className="flex-grow">
-        <div className="flex gap-2 mb-3">
+        <div className="mb-3 flex gap-2">
           <Badge
             variant="default"
             style={{
@@ -57,21 +59,21 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
           </Badge>
           {userProgress && <Badge variant="success">{t('completed')}</Badge>}
         </div>
-        <h2 className="text-xl font-semibold mb-2">
+        <h2 className="mb-2 text-xl font-semibold">
           {quiz.title ?? quiz.slug}
         </h2>
         {quiz.description && (
-          <p className="line-clamp-2 text-sm text-gray-600 dark:text-gray-400 mb-3">
+          <p className="mb-3 line-clamp-2 text-sm text-gray-600 dark:text-gray-400">
             {quiz.description}
           </p>
         )}
-        <div className="flex gap-3 text-xs text-gray-500 mb-3">
+        <div className="mb-3 flex gap-3 text-xs text-gray-500">
           <span className="flex items-center gap-1">
-           <FileText className="w-3.5 h-3.5" style={{ color: accentColor }} />
+            <FileText className="h-3.5 w-3.5" style={{ color: accentColor }} />
             {quiz.questionsCount} {t('questions')}
           </span>
           <span className="flex items-center gap-1">
-            <Clock className="w-3.5 h-3.5" style={{ color: accentColor }} />
+            <Clock className="h-3.5 w-3.5" style={{ color: accentColor }} />
             {Math.floor(
               (quiz.timeLimitSeconds ?? quiz.questionsCount * 30) / 60
             )}{' '}
@@ -81,7 +83,7 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
       </div>
       {userProgress && (
         <div className="mb-6">
-          <div className="flex justify-between text-xs mb-1.5">
+          <div className="mb-1.5 flex justify-between text-xs">
             <span className="text-gray-600 dark:text-gray-400">
               {t('best')} {userProgress.bestScore}/{userProgress.totalQuestions}
             </span>
@@ -93,7 +95,7 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
               {percentage}%
             </span>
           </div>
-          <div className="h-1.5 bg-gray-200 dark:bg-neutral-800 rounded-full overflow-hidden">
+          <div className="h-1.5 overflow-hidden rounded-full bg-gray-200 dark:bg-neutral-800">
             <div
               className="h-full rounded-full transition-all"
               style={{ width: `${percentage}%`, backgroundColor: accentColor }}
@@ -103,7 +105,7 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
       )}
       <Link
         href={`/quiz/${quiz.slug}`}
-        className="group relative block w-full overflow-hidden text-center rounded-xl border px-4 py-2.5 text-sm font-semibold transition-all duration-300"
+        className="group relative block w-full overflow-hidden rounded-xl border px-4 py-2.5 text-center text-sm font-semibold transition-all duration-300"
         style={{
           borderColor: `${accentColor}50`,
           backgroundColor: `${accentColor}15`,
@@ -112,7 +114,7 @@ export function QuizCard({ quiz, userProgress }: QuizCardProps) {
       >
         {userProgress ? t('retake') : t('start')}
         <span
-          className="pointer-events-none absolute left-1/2 top-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full blur-[20px] opacity-0 transition-opacity duration-300 group-hover:opacity-30"
+          className="pointer-events-none absolute top-1/2 left-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full opacity-0 blur-[20px] transition-opacity duration-300 group-hover:opacity-30"
           style={{ backgroundColor: accentColor }}
         />
       </Link>
diff --git a/frontend/components/quiz/QuizContainer.tsx b/frontend/components/quiz/QuizContainer.tsx
index cdaa04ed..4f963a9a 100644
--- a/frontend/components/quiz/QuizContainer.tsx
+++ b/frontend/components/quiz/QuizContainer.tsx
@@ -1,33 +1,34 @@
 'use client';
-
-import { useLocale, useTranslations } from 'next-intl';
+import { Ban, Clock, FileText, TriangleAlert } from 'lucide-react';
 import { useRouter, useSearchParams } from 'next/navigation';
+import { useLocale, useTranslations } from 'next-intl';
 import {
+  useCallback,
+  useEffect,
   useReducer,
-  useTransition,
   useState,
-  useEffect,
-  useCallback,
+  useTransition,
 } from 'react';
 import { toast } from 'sonner';
+
+import { initializeQuizCache, submitQuizAttempt } from '@/actions/quiz';
+import { Button } from '@/components/ui/button';
+import { ConfirmModal } from '@/components/ui/confirm-modal';
+import { categoryTabStyles } from '@/data/categoryStyles';
+import type { QuizQuestionClient } from '@/db/queries/quiz';
 import { useAntiCheat } from '@/hooks/useAntiCheat';
-import { useQuizSession } from '@/hooks/useQuizSession';
 import { useQuizGuards } from '@/hooks/useQuizGuards';
-import { QuizProgress } from './QuizProgress';
-import { QuizQuestion } from './QuizQuestion';
-import { QuizResult } from './QuizResult';
-import { CountdownTimer } from './CountdownTimer';
-import { submitQuizAttempt } from '@/actions/quiz';
+import { useQuizSession } from '@/hooks/useQuizSession';
+import { savePendingQuizResult } from '@/lib/quiz/guest-quiz';
 import {
   clearQuizSession,
   type QuizSessionData,
 } from '@/lib/quiz/quiz-session';
-import { savePendingQuizResult } from '@/lib/quiz/guest-quiz';
-import type { QuizQuestionClient } from '@/db/queries/quiz';
-import { ConfirmModal } from '@/components/ui/confirm-modal';
-import { Button } from '@/components/ui/button';
-import { FileText, Ban, AlertTriangle, Clock } from 'lucide-react';
-import { categoryTabStyles } from '@/data/categoryStyles';
+
+import { CountdownTimer } from './CountdownTimer';
+import { QuizProgress } from './QuizProgress';
+import { QuizQuestion } from './QuizQuestion';
+import { QuizResult } from './QuizResult';
 
 interface Answer {
   questionId: string;
@@ -140,7 +141,6 @@ function quizReducer(state: QuizState, action: QuizAction): QuizState {
 interface QuizContainerProps {
   quizId: string;
   questions: QuizQuestionClient[];
-  encryptedAnswers: string;
   userId: string | null;
   quizSlug: string;
   timeLimitSeconds: number | null;
@@ -153,7 +153,6 @@ export function QuizContainer({
   quizSlug,
   quizId,
   questions,
-  encryptedAnswers,
   userId,
   timeLimitSeconds,
   seed,
@@ -192,11 +191,9 @@ export function QuizContainer({
   const currentQuestion = questions[state.currentIndex];
   const totalQuestions = questions.length;
 
-  const handleRestoreSession = useCallback(
-    (data: QuizSessionData) =>
-      dispatch({ type: 'RESTORE_SESSION', payload: data }),
-    []
-  );
+  const handleRestoreSession = useCallback((data: QuizSessionData) => {
+    dispatch({ type: 'RESTORE_SESSION', payload: data });
+  }, []);
 
   useQuizSession({
     quizId,
@@ -221,9 +218,20 @@ export function QuizContainer({
     }
   }, [seed, searchParams, router]);
 
-  const handleStart = () => {
-    window.history.pushState({ quizGuard: true }, '');
-    dispatch({ type: 'START_QUIZ' });
+  const handleStart = async () => {
+    try {
+      const result = await initializeQuizCache(quizId);
+
+      if (!result.success) {
+        toast.error('Failed to start quiz session');
+        return;
+      }
+
+      window.history.pushState({ quizGuard: true }, '');
+      dispatch({ type: 'START_QUIZ' });
+    } catch {
+      toast.error('Failed to start quiz session');
+    }
   };
 
   const verifyAnswer = async (answerId: string) => {
@@ -232,8 +240,8 @@ export function QuizContainer({
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         questionId: currentQuestion.id,
-        answerId,
-        encryptedAnswers,
+        selectedAnswerId: answerId,
+        quizId,
       }),
     });
 
@@ -299,10 +307,10 @@ export function QuizContainer({
   };
 
   const handleSubmit = () => {
-    clearQuizSession(quizId);
-
     const isIncomplete = state.answers.length < totalQuestions;
-
+    if (!isGuest) {
+      clearQuizSession(quizId);
+    }
     const correctAnswers = state.answers.filter(a => a.isCorrect).length;
     const percentage = (correctAnswers / totalQuestions) * 100;
     const timeSpentSeconds = state.startedAt
@@ -391,14 +399,17 @@ export function QuizContainer({
 
   if (state.status === 'rules') {
     return (
-      <div className="max-w-2xl mx-auto space-y-6 p-6 rounded-xl border border-gray-200 dark:border-gray-800">
+      <div className="mx-auto max-w-2xl space-y-6 rounded-xl border border-gray-200 p-6 dark:border-gray-800">
         <h2 className="text-2xl font-bold text-gray-900 dark:text-gray-100">
           {tRules('title')}
         </h2>
 
         <div className="space-y-4 text-gray-700 dark:text-gray-300">
           <div className="flex gap-3">
-            <FileText className="w-5 h-5 text-blue-500 dark:text-blue-400 flex-shrink-0 mt-0.5" />
+            <FileText
+              className="mt-0.5 h-5 w-5 shrink-0 text-blue-500 dark:text-blue-400"
+              aria-hidden="true"
+            />
             <div>
               <p className="font-medium">{tRules('general.title')}</p>
               <p className="text-sm text-gray-600 dark:text-gray-400">
@@ -408,10 +419,13 @@ export function QuizContainer({
           </div>
 
           <div className="flex gap-3">
-            <Ban className="w-5 h-5 text-red-500 dark:text-red-400 flex-shrink-0 mt-0.5" />
+            <Ban
+              className="mt-0.5 h-5 w-5 shrink-0 text-red-500 dark:text-red-400"
+              aria-hidden="true"
+            />
             <div>
               <p className="font-medium">{tRules('forbidden.title')}</p>
-              <ul className="text-sm text-gray-600 dark:text-gray-400 list-disc list-inside space-y-1">
+              <ul className="list-inside list-disc space-y-1 text-sm text-gray-600 dark:text-gray-400">
                 <li>{tRules('forbidden.copyPaste')}</li>
                 <li>{tRules('forbidden.contextMenu')}</li>
                 <li>{tRules('forbidden.tabSwitch')}</li>
@@ -421,7 +435,10 @@ export function QuizContainer({
           </div>
 
           <div className="flex gap-3">
-            <AlertTriangle className="w-5 h-5 text-amber-500 dark:text-amber-400 flex-shrink-0 mt-0.5" />
+            <TriangleAlert
+              className="mt-0.5 h-5 w-5 shrink-0 text-amber-500 dark:text-amber-400"
+              aria-hidden="true"
+            />
             <div>
               <p className="font-medium">{tRules('control.title')}</p>
               <p className="text-sm text-gray-600 dark:text-gray-400">
@@ -430,7 +447,10 @@ export function QuizContainer({
             </div>
           </div>
           <div className="flex gap-3">
-            <Clock className="w-5 h-5 text-blue-500 dark:text-blue-400 flex-shrink-0 mt-0.5" />
+            <Clock
+              className="mt-0.5 h-5 w-5 shrink-0 text-blue-500 dark:text-blue-400"
+              aria-hidden="true"
+            />
             <div>
               <p className="font-medium">{tRules('time.title')}</p>
               <p className="text-sm text-gray-600 dark:text-gray-400">
@@ -441,7 +461,7 @@ export function QuizContainer({
         </div>
         <button
           onClick={handleStart}
-          className="group relative w-full overflow-hidden text-center rounded-xl border px-6 py-3 text-base font-semibold transition-all duration-300"
+          className="group relative w-full overflow-hidden rounded-xl border px-6 py-3 text-center text-base font-semibold transition-all duration-300"
           style={{
             borderColor: `${accentColor}50`,
             backgroundColor: `${accentColor}15`,
@@ -450,7 +470,7 @@ export function QuizContainer({
         >
           {tRules('startButton')}
           <span
-            className="pointer-events-none absolute left-1/2 top-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full blur-[20px] opacity-0 transition-opacity duration-300 group-hover:opacity-30"
+            className="pointer-events-none absolute top-1/2 left-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full opacity-0 blur-[20px] transition-opacity duration-300 group-hover:opacity-30"
             style={{ backgroundColor: accentColor }}
           />
         </button>
@@ -480,7 +500,7 @@ export function QuizContainer({
   }
 
   return (
-    <div className="space-y-8 no-select">
+    <div className="no-select space-y-8">
       <div className="flex justify-end">
         <Button
           variant="outline"
@@ -489,10 +509,11 @@ export function QuizContainer({
           className="gap-2 hover:border-red-500 hover:text-red-600 dark:hover:text-red-400"
         >
           <svg
-            className="w-4 h-4"
+            className="h-4 w-4"
             fill="none"
             stroke="currentColor"
             viewBox="0 0 24 24"
+            aria-hidden="true"
           >
             <path
               strokeLinecap="round"
@@ -501,7 +522,7 @@ export function QuizContainer({
               d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"
             />
           </svg>
-          Exit Quiz
+          {tExit('exitButton')}
         </Button>
       </div>
       <QuizProgress
diff --git a/frontend/components/quiz/QuizProgress.tsx b/frontend/components/quiz/QuizProgress.tsx
index dc15a6b0..42d5fb91 100644
--- a/frontend/components/quiz/QuizProgress.tsx
+++ b/frontend/components/quiz/QuizProgress.tsx
@@ -1,8 +1,9 @@
 'use client';
 
+import { Check, X } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+
 import { cn } from '@/lib/utils';
-import { Check, X } from 'lucide-react';
 
 interface Answer {
   questionId: string;
@@ -15,7 +16,10 @@ interface QuizProgressProps {
   answers: Answer[];
 }
 
-function getVisibleIndices(current: number, total: number): (number | 'ellipsis')[] {
+function getVisibleIndices(
+  current: number,
+  total: number
+): (number | 'ellipsis')[] {
   if (total <= 7) {
     return Array.from({ length: total }, (_, i) => i);
   }
@@ -65,9 +69,9 @@ export function QuizProgress({ current, total, answers }: QuizProgressProps) {
             return (
               <span
                 key={`ellipsis-${idx}`}
-                className="px-2 text-gray-400 dark:text-gray-500 text-sm"
+                className="px-2 text-sm text-gray-400 dark:text-gray-500"
               >
-                ...
+                …
               </span>
             );
           }
@@ -82,34 +86,48 @@ export function QuizProgress({ current, total, answers }: QuizProgressProps) {
             <div
               key={index}
               className={cn(
-                'relative flex items-center justify-center w-9 h-9 rounded-full transition-all border text-sm font-medium',
-                isCurrent && !isAnswered && 'border-blue-500 bg-blue-500/20 dark:bg-blue-500/20',
-                isAnswered && isCorrect && 'border-green-500 bg-green-500/20 dark:bg-green-500/20',
-                isAnswered && !isCorrect && 'border-red-500 bg-red-500/20 dark:bg-red-500/20',
-                !isAnswered && !isCurrent && 'border-gray-300 dark:border-gray-600 bg-white/90 dark:bg-neutral-900/80'
+                'relative flex h-9 w-9 items-center justify-center rounded-full border text-sm font-medium transition-all',
+                isCurrent &&
+                  !isAnswered &&
+                  'border-blue-500 bg-blue-500/20 dark:bg-blue-500/20',
+                isAnswered &&
+                  isCorrect &&
+                  'border-green-500 bg-green-500/20 dark:bg-green-500/20',
+                isAnswered &&
+                  !isCorrect &&
+                  'border-red-500 bg-red-500/20 dark:bg-red-500/20',
+                !isAnswered &&
+                  !isCurrent &&
+                  'border-gray-300 bg-white/90 dark:border-gray-600 dark:bg-neutral-900/80'
               )}
             >
               {isAnswered ? (
-                <span className="text-white font-bold">
-                  {isCorrect ? <Check className="w-3 h-3" /> : <X className="w-3 h-3" />}
+                <span className="font-bold text-white">
+                  {isCorrect ? (
+                    <Check className="h-3 w-3" aria-hidden="true" />
+                  ) : (
+                    <X className="h-3 w-3" aria-hidden="true" />
+                  )}
                 </span>
               ) : (
                 <span
                   className={cn(
-                    isCurrent ? 'text-blue-600 dark:text-blue-400' : 'text-gray-400'
+                    isCurrent
+                      ? 'text-blue-600 dark:text-blue-400'
+                      : 'text-gray-400'
                   )}
                 >
                   {index + 1}
                 </span>
               )}
               {isCurrent && (
-                <div 
+                <div
                   className={cn(
-                    "absolute inset-0 rounded-full border-1 animate-pulse",
-                    !isAnswered && "border-blue-500",
-                    isAnswered && isCorrect && "border-green-500",
-                    isAnswered && !isCorrect && "border-red-500"
-                  )} 
+                    'absolute inset-0 animate-pulse rounded-full border-1',
+                    !isAnswered && 'border-blue-500',
+                    isAnswered && isCorrect && 'border-green-500',
+                    isAnswered && !isCorrect && 'border-red-500'
+                  )}
                 />
               )}
             </div>
diff --git a/frontend/components/quiz/QuizQuestion.tsx b/frontend/components/quiz/QuizQuestion.tsx
index 6d4898e7..ec0eb4a0 100644
--- a/frontend/components/quiz/QuizQuestion.tsx
+++ b/frontend/components/quiz/QuizQuestion.tsx
@@ -1,12 +1,13 @@
 'use client';
 
+import { Check, Lightbulb, X } from 'lucide-react';
 import { useTranslations } from 'next-intl';
-import { QuizQuestionClient } from '@/db/queries/quiz';
+
 import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-import { Button } from '@/components/ui/button';
-import ExplanationRenderer from './ExplanationRenderer';
+import { QuizQuestionClient } from '@/db/queries/quiz';
 import { cn } from '@/lib/utils';
-import { Check, X, Lightbulb } from 'lucide-react';
+
+import ExplanationRenderer from './ExplanationRenderer';
 
 interface QuizQuestionProps {
   question: QuizQuestionClient;
@@ -55,26 +56,28 @@ export function QuizQuestion({
             <label
               key={answer.id}
               className={cn(
-                'flex items-center gap-3 rounded-xl border px-4 py-3 cursor-pointer transition-colors',
+                'flex cursor-pointer items-center gap-3 rounded-xl border px-4 py-3 transition-colors',
                 'hover:bg-gray-50 dark:hover:bg-gray-800',
                 isSelected &&
                   isAnswering &&
                   'border-blue-500 bg-blue-50 dark:bg-blue-950',
-                showCorrect && 'border-1 border-green-500',
-                showIncorrect && 'border-1 border-red-500',
+                showCorrect && 'border border-green-500',
+                showIncorrect && 'border border-red-500',
                 !isAnswering && 'cursor-default'
               )}
             >
               <RadioGroupItem value={answer.id} />
               <span className="flex-1 text-base">{answer.answerText}</span>
               {showCorrect && (
-                <span className="text-green-600 dark:text-green-400 text-sm font-medium">
-                  <Check className="w-4 h-4 inline" /> {t('correct')}
+                <span className="text-sm font-medium text-green-600 dark:text-green-400">
+                  <Check className="inline h-4 w-4" aria-hidden="true" />{' '}
+                  {t('correct')}
                 </span>
               )}
               {showIncorrect && (
-                <span className="text-red-600 dark:text-red-400 text-sm font-medium">
-                 <X className="w-4 h-4 inline" /> {t('incorrect')}
+                <span className="text-sm font-medium text-red-600 dark:text-red-400">
+                  <X className="inline h-4 w-4" aria-hidden="true" />{' '}
+                  {t('incorrect')}
                 </span>
               )}
             </label>
@@ -84,8 +87,8 @@ export function QuizQuestion({
       {isRevealed && isCorrectAnswer && question.explanation && (
         <div
           className={cn(
-            'rounded-xl border p-4 animate-in fade-in duration-300',
-            'border-1 border-blue-500 dark:border-blue-500'
+            'animate-in fade-in rounded-xl border p-4 duration-300',
+            'border border-blue-500 dark:border-blue-500'
           )}
         >
           <div className="mb-2 text-sm font-semibold text-gray-700 dark:text-gray-300">
@@ -97,14 +100,17 @@ export function QuizQuestion({
       {isRevealed && !isCorrectAnswer && (
         <div
           className={cn(
-            'rounded-xl border p-4 animate-in fade-in duration-300',
-            'border-1 border-orange-500 dark:border-orange-500'
+            'animate-in fade-in rounded-xl border p-4 duration-300',
+            'border border-orange-500 dark:border-orange-500'
           )}
         >
           <div className="flex items-start gap-3">
-            <Lightbulb className="w-6 h-6 text-amber-500 flex-shrink-0" />
+            <Lightbulb
+              className="h-6 w-6 shrink-0 text-amber-500"
+              aria-hidden="true"
+            />
             <div className="flex-1">
-              <h4 className="font-semibold text-gray-900 dark:text-gray-100 mb-1">
+              <h4 className="mb-1 font-semibold text-gray-900 dark:text-gray-100">
                 {t('recommendation.title')}
               </h4>
               <p className="text-sm text-gray-600 dark:text-gray-400">
@@ -118,7 +124,7 @@ export function QuizQuestion({
         <button
           onClick={onNext}
           disabled={isLoading}
-          className="group relative mt-2 w-full overflow-hidden text-center rounded-xl border px-6 py-3 text-base font-semibold transition-all duration-300 disabled:opacity-50 animate-in fade-in slide-in-from-bottom-2"
+          className="group animate-in fade-in slide-in-from-bottom-2 relative mt-2 w-full overflow-hidden rounded-xl border px-6 py-3 text-center text-base font-semibold transition-all duration-300 disabled:opacity-50"
           style={{
             borderColor: `${accentColor}50`,
             backgroundColor: `${accentColor}15`,
@@ -127,7 +133,7 @@ export function QuizQuestion({
         >
           {isLoading ? t('loading') : t('nextButton')}
           <span
-            className="pointer-events-none absolute left-1/2 top-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full blur-[20px] opacity-0 transition-opacity duration-300 group-hover:opacity-30"
+            className="pointer-events-none absolute top-1/2 left-1/2 h-[150%] w-[80%] -translate-x-1/2 -translate-y-1/2 rounded-full opacity-0 blur-[20px] transition-opacity duration-300 group-hover:opacity-30"
             style={{ backgroundColor: accentColor }}
           />
         </button>
diff --git a/frontend/components/quiz/QuizResult.tsx b/frontend/components/quiz/QuizResult.tsx
index fad7f5ec..e0acf4c4 100644
--- a/frontend/components/quiz/QuizResult.tsx
+++ b/frontend/components/quiz/QuizResult.tsx
@@ -1,9 +1,16 @@
 'use client';
 
+import {
+  BookOpen,
+  Clock,
+  TrendingUp,
+  TriangleAlert,
+  Trophy,
+} from 'lucide-react';
 import { useLocale, useTranslations } from 'next-intl';
-import { cn } from '@/lib/utils';
+
 import { Button } from '@/components/ui/button';
-import { Clock, BookOpen, TrendingUp, Trophy, AlertTriangle } from 'lucide-react';
+import { cn } from '@/lib/utils';
 
 interface QuizResultProps {
   score: number;
@@ -27,8 +34,7 @@ export function QuizResult({
   violationsCount = 0,
   pointsAwarded,
   isGuest = false,
-  quizSlug = '',
-  isIncomplete = false, 
+  isIncomplete = false,
   onRestart,
   onBackToTopics,
 }: QuizResultProps) {
@@ -37,7 +43,7 @@ export function QuizResult({
   const getMotivationalMessage = () => {
     if (isIncomplete && answeredCount > 0) {
       return {
-        icon: <Clock className="w-14 h-14 text-orange-500" />,
+        icon: <Clock className="h-14 w-14 text-orange-500" />,
         title: t('incomplete.title'),
         message: t('incomplete.message', { answeredCount, total }),
         color: 'text-orange-600 dark:text-orange-400',
@@ -45,7 +51,7 @@ export function QuizResult({
     }
     if (score === 0 && answeredCount === 0) {
       return {
-        icon: <Clock className="w-14 h-14 text-gray-500" />,
+        icon: <Clock className="h-14 w-14 text-gray-500" />,
         title: t('timeUp.title'),
         message: t('timeUp.message'),
         color: 'text-gray-600 dark:text-gray-400',
@@ -54,7 +60,7 @@ export function QuizResult({
 
     if (score === 0 && answeredCount > 0) {
       return {
-        icon: <BookOpen className="w-14 h-14 text-red-500" />,
+        icon: <BookOpen className="h-14 w-14 text-red-500" />,
         title: t('allWrong.title'),
         message: t('allWrong.message'),
         color: 'text-red-600 dark:text-red-400',
@@ -63,21 +69,21 @@ export function QuizResult({
 
     if (percentage < 50) {
       return {
-        icon: <BookOpen className="w-14 h-14 text-red-500" />,
+        icon: <BookOpen className="h-14 w-14 text-red-500" />,
         title: t('needPractice.title'),
         message: t('needPractice.message'),
         color: 'text-red-600 dark:text-red-400',
       };
     } else if (percentage < 80) {
       return {
-        icon: <TrendingUp className="w-14 h-14 text-orange-500" />,
+        icon: <TrendingUp className="h-14 w-14 text-orange-500" />,
         title: t('goodJob.title'),
         message: t('goodJob.message'),
         color: 'text-orange-600 dark:text-orange-400',
       };
     } else {
       return {
-        icon: <Trophy className="w-14 h-14 text-amber-500" />,
+        icon: <Trophy className="h-14 w-14 text-amber-500" />,
         title: t('excellent.title'),
         message: t('excellent.message'),
         color: 'text-green-600 dark:text-green-400',
@@ -88,11 +94,11 @@ export function QuizResult({
   const motivation = getMotivationalMessage();
 
   return (
-    <div className="max-w-2xl mx-auto space-y-8">
+    <div className="mx-auto max-w-2xl space-y-8">
       <div className="flex justify-center">{motivation.icon}</div>
       {!isIncomplete && (
         <>
-          <div className="text-center space-y-2">
+          <div className="space-y-2 text-center">
             <h2 className="text-4xl font-bold text-gray-900 dark:text-gray-100">
               {score} / {total}
             </h2>
@@ -101,7 +107,7 @@ export function QuizResult({
             </p>
           </div>
           <div className="space-y-2">
-            <div className="h-4 bg-gray-200 dark:bg-gray-800 rounded-full overflow-hidden">
+            <div className="h-4 overflow-hidden rounded-full bg-gray-200 dark:bg-gray-800">
               <div
                 className={cn(
                   'h-full transition-all duration-1000 ease-out',
@@ -115,30 +121,35 @@ export function QuizResult({
           </div>
         </>
       )}
-      <div className="text-center space-y-2">
+      <div className="space-y-2 text-center">
         <h3 className={cn('text-xl font-semibold', motivation.color)}>
           {motivation.title}
         </h3>
         <p className="text-gray-600 dark:text-gray-400">{motivation.message}</p>
       </div>
-{violationsCount >= 3 && (
-        <div className="p-4 rounded-xl bg-orange-50 dark:bg-orange-900/20 border border-orange-200 dark:border-orange-800">
-          <p className="text-center text-orange-800 dark:text-orange-200 font-medium">
-            <AlertTriangle className="w-4 h-4 inline" /> {t('violations', { count: violationsCount })}
+      {violationsCount >= 3 && (
+        <div className="rounded-xl border border-orange-200 bg-orange-50 p-4 dark:border-orange-800 dark:bg-orange-900/20">
+          <p className="text-center font-medium text-orange-800 dark:text-orange-200">
+            <TriangleAlert className="inline h-4 w-4" aria-hidden="true" />{' '}
+            {t('violations', { count: violationsCount })}
           </p>
         </div>
       )}
       {!isGuest && pointsAwarded !== null && pointsAwarded !== undefined && (
-        <div className={`p-4 rounded-xl border ${
-          pointsAwarded > 0 
-            ? 'bg-green-50 dark:bg-green-900/20 border-green-200 dark:border-green-800' 
-            : 'bg-gray-50 dark:bg-gray-900/20 border-gray-200 dark:border-gray-800'
-        }`}>
-          <p className={`text-center font-medium ${
+        <div
+          className={`rounded-xl border p-4 ${
             pointsAwarded > 0
-              ? 'text-green-800 dark:text-green-200'
-              : 'text-gray-600 dark:text-gray-400'
-          }`}>
+              ? 'border-green-200 bg-green-50 dark:border-green-800 dark:bg-green-900/20'
+              : 'border-gray-200 bg-gray-50 dark:border-gray-800 dark:bg-gray-900/20'
+          }`}
+        >
+          <p
+            className={`text-center font-medium ${
+              pointsAwarded > 0
+                ? 'text-green-800 dark:text-green-200'
+                : 'text-gray-600 dark:text-gray-400'
+            }`}
+          >
             {pointsAwarded > 0
               ? t('pointsAwarded', { points: pointsAwarded })
               : violationsCount >= 3
@@ -148,39 +159,41 @@ export function QuizResult({
         </div>
       )}
       {isGuest && !isIncomplete ? (
-  <div className="space-y-4">
-    <div className="p-4 rounded-xl bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800">
-      <p className="text-center text-blue-800 dark:text-blue-200 font-medium">
-        {t('guestMessage')}
-      </p>
-    </div>
-<div className="flex flex-col sm:flex-row gap-3 justify-center">
-  <Button
-    onClick={() => {
-      const url = `/${locale}/login?returnTo=/quiz/${quizSlug}`;
-      window.location.href = url;
-    }}
-   >
-    {t('loginButton')}
-  </Button>
-  <Button
-    onClick={() => window.location.href = `/${locale}/signup?returnTo=/quiz/${quizSlug}`}
-    variant="secondary"
-  >
-    {t('signupButton')}
-  </Button>
-</div>
-  </div>
-) : (
-    <div className="flex flex-col sm:flex-row gap-3 justify-center">
-        <Button onClick={onRestart} variant="primary">
-          {t('retryButton')}
-        </Button>
-        <Button onClick={onBackToTopics} variant="secondary">
-          {t('backButton')}
-        </Button>
-      </div>
-)}
+        <div className="space-y-4">
+          <div className="rounded-xl border border-blue-200 bg-blue-50 p-4 dark:border-blue-800 dark:bg-blue-900/20">
+            <p className="text-center font-medium text-blue-800 dark:text-blue-200">
+              {t('guestMessage')}
+            </p>
+          </div>
+          <div className="flex flex-col justify-center gap-3 sm:flex-row">
+            <Button
+              onClick={() => {
+                const url = `/${locale}/login?returnTo=/dashboard`;
+                window.location.href = url;
+              }}
+            >
+              {t('loginButton')}
+            </Button>
+            <Button
+              onClick={() =>
+                (window.location.href = `/${locale}/signup?returnTo=/dashboard`)
+              }
+              variant="secondary"
+            >
+              {t('signupButton')}
+            </Button>
+          </div>
+        </div>
+      ) : (
+        <div className="flex flex-col justify-center gap-3 sm:flex-row">
+          <Button onClick={onRestart} variant="primary">
+            {t('retryButton')}
+          </Button>
+          <Button onClick={onBackToTopics} variant="secondary">
+            {t('backButton')}
+          </Button>
+        </div>
+      )}
     </div>
-    );
+  );
 }
diff --git a/frontend/components/quiz/QuizzesSection.tsx b/frontend/components/quiz/QuizzesSection.tsx
index c6b64510..1965b178 100644
--- a/frontend/components/quiz/QuizzesSection.tsx
+++ b/frontend/components/quiz/QuizzesSection.tsx
@@ -1,13 +1,15 @@
 'use client';
 
+import { useParams, useRouter, useSearchParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
-import { useParams, useSearchParams, useRouter } from 'next/navigation';
-import { QuizCard } from './QuizCard';
-import { Tabs, TabsList, TabsContent } from '@/components/ui/tabs';
-import { categoryData } from '@/data/category';
+
 import { CategoryTabButton } from '@/components/shared/CategoryTabButton';
+import { Tabs, TabsContent, TabsList } from '@/components/ui/tabs';
+import { categoryData } from '@/data/category';
 import { categoryTabStyles } from '@/data/categoryStyles';
 
+import { QuizCard } from './QuizCard';
+
 interface Quiz {
   id: string;
   slug: string;
@@ -57,27 +59,26 @@ export default function QuizzesSection({
     router.replace(`?${params.toString()}`, { scroll: false });
   };
 
-
   return (
     <div className="w-full">
       <Tabs value={activeCategory} onValueChange={handleCategoryChange}>
-        <TabsList className="!bg-transparent !p-0 !h-auto !w-full flex flex-wrap items-stretch justify-start gap-3 mb-6">
-        {categoryData.map(category => {
-          const slug = category.slug as keyof typeof categoryTabStyles;
-          return (
-            <CategoryTabButton
-              key={slug}
-              value={slug}
-              label={
-                category.translations[localeKey] ??
-                category.translations.en ??
-                slug
-              }
-              style={categoryTabStyles[slug]}
-              isActive={activeCategory === slug}
-            />
-          );
-        })}
+        <TabsList className="mb-6 flex !h-auto !w-full flex-wrap items-stretch justify-start gap-3 !bg-transparent !p-0">
+          {categoryData.map(category => {
+            const slug = category.slug as keyof typeof categoryTabStyles;
+            return (
+              <CategoryTabButton
+                key={slug}
+                value={slug}
+                label={
+                  category.translations[localeKey] ??
+                  category.translations.en ??
+                  slug
+                }
+                style={categoryTabStyles[slug]}
+                isActive={activeCategory === slug}
+              />
+            );
+          })}
         </TabsList>
         {categoryData.map(category => {
           const categoryQuizzes = quizzes.filter(
@@ -87,27 +88,27 @@ export default function QuizzesSection({
             <TabsContent key={category.slug} value={category.slug}>
               {categoryQuizzes.length > 0 ? (
                 <div className="max-w-5xl">
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                  {categoryQuizzes.map(quiz => (
-                    <QuizCard
-                      key={quiz.id}
-                      quiz={{
-                        id: quiz.id,
-                        slug: quiz.slug,
-                        title: quiz.title,
-                        description: quiz.description,
-                        questionsCount: quiz.questionsCount,
-                        timeLimitSeconds: quiz.timeLimitSeconds,
-                        categoryName: quiz.categoryName ?? category.slug,
-                        categorySlug: quiz.categorySlug ?? category.slug,
-                      }}
-                      userProgress={userProgressMap[quiz.id] || null}
-                    />
-                  ))}
-                </div>
+                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+                    {categoryQuizzes.map(quiz => (
+                      <QuizCard
+                        key={quiz.id}
+                        quiz={{
+                          id: quiz.id,
+                          slug: quiz.slug,
+                          title: quiz.title,
+                          description: quiz.description,
+                          questionsCount: quiz.questionsCount,
+                          timeLimitSeconds: quiz.timeLimitSeconds,
+                          categoryName: quiz.categoryName ?? category.slug,
+                          categorySlug: quiz.categorySlug ?? category.slug,
+                        }}
+                        userProgress={userProgressMap[quiz.id] || null}
+                      />
+                    ))}
+                  </div>
                 </div>
               ) : (
-                <div className="text-center py-12">
+                <div className="py-12 text-center">
                   <p className="text-gray-600 dark:text-gray-400">
                     {t('noQuizzes')}
                   </p>
diff --git a/frontend/components/quiz/tests/quiz-container-flow.test.tsx b/frontend/components/quiz/tests/quiz-container-flow.test.tsx
index 88b87008..1b0527d3 100644
--- a/frontend/components/quiz/tests/quiz-container-flow.test.tsx
+++ b/frontend/components/quiz/tests/quiz-container-flow.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const { routerReplace, routerBack, toastMock } = vi.hoisted(() => ({
   routerReplace: vi.fn(),
@@ -20,7 +20,6 @@ vi.mock('next/navigation', () => ({
 
 vi.mock('sonner', () => ({ toast: toastMock }));
 
-
 vi.mock('@/hooks/useAntiCheat', () => ({
   useAntiCheat: () => ({
     violations: [],
@@ -113,6 +112,8 @@ describe('QuizContainer flow', () => {
 
     fireEvent.click(await screen.findByRole('button', { name: 'nextButton' }));
 
-    expect(await screen.findByRole('button', { name: 'loginButton' })).toBeTruthy();
+    expect(
+      await screen.findByRole('button', { name: 'loginButton' })
+    ).toBeTruthy();
   });
 });
diff --git a/frontend/components/shared/AnimatedNavLink.tsx b/frontend/components/shared/AnimatedNavLink.tsx
index 582ea25a..85bb3211 100644
--- a/frontend/components/shared/AnimatedNavLink.tsx
+++ b/frontend/components/shared/AnimatedNavLink.tsx
@@ -1,8 +1,9 @@
 'use client';
 
-import { Link } from '@/i18n/routing';
 import type { ComponentProps } from 'react';
 
+import { Link } from '@/i18n/routing';
+
 interface AnimatedNavLinkProps {
   href: string;
   isActive: boolean;
@@ -25,25 +26,16 @@ export function AnimatedNavLink({
       href={href}
       onClick={onClick}
       aria-current={ariaCurrent ?? (isActive ? 'page' : undefined)}
-      className={`
-        group relative px-3 py-2 text-sm font-medium
-        transition-all duration-300 ease-out
-        ${
-          isActive
-            ? '[color:var(--accent-primary)]'
-            : 'text-muted-foreground hover:[color:var(--accent-hover)]'
-        }
-        ${className}
-      `}
+      className={`group relative px-3 py-2 text-sm font-medium transition-all duration-300 ease-out ${
+        isActive
+          ? '[color:var(--accent-primary)]'
+          : 'text-muted-foreground hover:[color:var(--accent-hover)]'
+      } ${className} `}
     >
       {children}
 
       <span
-        className={`
-          absolute inset-x-0 -bottom-3 h-12
-          transition-opacity duration-300 ease-out
-          ${isActive ? 'opacity-50' : 'opacity-0 group-hover:opacity-40'}
-        `}
+        className={`absolute inset-x-0 -bottom-3 h-12 transition-opacity duration-300 ease-out ${isActive ? 'opacity-50' : 'opacity-0 group-hover:opacity-40'} `}
         style={{
           background: `radial-gradient(ellipse 80px 40px at center bottom, ${
             isActive ? 'var(--accent-primary)' : 'var(--accent-hover)'
@@ -55,11 +47,7 @@ export function AnimatedNavLink({
 
       {isActive && (
         <span
-          className="
-            absolute bottom-[-12px] left-1/2 -translate-x-1/2
-            opacity-100 scale-100
-            transition-all duration-300 ease-out
-          "
+          className="absolute bottom-[-12px] left-1/2 -translate-x-1/2 scale-100 opacity-100 transition-all duration-300 ease-out"
           style={{
             width: 0,
             height: 0,
@@ -74,11 +62,7 @@ export function AnimatedNavLink({
 
       {isActive ? (
         <span
-          className="
-            absolute bottom-[-15px] left-1/2 -translate-x-1/2
-            h-[2px] w-full opacity-100
-            transition-all duration-300 ease-out
-          "
+          className="absolute bottom-[-15px] left-1/2 h-[2px] w-full -translate-x-1/2 opacity-100 transition-all duration-300 ease-out"
           style={{
             background: `linear-gradient(90deg, 
               transparent 0%, 
@@ -90,12 +74,7 @@ export function AnimatedNavLink({
         />
       ) : (
         <span
-          className="
-            absolute bottom-[-15px] left-1/2 -translate-x-1/2
-            h-[3px] w-0
-            opacity-0 group-hover:opacity-100 group-hover:w-full
-            transition-all duration-300 ease-out
-          "
+          className="absolute bottom-[-15px] left-1/2 h-[3px] w-0 -translate-x-1/2 opacity-0 transition-all duration-300 ease-out group-hover:w-full group-hover:opacity-100"
           style={{
             background: `linear-gradient(90deg, 
               transparent 0%,
diff --git a/frontend/components/shared/CategoryTabButton.tsx b/frontend/components/shared/CategoryTabButton.tsx
index 817971ca..a169247f 100644
--- a/frontend/components/shared/CategoryTabButton.tsx
+++ b/frontend/components/shared/CategoryTabButton.tsx
@@ -3,8 +3,8 @@
 import Image from 'next/image';
 
 import { TabsTrigger } from '@/components/ui/tabs';
-import { cn } from '@/lib/utils';
 import type { CategoryTabStyle } from '@/data/categoryStyles';
+import { cn } from '@/lib/utils';
 
 type CategoryTabButtonProps = {
   value: string;
@@ -23,8 +23,8 @@ export function CategoryTabButton({
     <TabsTrigger
       value={value}
       className={cn(
-        'group relative h-full min-w-[96px] !flex !w-fit !flex-none !shrink-0 !items-center !justify-start gap-2 overflow-hidden rounded-xl border border-black/5 bg-white/90 px-4 py-3 text-left text-xs font-semibold text-black shadow-sm transition-all duration-300 ease-out hover:-translate-y-0.5 hover:shadow-lg dark:border-white/20 dark:bg-neutral-900/80 dark:text-white',
-        'data-[state=active]:-translate-y-0.5 data-[state=active]:shadow-lg data-[state=active]:border-2 dark:data-[state=active]:border-2',
+        'group relative !flex h-full !w-fit min-w-[96px] !flex-none !shrink-0 !items-center !justify-start gap-2 overflow-hidden rounded-xl border border-black/5 bg-white/90 px-4 py-3 text-left text-xs font-semibold text-black shadow-sm transition-all duration-300 ease-out hover:-translate-y-0.5 hover:shadow-lg dark:border-white/20 dark:bg-neutral-900/80 dark:text-white',
+        'data-[state=active]:-translate-y-0.5 data-[state=active]:border-2 data-[state=active]:shadow-lg dark:data-[state=active]:border-2',
         style.color
       )}
     >
@@ -44,7 +44,7 @@ export function CategoryTabButton({
       <span className="whitespace-nowrap">{label}</span>
       <span
         className={cn(
-          'pointer-events-none absolute right-0 top-1/2 h-[120%] w-[55%] -translate-y-1/2 rounded-full blur-[24px] opacity-0 transition-opacity duration-500 group-hover:opacity-30',
+          'pointer-events-none absolute top-1/2 right-0 h-[120%] w-[55%] -translate-y-1/2 rounded-full opacity-0 blur-[24px] transition-opacity duration-500 group-hover:opacity-30',
           isActive && 'opacity-30',
           style.glow
         )}
diff --git a/frontend/components/shared/CookieBanner.tsx b/frontend/components/shared/CookieBanner.tsx
index a777ff33..6bd15ae7 100644
--- a/frontend/components/shared/CookieBanner.tsx
+++ b/frontend/components/shared/CookieBanner.tsx
@@ -1,48 +1,41 @@
 'use client';
 
-import { useState, useEffect } from 'react';
 import { X } from 'lucide-react';
-import { Link } from '@/i18n/routing';
-import { Button } from '@/components/ui/button';
 import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
+
+import { Button } from '@/components/ui/button';
+import { Link } from '@/i18n/routing';
 
 export function CookieBanner() {
   const t = useTranslations('CookieBanner');
-  const [isVisible, setIsVisible] = useState(false);
-  const [isMounted, setIsMounted] = useState(false);
+  const [isVisible, setIsVisible] = useState<boolean | null>(null);
 
   useEffect(() => {
-    setIsMounted(true);
     const consent = localStorage.getItem('cookie-consent');
     if (!consent) {
       const timer = setTimeout(() => setIsVisible(true), 500);
       return () => clearTimeout(timer);
+    } else {
+      const timer = setTimeout(() => setIsVisible(false), 0);
+      return () => clearTimeout(timer);
     }
   }, []);
 
-  const handleAccept = () => {
-    try {
-      localStorage.setItem('cookie-consent', 'accepted');
-    } catch (error) {
-      console.error('Failed to save cookie consent:', error);
-    }
-    setIsVisible(false);
-  };
+  if (isVisible === null || !isVisible) return null;
 
-  const handleDecline = () => {
+  const handleAction = (type: 'accepted' | 'declined') => {
     try {
-      localStorage.setItem('cookie-consent', 'declined');
+      localStorage.setItem('cookie-consent', type);
     } catch (error) {
       console.error('Failed to save cookie consent:', error);
     }
     setIsVisible(false);
   };
 
-  if (!isMounted || !isVisible) return null;
-
   return (
-    <div className="fixed bottom-0 left-0 right-0 z-[100] p-4 md:p-6 animate-in slide-in-from-bottom-full fade-in duration-700">
-      <div className="mx-auto max-w-4xl rounded-2xl border border-gray-200 bg-white/90 p-5 shadow-2xl backdrop-blur-md dark:border-gray-800 dark:bg-gray-900/90 md:flex md:items-center md:justify-between md:gap-6">
+    <div className="animate-in slide-in-from-bottom-full fade-in fixed right-0 bottom-0 left-0 z-[100] p-4 duration-700 md:p-6">
+      <div className="mx-auto max-w-4xl rounded-2xl border border-gray-200 bg-white/90 p-5 shadow-2xl backdrop-blur-md md:flex md:items-center md:justify-between md:gap-6 dark:border-gray-800 dark:bg-gray-900/90">
         <div className="mb-4 md:mb-0 md:flex-1">
           <div className="mb-1 text-lg font-semibold text-gray-900 dark:text-white">
             {t('title')}
@@ -63,7 +56,7 @@ export function CookieBanner() {
           <Button
             variant="outline"
             size="sm"
-            onClick={handleDecline}
+            onClick={() => handleAction('declined')}
             className="w-full sm:w-auto"
           >
             {t('decline')}
@@ -71,16 +64,16 @@ export function CookieBanner() {
           <Button
             variant="primary"
             size="sm"
-            onClick={handleAccept}
-            className="w-full sm:w-auto shadow-lg shadow-blue-500/20"
+            onClick={() => handleAction('accepted')}
+            className="w-full shadow-lg shadow-blue-500/20 sm:w-auto"
           >
             {t('accept')}
           </Button>
         </div>
 
         <button
-          onClick={handleDecline}
-          className="absolute right-2 top-2 rounded-full p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-gray-800 dark:hover:text-gray-300 md:hidden"
+          onClick={() => handleAction('declined')}
+          className="absolute top-2 right-2 rounded-full p-1 text-gray-400 transition-colors hover:bg-gray-100 hover:text-gray-600 md:hidden dark:hover:bg-gray-800 dark:hover:text-gray-300"
           aria-label={t('decline')}
         >
           <X size={20} />
diff --git a/frontend/components/shared/DynamicGridBackground.tsx b/frontend/components/shared/DynamicGridBackground.tsx
index fb8f4d99..6eba3537 100644
--- a/frontend/components/shared/DynamicGridBackground.tsx
+++ b/frontend/components/shared/DynamicGridBackground.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import type { ReactNode, MouseEvent } from 'react';
 import { motion, useMotionTemplate, useMotionValue } from 'framer-motion';
+import type { MouseEvent, ReactNode } from 'react';
 
 import { cn } from '@/lib/utils';
 
@@ -33,7 +33,7 @@ export function DynamicGridBackground({
     >
       {showStaticGrid && (
         <div className="pointer-events-none absolute inset-0">
-          <div className="absolute inset-0 bg-[linear-gradient(to_right,#80808020_1px,transparent_1px),linear-gradient(to_bottom,#80808020_1px,transparent_1px)] bg-[size:40px_40px] [mask-image:radial-gradient(ellipse_80%_80%_at_50%_50%,#000_70%,transparent_100%)]" />
+          <div className="absolute inset-0 bg-[linear-gradient(to_right,#80808020_1px,transparent_1px),linear-gradient(to_bottom,#80808020_1px,transparent_1px)] [mask-image:radial-gradient(ellipse_80%_80%_at_50%_50%,#000_70%,transparent_100%)] bg-[size:40px_40px]" />
         </div>
       )}
 
@@ -44,7 +44,7 @@ export function DynamicGridBackground({
           WebkitMaskImage: maskImage,
         }}
       >
-        <div className="absolute inset-0 bg-[linear-gradient(to_right,#1e5eff_1px,transparent_1px),linear-gradient(to_bottom,#1e5eff_1px,transparent_1px)] dark:bg-[linear-gradient(to_right,#ff2d55_1px,transparent_1px),linear-gradient(to_bottom,#ff2d55_1px,transparent_1px)] bg-[size:40px_40px] opacity-20 dark:opacity-30" />
+        <div className="absolute inset-0 bg-[linear-gradient(to_right,#1e5eff_1px,transparent_1px),linear-gradient(to_bottom,#1e5eff_1px,transparent_1px)] bg-[size:40px_40px] opacity-20 dark:bg-[linear-gradient(to_right,#ff2d55_1px,transparent_1px),linear-gradient(to_bottom,#ff2d55_1px,transparent_1px)] dark:opacity-30" />
       </motion.div>
 
       {children}
diff --git a/frontend/components/shared/Footer.tsx b/frontend/components/shared/Footer.tsx
index d195df3e..7535f632 100644
--- a/frontend/components/shared/Footer.tsx
+++ b/frontend/components/shared/Footer.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import { Link } from '@/i18n/routing';
-
 import { Github, Linkedin, Send } from 'lucide-react';
-import { ThemeToggle } from '@/components/theme/ThemeToggle';
-import { useTranslations } from 'next-intl';
 import { useSelectedLayoutSegments } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+
+import { ThemeToggle } from '@/components/theme/ThemeToggle';
+import { Link } from '@/i18n/routing';
 import { cn } from '@/lib/utils';
 
 const SOCIAL = [
@@ -25,7 +25,7 @@ export default function Footer() {
   return (
     <footer
       className={cn(
-        'relative overflow-hidden border-t border-border bg-background/90 backdrop-blur supports-[backdrop-filter]:bg-background/50 ' +
+        'border-border bg-background/90 supports-[backdrop-filter]:bg-background/50 relative overflow-hidden border-t backdrop-blur ' +
           '[--footer-brand:var(--accent-primary)] [--footer-hover:var(--accent-hover)] [--theme-toggle-hover:var(--footer-hover)]',
         isShop &&
           '[--footer-brand:var(--foreground)] [--footer-hover:var(--foreground)] ' +
@@ -46,24 +46,14 @@ export default function Footer() {
             <p className="text-sm text-slate-500 dark:text-slate-400">
               <Link
                 href="/privacy-policy"
-                className="
-                  transition-colors
-                  hover:[color:var(--footer-hover)]
-                  active:[color:var(--footer-hover)]
-                  focus-visible:[color:var(--footer-hover)]
-"
+                className="transition-colors hover:[color:var(--footer-hover)] focus-visible:[color:var(--footer-hover)] active:[color:var(--footer-hover)]"
               >
                 {t('privacyPolicy')}
               </Link>
               <span className="px-2 opacity-60">|</span>
               <Link
                 href="/terms-of-service"
-                className="
-                  transition-colors
-                  hover:[color:var(--footer-hover)]
-                  active:[color:var(--footer-hover)]
-                  focus-visible:[color:var(--footer-hover)]
-"
+                className="transition-colors hover:[color:var(--footer-hover)] focus-visible:[color:var(--footer-hover)] active:[color:var(--footer-hover)]"
               >
                 {t('termsOfService')}
               </Link>
@@ -71,12 +61,7 @@ export default function Footer() {
           </div>
 
           <div className="flex items-center gap-3 sm:justify-end">
-            <div
-              className="
-                inline-flex items-center gap-2
-
-              "
-            >
+            <div className="inline-flex items-center gap-2">
               <ThemeToggle />
 
               <span className="mx-1 h-5 w-px bg-gray-200/70 dark:bg-neutral-800/70" />
@@ -89,26 +74,7 @@ export default function Footer() {
                     target="_blank"
                     rel="noreferrer"
                     aria-label={label}
-                    className="
-                      inline-flex h-9 w-9 items-center justify-center
-                      rounded-full border border-gray-200/60
-                      bg-white/40
-                      text-slate-600
-                      dark:border-neutral-800/60
-                      dark:bg-neutral-950/30
-                      dark:text-slate-300
-                      transition-all
-
-                      hover:-translate-y-0.5
-                      hover:!text-[var(--footer-hover)]
-                      hover:!border-[var(--footer-hover)]
-
-                      active:!text-[var(--footer-hover)]
-                      active:!border-[var(--footer-hover)]
-                      active:scale-95
-
-
-                    "
+                    className="inline-flex h-9 w-9 items-center justify-center rounded-full border border-gray-200/60 bg-white/40 text-slate-600 transition-all hover:-translate-y-0.5 hover:!border-[var(--footer-hover)] hover:!text-[var(--footer-hover)] active:scale-95 active:!border-[var(--footer-hover)] active:!text-[var(--footer-hover)] dark:border-neutral-800/60 dark:bg-neutral-950/30 dark:text-slate-300"
                   >
                     <Icon className="h-5 w-5" />
                   </a>
diff --git a/frontend/components/shared/GitHubStarButton.tsx b/frontend/components/shared/GitHubStarButton.tsx
index 04bd9393..92a504c0 100644
--- a/frontend/components/shared/GitHubStarButton.tsx
+++ b/frontend/components/shared/GitHubStarButton.tsx
@@ -1,13 +1,15 @@
 'use client';
 
 import { Star } from 'lucide-react';
-import { useState, useEffect, useRef } from 'react';
+import { useTranslations } from 'next-intl';
+import { useEffect, useRef, useState } from 'react';
 
 interface GitHubStarButtonProps {
   className?: string;
 }
 
 export function GitHubStarButton({ className = '' }: GitHubStarButtonProps) {
+  const t = useTranslations('aria');
   const [displayCount, setDisplayCount] = useState(0);
   const [finalCount, setFinalCount] = useState<number | null>(null);
   const githubUrl = 'https://github.com/DevLoversTeam/devlovers.net';
@@ -74,23 +76,8 @@ export function GitHubStarButton({ className = '' }: GitHubStarButtonProps) {
       href={githubUrl}
       target="_blank"
       rel="noopener noreferrer"
-      aria-label={`Star on GitHub - ${displayCount} stars`}
-      className={`
-        hidden lg:inline-flex
-        group relative
-        items-center
-        px-3 py-2
-        text-sm font-medium
-        rounded-lg
-        overflow-hidden
-        bg-foreground text-background
-        dark:bg-foreground dark:text-background
-        border border-border
-        hover:opacity-90
-        transition-all duration-200
-        shadow-sm
-        ${className}
-      `}
+      aria-label={t('starOnGithub', { count: displayCount })}
+      className={`group bg-foreground text-background dark:bg-foreground dark:text-background border-border relative hidden items-center overflow-hidden rounded-lg border px-3 py-2 text-sm font-medium shadow-sm transition-all duration-200 hover:opacity-90 lg:inline-flex ${className} `}
     >
       <svg
         viewBox="0 0 16 16"
@@ -101,18 +88,12 @@ export function GitHubStarButton({ className = '' }: GitHubStarButtonProps) {
         <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z" />
       </svg>
 
-      <span className="flex items-center gap-0.5 ml-2">
-        <span className="font-semibold tabular-nums min-w-[2ch] text-right">
+      <span className="ml-2 flex items-center gap-0.5">
+        <span className="min-w-[2ch] text-right font-semibold tabular-nums">
           {formatStarCount(displayCount)}
         </span>
         <Star
-          className="
-            h-4 w-4 flex-shrink-0 
-            transition-all duration-300 
-            group-hover:rotate-12
-            group-hover:text-yellow-400
-            group-hover:drop-shadow-[0_0_6px_rgba(250,204,21,0.5)]
-          "
+          className="h-4 w-4 flex-shrink-0 transition-all duration-300 group-hover:rotate-12 group-hover:text-yellow-400 group-hover:drop-shadow-[0_0_6px_rgba(250,204,21,0.5)]"
           fill="currentColor"
           aria-hidden="true"
         />
diff --git a/frontend/components/shared/HeaderButton.tsx b/frontend/components/shared/HeaderButton.tsx
index 24f47938..3aff8b5f 100644
--- a/frontend/components/shared/HeaderButton.tsx
+++ b/frontend/components/shared/HeaderButton.tsx
@@ -1,8 +1,9 @@
 'use client';
 
-import { Link } from '@/i18n/routing';
 import type { LucideIcon } from 'lucide-react';
 
+import { Link } from '@/i18n/routing';
+
 interface HeaderButtonProps {
   href?: string;
   onClick?: () => void;
@@ -63,11 +64,7 @@ export function HeaderButton({
   const content = (
     <>
       <span
-        className="
-          absolute inset-0
-          opacity-0 group-hover:opacity-100 group-active:opacity-100
-          transition-opacity duration-500 ease-out
-        "
+        className="absolute inset-0 opacity-0 transition-opacity duration-500 ease-out group-hover:opacity-100 group-active:opacity-100"
         style={{
           background:
             'linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-hover) 100%)',
@@ -76,14 +73,7 @@ export function HeaderButton({
       />
 
       <span
-        className="
-          absolute inset-0
-          [--tw-translate-x:-100%]
-          group-hover:[--tw-translate-x:100%]
-          group-active:[--tw-translate-x:100%]
-          transition-transform duration-1000 ease-in-out
-          [transform:translateX(var(--tw-translate-x))_skewX(-20deg)]
-        "
+        className="absolute inset-0 [--tw-translate-x:-100%] [transform:translateX(var(--tw-translate-x))_skewX(-20deg)] transition-transform duration-1000 ease-in-out group-hover:[--tw-translate-x:100%] group-active:[--tw-translate-x:100%]"
         style={{
           background: `linear-gradient(90deg, transparent 0%, rgba(255,255,255,${
             isIconOnly ? '0.3' : '0.4'
diff --git a/frontend/components/shared/LanguageSwitcher.tsx b/frontend/components/shared/LanguageSwitcher.tsx
index 181aa3fd..5be57b6e 100644
--- a/frontend/components/shared/LanguageSwitcher.tsx
+++ b/frontend/components/shared/LanguageSwitcher.tsx
@@ -1,10 +1,11 @@
 'use client';
 
-import { useState, useRef, useEffect } from 'react';
+import { Globe } from 'lucide-react';
 import { useParams, usePathname, useSearchParams } from 'next/navigation';
-import { locales, type Locale } from '@/i18n/config';
+import { useEffect, useRef, useState } from 'react';
+
+import { type Locale, locales } from '@/i18n/config';
 import { Link } from '@/i18n/routing';
-import { Globe } from 'lucide-react';
 
 const localeLabels: Record<Locale, string> = {
   uk: 'UA',
@@ -43,7 +44,7 @@ export default function LanguageSwitcher() {
     <div className="relative" ref={dropdownRef}>
       <button
         onClick={() => setIsOpen(!isOpen)}
-        className="group flex items-center gap-1.5 text-muted-foreground font-medium transition-colors active:text-[var(--accent-hover)]"
+        className="group text-muted-foreground flex items-center gap-1.5 font-medium transition-colors active:text-[var(--accent-hover)]"
         aria-label="Change language"
       >
         <Globe className="h-4 w-4 transition-colors group-hover:[color:var(--accent-hover)] group-active:[color:var(--accent-hover)]" />
@@ -68,7 +69,7 @@ export default function LanguageSwitcher() {
       </button>
 
       {isOpen && (
-        <div className="absolute right-0 mt-2 py-2 w-20 bg-white dark:bg-neutral-900 border border-gray-200 dark:border-neutral-800 rounded-md shadow-lg z-[60]">
+        <div className="absolute right-0 z-[60] mt-2 w-20 rounded-md border border-gray-200 bg-white py-2 shadow-lg dark:border-neutral-800 dark:bg-neutral-900">
           {locales.map(locale => (
             <Link
               key={locale}
@@ -82,7 +83,7 @@ export default function LanguageSwitcher() {
               }}
               className={`block px-4 py-2 text-sm transition active:text-[var(--accent-hover)] ${
                 currentLocale === locale
-                  ? 'text-muted-foreground font-medium [background-color:color-mix(in_srgb,var(--accent-primary)_10%,transparent)]'
+                  ? 'text-muted-foreground [background-color:color-mix(in_srgb,var(--accent-primary)_10%,transparent)] font-medium'
                   : 'text-muted-foreground hover:bg-secondary active:bg-secondary'
               }`}
             >
diff --git a/frontend/components/shared/Logo.tsx b/frontend/components/shared/Logo.tsx
index 76d1bcb2..1d4c9943 100644
--- a/frontend/components/shared/Logo.tsx
+++ b/frontend/components/shared/Logo.tsx
@@ -10,20 +10,9 @@ export function Logo({ href }: LogoProps) {
   return (
     <Link
       href={href}
-      className="group flex min-w-0 items-center gap-2 active:scale-95 transition-transform"
+      className="group flex min-w-0 items-center gap-2 transition-transform active:scale-95"
     >
-      <span
-        className="
-          truncate text-xl font-bold tracking-tight
-          bg-[linear-gradient(90deg,var(--logo-foreground,var(--foreground)),var(--accent-hover))]
-          bg-[length:200%_100%]
-          bg-[position:0%_50%]
-          bg-clip-text text-transparent
-          transition-[background-position] duration-500 ease-out
-          group-hover:bg-[position:100%_50%]
-          group-active:bg-[position:100%_50%]
-        "
-      >
+      <span className="truncate bg-[linear-gradient(90deg,var(--logo-foreground,var(--foreground)),var(--accent-hover))] bg-[length:200%_100%] bg-clip-text bg-[position:0%_50%] text-xl font-bold tracking-tight text-transparent transition-[background-position] duration-500 ease-out group-hover:bg-[position:100%_50%] group-active:bg-[position:100%_50%]">
         DevLovers
       </span>
     </Link>
diff --git a/frontend/components/shared/OnlineCounterPopup.tsx b/frontend/components/shared/OnlineCounterPopup.tsx
index b2a79739..417bce17 100644
--- a/frontend/components/shared/OnlineCounterPopup.tsx
+++ b/frontend/components/shared/OnlineCounterPopup.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { useEffect, useState } from 'react';
-import { useTranslations } from 'next-intl';
 import { Users } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import { useEffect, useState } from 'react';
 
 export function OnlineCounterPopup() {
   const t = useTranslations('onlineCounter');
@@ -34,21 +34,18 @@ export function OnlineCounterPopup() {
   };
 
   return (
-    <div className="fixed bottom-[30vh] left-0 right-0 md:bottom-[10vh] md:left-auto md:right-12 z-50 flex justify-center md:justify-end md:pr-0">
+    <div className="fixed right-0 bottom-[30vh] left-0 z-50 flex justify-center md:right-12 md:bottom-[10vh] md:left-auto md:justify-end md:pr-0">
       <div
-        className={`
-          transition-all duration-500 ease-out
-          ${
-            show
-              ? 'translate-y-0 opacity-100 scale-100'
-              : 'translate-y-4 opacity-0 scale-90'
-          }
-        `}
+        className={`transition-all duration-500 ease-out ${
+          show
+            ? 'translate-y-0 scale-100 opacity-100'
+            : 'translate-y-4 scale-90 opacity-0'
+        } `}
       >
         <div className="relative">
-          <div className="absolute -inset-1.5 sm:-inset-2 bg-[var(--accent-primary)]/15 dark:bg-[var(--accent-primary)]/20 blur-xl rounded-3xl" />
+          <div className="absolute -inset-1.5 rounded-3xl bg-[var(--accent-primary)]/15 blur-xl sm:-inset-2 dark:bg-[var(--accent-primary)]/20" />
 
-          <div className="relative inline-flex items-center gap-2.5 sm:gap-2.5 md:gap-3 pl-3 sm:pl-3 md:pl-3.5 pr-3.5 sm:pr-3.5 md:pr-4 py-2.5 sm:py-2.5 md:py-3 rounded-xl sm:rounded-xl md:rounded-2xl bg-card/95 backdrop-blur-xl border border-[var(--accent-primary)]/20 shadow-2xl overflow-hidden">
+          <div className="bg-card/95 relative inline-flex items-center gap-2.5 overflow-hidden rounded-xl border border-[var(--accent-primary)]/20 py-2.5 pr-3.5 pl-3 shadow-2xl backdrop-blur-xl sm:gap-2.5 sm:rounded-xl sm:py-2.5 sm:pr-3.5 sm:pl-3 md:gap-3 md:rounded-2xl md:py-3 md:pr-4 md:pl-3.5">
             <div className="absolute inset-0 opacity-40">
               <div className="absolute inset-0 bg-gradient-to-br from-[var(--accent-primary)]/10 via-[var(--accent-primary)]/5 to-transparent" />
               <div
@@ -57,76 +54,76 @@ export function OnlineCounterPopup() {
               />
             </div>
 
-            <div className="relative flex-shrink-0 z-10">
-              <div className="w-9 h-9 sm:w-9 sm:h-9 md:w-10 md:h-10 rounded-lg sm:rounded-lg md:rounded-xl bg-[var(--accent-primary)]/10 dark:bg-[var(--accent-primary)]/15 backdrop-blur-sm flex items-center justify-center border border-[var(--accent-primary)]/20 relative overflow-hidden">
-                <div className="absolute inset-0 bg-gradient-to-tr from-[var(--accent-primary)]/20 to-transparent animate-pulse" />
-                <Users className="w-4 h-4 sm:w-4 sm:h-4 md:w-5 md:h-5 text-[var(--accent-primary)] relative z-10" />
+            <div className="relative z-10 flex-shrink-0">
+              <div className="relative flex h-9 w-9 items-center justify-center overflow-hidden rounded-lg border border-[var(--accent-primary)]/20 bg-[var(--accent-primary)]/10 backdrop-blur-sm sm:h-9 sm:w-9 sm:rounded-lg md:h-10 md:w-10 md:rounded-xl dark:bg-[var(--accent-primary)]/15">
+                <div className="absolute inset-0 animate-pulse bg-gradient-to-tr from-[var(--accent-primary)]/20 to-transparent" />
+                <Users className="relative z-10 h-4 w-4 text-[var(--accent-primary)] sm:h-4 sm:w-4 md:h-5 md:w-5" />
               </div>
             </div>
 
-            <div className="flex items-baseline gap-1.5 sm:gap-1.5 md:gap-2 relative z-10">
+            <div className="relative z-10 flex items-baseline gap-1.5 sm:gap-1.5 md:gap-2">
               <div className="flex items-baseline gap-1 sm:gap-1 md:gap-1.5">
-                <span className="text-2xl sm:text-xl md:text-2xl font-black text-[var(--accent-primary)] dark:text-[var(--accent-primary)]">
+                <span className="text-2xl font-black text-[var(--accent-primary)] sm:text-xl md:text-2xl dark:text-[var(--accent-primary)]">
                   {online}
                 </span>
-                <span className="text-xs sm:text-xs md:text-sm font-semibold text-foreground/80 dark:text-foreground/90 whitespace-nowrap">
+                <span className="text-foreground/80 dark:text-foreground/90 text-xs font-semibold whitespace-nowrap sm:text-xs md:text-sm">
                   {getText(online)}
                 </span>
               </div>
             </div>
 
-            <div className="ml-auto flex-shrink-0 relative z-10">
+            <div className="relative z-10 ml-auto flex-shrink-0">
               <span className="relative flex h-2.5 w-2.5 sm:h-2.5 sm:w-2.5 md:h-3 md:w-3">
                 <span
-                  className="animate-ping absolute inline-flex h-full w-full rounded-full bg-[var(--accent-primary)]/60"
+                  className="absolute inline-flex h-full w-full animate-ping rounded-full bg-[var(--accent-primary)]/60"
                   style={{ animationDuration: '1.5s' }}
                 />
                 <span
-                  className="animate-ping absolute inline-flex h-full w-full rounded-full bg-[var(--accent-primary)]/40"
+                  className="absolute inline-flex h-full w-full animate-ping rounded-full bg-[var(--accent-primary)]/40"
                   style={{ animationDuration: '2s', animationDelay: '0.5s' }}
                 />
-                <span className="relative inline-flex rounded-full h-2.5 w-2.5 sm:h-2.5 sm:w-2.5 md:h-3 md:w-3 bg-[var(--accent-primary)] shadow-lg shadow-[var(--accent-primary)]/50" />
+                <span className="relative inline-flex h-2.5 w-2.5 rounded-full bg-[var(--accent-primary)] shadow-[var(--accent-primary)]/50 shadow-lg sm:h-2.5 sm:w-2.5 md:h-3 md:w-3" />
               </span>
             </div>
 
-            <div className="absolute bottom-0 left-0 right-0 h-0.5 sm:h-0.5 md:h-1 bg-[var(--accent-primary)]/10 rounded-b-xl sm:rounded-b-xl md:rounded-b-2xl overflow-hidden">
+            <div className="absolute right-0 bottom-0 left-0 h-0.5 overflow-hidden rounded-b-xl bg-[var(--accent-primary)]/10 sm:h-0.5 sm:rounded-b-xl md:h-1 md:rounded-b-2xl">
               <div
                 className="h-full bg-gradient-to-r from-[var(--accent-primary)]/30 via-[var(--accent-primary)]/50 to-[var(--accent-primary)]/30"
                 style={{ animation: 'shrink 8s linear forwards' }}
               />
             </div>
 
-            <div className="absolute top-0 left-0 right-0 h-px bg-gradient-to-r from-transparent via-[var(--accent-primary)]/30 to-transparent" />
+            <div className="absolute top-0 right-0 left-0 h-px bg-gradient-to-r from-transparent via-[var(--accent-primary)]/30 to-transparent" />
 
-            <div className="absolute left-0 top-1/4 bottom-1/4 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
-            <div className="absolute right-0 top-1/4 bottom-1/4 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
+            <div className="absolute top-1/4 bottom-1/4 left-0 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
+            <div className="absolute top-1/4 right-0 bottom-1/4 w-px bg-gradient-to-b from-transparent via-[var(--accent-primary)]/20 to-transparent" />
           </div>
 
-          <div className="absolute -top-1 left-4 sm:left-6 w-1 sm:w-1.5 h-1 sm:h-1.5 rounded-full bg-[var(--accent-primary)]/60 dark:bg-[var(--accent-primary)]/70 animate-ping" />
+          <div className="absolute -top-1 left-4 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/60 sm:left-6 sm:h-1.5 sm:w-1.5 dark:bg-[var(--accent-primary)]/70" />
           <div
-            className="absolute -top-2 right-6 sm:right-8 w-0.5 sm:w-1 h-0.5 sm:h-1 rounded-full bg-[var(--accent-primary)]/60 dark:bg-[var(--accent-primary)]/70 animate-ping"
+            className="absolute -top-2 right-6 h-0.5 w-0.5 animate-ping rounded-full bg-[var(--accent-primary)]/60 sm:right-8 sm:h-1 sm:w-1 dark:bg-[var(--accent-primary)]/70"
             style={{ animationDelay: '0.5s' }}
           />
           <div
-            className="absolute -top-1.5 left-1/3 w-1 h-1 rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60 animate-ping"
+            className="absolute -top-1.5 left-1/3 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60"
             style={{ animationDelay: '1s' }}
           />
 
           <div
-            className="absolute top-1/4 -left-1 w-1 h-1 rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50 animate-ping"
+            className="absolute top-1/4 -left-1 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50"
             style={{ animationDelay: '1.5s' }}
           />
           <div
-            className="absolute top-2/3 -right-1 w-1 h-1 rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50 animate-ping"
+            className="absolute top-2/3 -right-1 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/40 dark:bg-[var(--accent-primary)]/50"
             style={{ animationDelay: '2s' }}
           />
 
           <div
-            className="absolute -bottom-1 left-1/4 w-0.5 sm:w-1 h-0.5 sm:h-1 rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60 animate-ping"
+            className="absolute -bottom-1 left-1/4 h-0.5 w-0.5 animate-ping rounded-full bg-[var(--accent-primary)]/50 sm:h-1 sm:w-1 dark:bg-[var(--accent-primary)]/60"
             style={{ animationDelay: '0.8s' }}
           />
           <div
-            className="absolute -bottom-1.5 right-1/3 w-1 h-1 rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60 animate-ping"
+            className="absolute right-1/3 -bottom-1.5 h-1 w-1 animate-ping rounded-full bg-[var(--accent-primary)]/50 dark:bg-[var(--accent-primary)]/60"
             style={{ animationDelay: '1.2s' }}
           />
         </div>
diff --git a/frontend/components/shop/add-to-cart-button.tsx b/frontend/components/shop/AddToCartButton.tsx
similarity index 92%
rename from frontend/components/shop/add-to-cart-button.tsx
rename to frontend/components/shop/AddToCartButton.tsx
index 7cdfb619..046211a6 100644
--- a/frontend/components/shop/add-to-cart-button.tsx
+++ b/frontend/components/shop/AddToCartButton.tsx
@@ -1,25 +1,26 @@
 'use client';
 
-import { useId, useState } from 'react';
-import type { ShopProduct } from '@/lib/shop/data';
-import { cn } from '@/lib/utils';
 import { Check, Minus, Plus } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+import { useId, useState } from 'react';
+
+import type { ShopProduct } from '@/lib/shop/data';
 import {
+  SHOP_CHIP_HOVER,
+  SHOP_CHIP_INTERACTIVE,
+  SHOP_CHIP_SELECTED,
   SHOP_CTA_BASE,
   SHOP_CTA_INSET,
   SHOP_CTA_WAVE,
-  shopCtaGradient,
   SHOP_FOCUS,
-  SHOP_CHIP_INTERACTIVE,
-  SHOP_CHIP_HOVER,
-  SHOP_CHIP_SELECTED,
-  SHOP_SWATCH_BASE,
   SHOP_SIZE_CHIP_BASE,
   SHOP_STEPPER_BUTTON_BASE,
+  SHOP_SWATCH_BASE,
+  shopCtaGradient,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 
-import { useCart } from './cart-provider';
+import { useCart } from './CartProvider';
 
 interface AddToCartButtonProps {
   product: ShopProduct;
@@ -80,7 +81,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
         <fieldset className="min-w-0">
           <legend
             id={colorGroupId}
-            className="text-sm font-semibold uppercase tracking-wide text-foreground"
+            className="text-foreground text-sm font-semibold tracking-wide uppercase"
           >
             {t('color')}
           </legend>
@@ -106,7 +107,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
                     selectedColor === color
                       ? cn(
                           SHOP_CHIP_SELECTED,
-                          'hover:shadow-[var(--shop-chip-shadow-selected)] hover:border-accent'
+                          'hover:border-accent hover:shadow-[var(--shop-chip-shadow-selected)]'
                         )
                       : 'hover:border-accent/60 hover:shadow-[var(--shop-chip-shadow-hover)]'
                   )}
@@ -126,7 +127,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
         <fieldset className="min-w-0">
           <legend
             id={sizeGroupId}
-            className="text-sm font-semibold uppercase tracking-wide text-foreground"
+            className="text-foreground text-sm font-semibold tracking-wide uppercase"
           >
             {t('size')}
           </legend>
@@ -149,7 +150,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
                   SHOP_FOCUS,
                   selectedSize === size
                     ? cn('bg-accent text-accent-foreground', SHOP_CHIP_SELECTED)
-                    : 'bg-transparent text-muted-foreground border-border hover:text-foreground hover:shadow-[var(--shop-chip-shadow-hover)] hover:border-accent/60'
+                    : 'text-muted-foreground border-border hover:text-foreground hover:border-accent/60 bg-transparent hover:shadow-[var(--shop-chip-shadow-hover)]'
                 )}
               >
                 {size}
@@ -162,7 +163,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
       <section aria-labelledby={quantityGroupId}>
         <h3
           id={quantityGroupId}
-          className="text-sm font-semibold uppercase tracking-wide text-foreground"
+          className="text-foreground text-sm font-semibold tracking-wide uppercase"
         >
           {t('quantity')}
         </h3>
@@ -212,7 +213,7 @@ export function AddToCartButton({ product }: AddToCartButtonProps) {
           'w-full justify-center gap-2 px-8 py-3',
           'transition-[transform,filter] duration-700 ease-out',
           !product.inStock &&
-            'cursor-not-allowed bg-muted text-muted-foreground',
+            'bg-muted text-muted-foreground cursor-not-allowed',
           product.inStock &&
             (added
               ? 'text-white shadow-[var(--shop-hero-btn-success-shadow)] hover:shadow-[var(--shop-hero-btn-success-shadow-hover)]'
diff --git a/frontend/components/shop/cart-provider.tsx b/frontend/components/shop/CartProvider.tsx
similarity index 100%
rename from frontend/components/shop/cart-provider.tsx
rename to frontend/components/shop/CartProvider.tsx
index 14e4354e..2b54ecfe 100644
--- a/frontend/components/shop/cart-provider.tsx
+++ b/frontend/components/shop/CartProvider.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import type { ReactNode } from 'react';
 import {
   createContext,
   useCallback,
@@ -8,13 +9,12 @@ import {
   useRef,
   useState,
 } from 'react';
-import type { ReactNode } from 'react';
 
 import {
+  capQuantityByStock,
   type Cart,
   type CartClientItem,
   type CartRehydrateError,
-  capQuantityByStock,
   clearStoredCart,
   createCartItemKey,
   emptyCart,
@@ -22,8 +22,8 @@ import {
   persistCartItems,
   rehydrateCart,
 } from '@/lib/cart';
-import type { ShopProduct } from '@/lib/shop/data';
 import { logWarn } from '@/lib/logging';
+import type { ShopProduct } from '@/lib/shop/data';
 
 interface CartContextType {
   cart: Cart;
diff --git a/frontend/components/shop/catalog-load-more.tsx b/frontend/components/shop/CatalogLoadMore.tsx
similarity index 99%
rename from frontend/components/shop/catalog-load-more.tsx
rename to frontend/components/shop/CatalogLoadMore.tsx
index 29358b8a..27ea7083 100644
--- a/frontend/components/shop/catalog-load-more.tsx
+++ b/frontend/components/shop/CatalogLoadMore.tsx
@@ -1,13 +1,14 @@
 'use client';
 
 import { useTranslations } from 'next-intl';
-import { cn } from '@/lib/utils';
+
 import {
   SHOP_DISABLED,
   SHOP_FOCUS,
   SHOP_OUTLINE_BTN_BASE,
   SHOP_OUTLINE_BTN_INTERACTIVE,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 interface CatalogLoadMoreProps {
   hasMore: boolean;
   isLoading: boolean;
diff --git a/frontend/components/shop/catalog-products-client.tsx b/frontend/components/shop/CatalogProductsClient.tsx
similarity index 93%
rename from frontend/components/shop/catalog-products-client.tsx
rename to frontend/components/shop/CatalogProductsClient.tsx
index 44c5c2a8..66f3876c 100644
--- a/frontend/components/shop/catalog-products-client.tsx
+++ b/frontend/components/shop/CatalogProductsClient.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import React from 'react';
-import { useSearchParams, type ReadonlyURLSearchParams } from 'next/navigation';
+import { type ReadonlyURLSearchParams, useSearchParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import React from 'react';
 
-import { CatalogLoadMore } from '@/components/shop/catalog-load-more';
-import { ProductCard } from '@/components/shop/product-card';
+import { CatalogLoadMore } from '@/components/shop/CatalogLoadMore';
+import { ProductCard } from '@/components/shop/ProductCard';
 import { logError } from '@/lib/logging';
 
 type Product = React.ComponentProps<typeof ProductCard>['product'] & {
@@ -139,7 +139,7 @@ export function CatalogProductsClient({
         />
 
         {error ? (
-          <p className="text-sm text-muted-foreground" role="status">
+          <p className="text-muted-foreground text-sm" role="status">
             {error}
           </p>
         ) : null}
diff --git a/frontend/components/shop/category-tile.tsx b/frontend/components/shop/CategoryTile.tsx
similarity index 88%
rename from frontend/components/shop/category-tile.tsx
rename to frontend/components/shop/CategoryTile.tsx
index 3047f33b..a9907f26 100644
--- a/frontend/components/shop/category-tile.tsx
+++ b/frontend/components/shop/CategoryTile.tsx
@@ -1,7 +1,8 @@
 import Image from 'next/image';
+import { getTranslations } from 'next-intl/server';
+
 import { Link } from '@/i18n/routing';
 import type { ShopCategory } from '@/lib/shop/data';
-import { getTranslations } from 'next-intl/server';
 
 interface CategoryTileProps {
   category: ShopCategory;
@@ -21,9 +22,9 @@ export async function CategoryTile({ category }: CategoryTileProps) {
       aria-label={tCategoryTile('shopCategory', { name: categoryName })}
       className={[
         'group relative block w-full',
-        'aspect-[4/3] overflow-hidden rounded-lg bg-muted',
+        'bg-muted aspect-[4/3] overflow-hidden rounded-lg',
         'transition-[box-shadow] duration-500 hover:shadow-[var(--shop-card-shadow-hover)]',
-        'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:ring-offset-background',
+        'focus-visible:ring-offset-background focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:outline-none',
       ].join(' ')}
     >
       <Image
diff --git a/frontend/components/shop/clear-cart-on-mount.tsx b/frontend/components/shop/ClearCartOnMount.tsx
similarity index 88%
rename from frontend/components/shop/clear-cart-on-mount.tsx
rename to frontend/components/shop/ClearCartOnMount.tsx
index 603b3c37..34daeccb 100644
--- a/frontend/components/shop/clear-cart-on-mount.tsx
+++ b/frontend/components/shop/ClearCartOnMount.tsx
@@ -1,7 +1,8 @@
 'use client';
 
 import { useEffect, useRef } from 'react';
-import { useCart } from '@/components/shop/cart-provider';
+
+import { useCart } from '@/components/shop/CartProvider';
 
 type ClearCartOnMountProps = {
   enabled?: boolean;
diff --git a/frontend/components/shop/product-card.tsx b/frontend/components/shop/ProductCard.tsx
similarity index 79%
rename from frontend/components/shop/product-card.tsx
rename to frontend/components/shop/ProductCard.tsx
index 51bacbc5..9472bff0 100644
--- a/frontend/components/shop/product-card.tsx
+++ b/frontend/components/shop/ProductCard.tsx
@@ -1,13 +1,14 @@
 'use client';
 
-import { Link } from '@/i18n/routing';
 import Image from 'next/image';
-import type { ShopProduct } from '@/lib/shop/data';
-import { cn } from '@/lib/utils';
 import { useParams } from 'next/navigation';
-import { formatMoney } from '@/lib/shop/currency';
 import { useTranslations } from 'next-intl';
 
+import { Link } from '@/i18n/routing';
+import { formatMoney } from '@/lib/shop/currency';
+import type { ShopProduct } from '@/lib/shop/data';
+import { cn } from '@/lib/utils';
+
 const PLACEHOLDER = '/placeholder.svg';
 const allowedHosts = new Set(['res.cloudinary.com', 'cdn.sanity.io']);
 
@@ -44,12 +45,12 @@ export function ProductCard({ product }: ProductCardProps) {
   return (
     <Link
       href={`/shop/products/${product.slug}`}
-      className="group relative flex flex-col overflow-hidden rounded-lg border border-border bg-card transition-shadow duration-500 hover:shadow-[var(--shop-card-shadow-hover)] hover:border-transparent focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:ring-offset-background"
+      className="group border-border bg-card focus-visible:ring-offset-background relative flex flex-col overflow-hidden rounded-lg border transition-shadow duration-500 hover:border-transparent hover:shadow-[var(--shop-card-shadow-hover)] focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:outline-none"
     >
       {product.badge && product.badge !== 'NONE' && (
         <span
           className={cn(
-            'absolute left-3 top-3 z-10 rounded px-2 py-1 text-xs font-semibold uppercase',
+            'absolute top-3 left-3 z-10 rounded px-2 py-1 text-xs font-semibold uppercase',
             product.badge === 'SALE' && 'bg-accent text-accent-foreground',
             product.badge === 'NEW' && 'bg-foreground text-background'
           )}
@@ -58,7 +59,7 @@ export function ProductCard({ product }: ProductCardProps) {
         </span>
       )}
 
-      <div className="relative aspect-square overflow-hidden bg-muted">
+      <div className="bg-muted relative aspect-square overflow-hidden">
         <Image
           src={src}
           alt={product.name}
@@ -69,7 +70,7 @@ export function ProductCard({ product }: ProductCardProps) {
       </div>
 
       <div className="flex flex-1 flex-col p-4">
-        <h3 className="text-sm font-medium text-foreground">{product.name}</h3>
+        <h3 className="text-foreground text-sm font-medium">{product.name}</h3>
 
         <div className="mt-2 flex items-center gap-2" aria-label="Price">
           <span
@@ -82,7 +83,7 @@ export function ProductCard({ product }: ProductCardProps) {
           </span>
 
           {product.originalPrice && (
-            <span className="text-sm text-muted-foreground line-through">
+            <span className="text-muted-foreground text-sm line-through">
               {formatMoney(product.originalPrice, product.currency, locale)}
             </span>
           )}
@@ -90,7 +91,7 @@ export function ProductCard({ product }: ProductCardProps) {
 
         <p
           className={cn(
-            'mt-2 text-xs text-muted-foreground min-h-[1rem] leading-4',
+            'text-muted-foreground mt-2 min-h-[1rem] text-xs leading-4',
             product.inStock && 'invisible'
           )}
           {...(product.inStock ? { 'aria-hidden': true } : { role: 'status' })}
diff --git a/frontend/components/shop/product-filters.tsx b/frontend/components/shop/ProductFilters.tsx
similarity index 91%
rename from frontend/components/shop/product-filters.tsx
rename to frontend/components/shop/ProductFilters.tsx
index bb538ac3..b7b92c23 100644
--- a/frontend/components/shop/product-filters.tsx
+++ b/frontend/components/shop/ProductFilters.tsx
@@ -1,19 +1,20 @@
 'use client';
 
-import { useId } from 'react';
 import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import { useId } from 'react';
+
+import { CATEGORIES, COLORS, PRODUCT_TYPES, SIZES } from '@/lib/config/catalog';
 import {
-  SHOP_FOCUS,
-  SHOP_CHIP_INTERACTIVE,
+  SHOP_CHIP_BORDER_HOVER,
   SHOP_CHIP_HOVER,
+  SHOP_CHIP_INTERACTIVE,
   SHOP_CHIP_SELECTED,
-  SHOP_SWATCH_BASE,
-  SHOP_SIZE_CHIP_BASE,
   SHOP_FILTER_ITEM_BASE,
-  SHOP_CHIP_BORDER_HOVER,
+  SHOP_FOCUS,
+  SHOP_SIZE_CHIP_BASE,
+  SHOP_SWATCH_BASE,
 } from '@/lib/shop/ui-classes';
-import { CATEGORIES, COLORS, PRODUCT_TYPES, SIZES } from '@/lib/config/catalog';
 import { cn } from '@/lib/utils';
 
 export function ProductFilters() {
@@ -51,7 +52,7 @@ export function ProductFilters() {
       <section aria-labelledby={categoryGroupId}>
         <h3
           id={categoryGroupId}
-          className="text-sm font-semibold uppercase tracking-wide text-foreground"
+          className="text-foreground text-sm font-semibold tracking-wide uppercase"
         >
           {t('category')}
         </h3>
@@ -68,7 +69,7 @@ export function ProductFilters() {
                   SHOP_FOCUS,
                   currentCategory === cat.slug
                     ? 'text-accent'
-                    : 'text-muted-foreground hover:text-accent'
+                    : 'text-muted-foreground hover:text-accent active:text-accent'
                 )}
               >
                 {tCategories(
@@ -87,7 +88,7 @@ export function ProductFilters() {
       <section aria-labelledby={typeGroupId}>
         <h3
           id={typeGroupId}
-          className="text-sm font-semibold uppercase tracking-wide text-foreground"
+          className="text-foreground text-sm font-semibold tracking-wide uppercase"
         >
           {t('type')}
         </h3>
@@ -109,7 +110,7 @@ export function ProductFilters() {
                     SHOP_FOCUS,
                     isSelected
                       ? 'text-accent'
-                      : 'text-muted-foreground hover:text-accent'
+                      : 'text-muted-foreground hover:text-accent active:text-accent'
                   )}
                 >
                   {tTypes(type.slug)}
@@ -123,7 +124,7 @@ export function ProductFilters() {
       <section aria-labelledby={colorGroupId}>
         <h3
           id={colorGroupId}
-          className="text-sm font-semibold uppercase tracking-wide text-foreground"
+          className="text-foreground text-sm font-semibold tracking-wide uppercase"
         >
           {t('color')}
         </h3>
@@ -162,7 +163,7 @@ export function ProductFilters() {
       <section aria-labelledby={sizeGroupId}>
         <h3
           id={sizeGroupId}
-          className="text-sm font-semibold uppercase tracking-wide text-foreground"
+          className="text-foreground text-sm font-semibold tracking-wide uppercase"
         >
           {t('size')}
         </h3>
@@ -185,7 +186,7 @@ export function ProductFilters() {
                   isSelected
                     ? cn('bg-accent text-accent-foreground', SHOP_CHIP_SELECTED)
                     : cn(
-                        'bg-transparent text-muted-foreground border-border hover:text-foreground',
+                        'text-muted-foreground border-border hover:text-foreground bg-transparent',
                         SHOP_CHIP_HOVER,
                         SHOP_CHIP_BORDER_HOVER
                       )
diff --git a/frontend/components/shop/product-sort.tsx b/frontend/components/shop/ProductSort.tsx
similarity index 95%
rename from frontend/components/shop/product-sort.tsx
rename to frontend/components/shop/ProductSort.tsx
index 6476bc4c..ccf01fd4 100644
--- a/frontend/components/shop/product-sort.tsx
+++ b/frontend/components/shop/ProductSort.tsx
@@ -1,18 +1,19 @@
 'use client';
 
-import { useId } from 'react';
-import { useRouter } from '@/i18n/routing';
+import { ChevronDown } from 'lucide-react';
 import { useSearchParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
-import { ChevronDown } from 'lucide-react';
+import { useId } from 'react';
+
+import { useRouter } from '@/i18n/routing';
 import { SORT_OPTIONS } from '@/lib/config/catalog';
-import { cn } from '@/lib/utils';
 import {
   SHOP_DISABLED,
   SHOP_FOCUS,
   SHOP_SELECT_BASE,
   SHOP_SELECT_INTERACTIVE,
 } from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
 
 type ProductSortProps = {
   className?: string;
@@ -63,7 +64,7 @@ export function ProductSort({ className }: ProductSortProps) {
       )}
       aria-label={t('label')}
     >
-      <label htmlFor={selectId} className="text-sm text-muted-foreground">
+      <label htmlFor={selectId} className="text-muted-foreground text-sm">
         {t('sortBy')}
       </label>
 
@@ -90,7 +91,7 @@ export function ProductSort({ className }: ProductSortProps) {
 
         <ChevronDown
           className={cn(
-            'pointer-events-none absolute right-3 top-1/2 h-4 w-4 -translate-y-1/2',
+            'pointer-events-none absolute top-1/2 right-3 h-4 w-4 -translate-y-1/2',
             'text-muted-foreground transition-colors',
             'peer-hover:text-foreground peer-focus-visible:text-foreground'
           )}
diff --git a/frontend/components/shop/products-toolbar.tsx b/frontend/components/shop/ProductsToolbar.tsx
similarity index 85%
rename from frontend/components/shop/products-toolbar.tsx
rename to frontend/components/shop/ProductsToolbar.tsx
index e8f2a3d6..ff62d2e6 100644
--- a/frontend/components/shop/products-toolbar.tsx
+++ b/frontend/components/shop/ProductsToolbar.tsx
@@ -1,11 +1,11 @@
 'use client';
 
-import React from 'react';
 import { Filter, X } from 'lucide-react';
 import { useTranslations } from 'next-intl';
+import React from 'react';
 
-import { ProductSort } from '@/components/shop/product-sort';
-import { ProductFilters } from '@/components/shop/product-filters';
+import { ProductFilters } from '@/components/shop/ProductFilters';
+import { ProductSort } from '@/components/shop/ProductSort';
 
 export function ProductsToolbar() {
   const [open, setOpen] = React.useState(false);
@@ -132,7 +132,7 @@ export function ProductsToolbar() {
         aria-label={t('label')}
         className="flex flex-wrap items-end gap-3"
       >
-        <div className="min-w-0 flex-1 sm:flex-none sm:min-w-[260px]">
+        <div className="min-w-0 flex-1 sm:min-w-[260px] sm:flex-none">
           <ProductSort />
         </div>
 
@@ -140,7 +140,7 @@ export function ProductsToolbar() {
           ref={openBtnRef}
           type="button"
           onClick={() => setOpen(true)}
-          className="inline-flex h-10 shrink-0 items-center gap-2 rounded-md border border-border px-3 text-sm text-muted-foreground transition-colors hover:border-foreground hover:text-foreground lg:hidden"
+          className="border-border text-muted-foreground hover:border-foreground hover:text-foreground inline-flex h-10 shrink-0 items-center gap-2 rounded-md border px-3 text-sm transition-colors lg:hidden"
           aria-label={t('openFilters')}
           aria-controls={dialogId}
           aria-expanded={open}
@@ -166,12 +166,12 @@ export function ProductsToolbar() {
             aria-modal="true"
             tabIndex={-1}
             aria-labelledby={dialogTitleId}
-            className="absolute right-0 top-0 h-full w-full max-w-sm overflow-y-auto bg-background shadow-xl"
+            className="bg-background absolute top-0 right-0 h-full w-full max-w-sm overflow-y-auto shadow-xl"
           >
-            <div className="flex items-center justify-between border-b border-border px-4 py-4">
+            <div className="border-border flex items-center justify-between border-b px-4 py-4">
               <h2
                 id={dialogTitleId}
-                className="text-sm font-semibold text-foreground"
+                className="text-foreground text-sm font-semibold"
               >
                 {t('filters')}
               </h2>
@@ -180,7 +180,7 @@ export function ProductsToolbar() {
                 ref={closeBtnRef}
                 type="button"
                 onClick={close}
-                className="inline-flex h-9 w-9 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-secondary hover:text-foreground"
+                className="text-muted-foreground hover:bg-secondary hover:text-foreground inline-flex h-9 w-9 items-center justify-center rounded-md transition-colors"
                 aria-label={t('close')}
               >
                 <X className="h-5 w-5" aria-hidden="true" />
diff --git a/frontend/components/shop/shop-hero.tsx b/frontend/components/shop/ShopHero.tsx
similarity index 74%
rename from frontend/components/shop/shop-hero.tsx
rename to frontend/components/shop/ShopHero.tsx
index 6e18f9fe..f180c59b 100644
--- a/frontend/components/shop/shop-hero.tsx
+++ b/frontend/components/shop/ShopHero.tsx
@@ -16,40 +16,35 @@ import {
 export function Hero({ headline, subheadline, ctaText, ctaLink }: HeroProps) {
   return (
     <section
-      className="relative overflow-hidden bg-background"
+      className="bg-background relative overflow-hidden"
       aria-labelledby="shop-hero-title"
     >
       <div className="mx-auto max-w-7xl px-4 py-20 sm:px-6 sm:py-28 lg:px-8 lg:py-36">
         <div className="mx-auto max-w-3xl text-center">
           <h1
             id="shop-hero-title"
-            className="relative inline-block text-balance text-4xl font-black leading-[1.08] tracking-tight sm:text-5xl lg:text-6xl pb-2"
+            className="relative inline-block pb-2 text-4xl leading-[1.08] font-black tracking-tight text-balance sm:text-5xl lg:text-6xl"
           >
-            <span className="relative inline-block bg-gradient-to-r from-foreground/80 via-foreground to-foreground/80 bg-clip-text text-transparent dark:from-[var(--accent-primary)]/70 dark:via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 dark:to-[var(--accent-hover)]/70">
+            <span className="from-foreground/80 via-foreground to-foreground/80 relative inline-block bg-gradient-to-r bg-clip-text text-transparent dark:from-[var(--accent-primary)]/70 dark:via-[color-mix(in_srgb,var(--accent-primary)_70%,white)]/70 dark:to-[var(--accent-hover)]/70">
               {headline}
             </span>
 
             <span
-              className="pointer-events-none absolute inset-0 inline-block bg-gradient-to-r from-foreground via-foreground to-foreground bg-clip-text text-transparent wave-text-gradient dark:from-[var(--accent-primary)] dark:via-[color-mix(in_srgb,var(--accent-primary)_70%,white)] dark:to-[var(--accent-hover)]"
+              className="from-foreground via-foreground to-foreground wave-text-gradient pointer-events-none absolute inset-0 inline-block bg-gradient-to-r bg-clip-text text-transparent dark:from-[var(--accent-primary)] dark:via-[color-mix(in_srgb,var(--accent-primary)_70%,white)] dark:to-[var(--accent-hover)]"
               aria-hidden="true"
             >
               {headline}
             </span>
           </h1>
 
-          <p className="mx-auto mt-6 max-w-xl text-pretty text-sm sm:text-base md:text-lg text-muted-foreground font-light">
+          <p className="text-muted-foreground mx-auto mt-6 max-w-xl text-sm font-light text-pretty sm:text-base md:text-lg">
             {subheadline}
           </p>
 
           <div className="mt-10">
             <Link
               href={ctaLink}
-              className={`
-    ${SHOP_CTA_BASE} ${SHOP_FOCUS}
-    px-8 sm:px-10 md:px-12 py-3 md:py-3.5 lg:py-4
-    text-white
-    shadow-[var(--shop-hero-btn-shadow)] hover:shadow-[var(--shop-hero-btn-shadow-hover)]
-  `}
+              className={` ${SHOP_CTA_BASE} ${SHOP_FOCUS} px-8 py-3 text-white shadow-[var(--shop-hero-btn-shadow)] hover:shadow-[var(--shop-hero-btn-shadow-hover)] sm:px-10 md:px-12 md:py-3.5 lg:py-4`}
             >
               <span
                 className="absolute inset-0"
diff --git a/frontend/components/shop/admin/admin-pagination.tsx b/frontend/components/shop/admin/AdminPagination.tsx
similarity index 96%
rename from frontend/components/shop/admin/admin-pagination.tsx
rename to frontend/components/shop/admin/AdminPagination.tsx
index a929f440..6fdd6b54 100644
--- a/frontend/components/shop/admin/admin-pagination.tsx
+++ b/frontend/components/shop/admin/AdminPagination.tsx
@@ -1,6 +1,7 @@
+import { getTranslations } from 'next-intl/server';
+
 import { Link } from '@/i18n/routing';
 import { cn } from '@/lib/utils';
-import { getTranslations } from 'next-intl/server';
 
 type AdminPaginationProps = {
   basePath: string;
@@ -49,7 +50,7 @@ export async function AdminPagination({
         </li>
 
         <li>
-          <span aria-current="page" className="text-sm text-muted-foreground">
+          <span aria-current="page" className="text-muted-foreground text-sm">
             {t('page', { page })}
           </span>
         </li>
diff --git a/frontend/components/shop/admin/admin-product-delete-button.tsx b/frontend/components/shop/admin/AdminProductDeleteButton.tsx
similarity index 90%
rename from frontend/components/shop/admin/admin-product-delete-button.tsx
rename to frontend/components/shop/admin/AdminProductDeleteButton.tsx
index a71d220a..005a5586 100644
--- a/frontend/components/shop/admin/admin-product-delete-button.tsx
+++ b/frontend/components/shop/admin/AdminProductDeleteButton.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import { useId, useState } from 'react';
 import { useRouter } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import { useId, useState } from 'react';
 
 interface AdminProductDeleteButtonProps {
   id: string;
@@ -91,7 +91,7 @@ export function AdminProductDeleteButton({
         disabled={isLoading}
         aria-busy={isLoading}
         aria-describedby={error ? errorId : undefined}
-        className="w-full max-w-full whitespace-normal break-words leading-tight rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary disabled:cursor-not-allowed disabled:opacity-50 text-center"
+        className="border-border text-foreground hover:bg-secondary w-full max-w-full rounded-md border px-2 py-1 text-center text-xs leading-tight font-medium break-words whitespace-normal transition-colors disabled:cursor-not-allowed disabled:opacity-50"
       >
         {isLoading ? t('deleting') : t('delete')}
       </button>
diff --git a/frontend/components/shop/admin/admin-product-status-toggle.tsx b/frontend/components/shop/admin/AdminProductStatusToggle.tsx
similarity index 90%
rename from frontend/components/shop/admin/admin-product-status-toggle.tsx
rename to frontend/components/shop/admin/AdminProductStatusToggle.tsx
index 48ab1edf..df07b02e 100644
--- a/frontend/components/shop/admin/admin-product-status-toggle.tsx
+++ b/frontend/components/shop/admin/AdminProductStatusToggle.tsx
@@ -1,7 +1,7 @@
 'use client';
 
-import { useId, useState } from 'react';
 import { useTranslations } from 'next-intl';
+import { useId, useState } from 'react';
 
 interface AdminProductStatusToggleProps {
   id: string;
@@ -86,7 +86,7 @@ export function AdminProductStatusToggle({
         aria-busy={isLoading}
         aria-pressed={isActive}
         aria-describedby={error ? errorId : undefined}
-        className="w-full max-w-full whitespace-normal break-words leading-tight rounded-md border border-border px-2 py-1 text-xs font-medium text-foreground transition-colors hover:bg-secondary disabled:cursor-not-allowed disabled:opacity-50 text-center"
+        className="border-border text-foreground hover:bg-secondary w-full max-w-full rounded-md border px-2 py-1 text-center text-xs leading-tight font-medium break-words whitespace-normal transition-colors disabled:cursor-not-allowed disabled:opacity-50"
       >
         {buttonLabel}
       </button>
diff --git a/frontend/components/shop/admin/shop-admin-topbar.tsx b/frontend/components/shop/admin/ShopAdminTopbar.tsx
similarity index 73%
rename from frontend/components/shop/admin/shop-admin-topbar.tsx
rename to frontend/components/shop/admin/ShopAdminTopbar.tsx
index 2b04f168..ae4ba5a2 100644
--- a/frontend/components/shop/admin/shop-admin-topbar.tsx
+++ b/frontend/components/shop/admin/ShopAdminTopbar.tsx
@@ -1,11 +1,12 @@
-import { Link } from '@/i18n/routing';
 import { getTranslations } from 'next-intl/server';
 
+import { Link } from '@/i18n/routing';
+
 export async function ShopAdminTopbar() {
   const t = await getTranslations('shop.admin.topbar');
 
   return (
-    <header className="border-b border-border bg-background">
+    <header className="border-border bg-background border-b">
       <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
         <nav
           aria-label={t('label')}
@@ -15,7 +16,7 @@ export async function ShopAdminTopbar() {
             <li>
               <Link
                 href="/shop/admin"
-                className="text-sm font-semibold text-foreground hover:underline"
+                className="text-foreground text-sm font-semibold hover:underline"
               >
                 {t('admin')}
               </Link>
@@ -28,7 +29,7 @@ export async function ShopAdminTopbar() {
             <li>
               <Link
                 href="/shop/admin/products"
-                className="text-sm font-medium text-muted-foreground hover:text-foreground"
+                className="text-muted-foreground hover:text-foreground text-sm font-medium"
               >
                 {t('products')}
               </Link>
@@ -37,7 +38,7 @@ export async function ShopAdminTopbar() {
             <li>
               <Link
                 href="/shop/admin/orders"
-                className="text-sm font-medium text-muted-foreground hover:text-foreground"
+                className="text-muted-foreground hover:text-foreground text-sm font-medium"
               >
                 {t('orders')}
               </Link>
@@ -47,7 +48,7 @@ export async function ShopAdminTopbar() {
           <div className="shrink-0 whitespace-nowrap">
             <Link
               href="/shop"
-              className="inline-flex items-center rounded-md border border-border px-3 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-secondary"
+              className="border-border text-foreground hover:bg-secondary inline-flex items-center rounded-md border px-3 py-1.5 text-sm font-medium transition-colors"
             >
               {t('backToShop')}
             </Link>
diff --git a/frontend/components/shop/header/cart-button.tsx b/frontend/components/shop/header/CartButton.tsx
similarity index 73%
rename from frontend/components/shop/header/cart-button.tsx
rename to frontend/components/shop/header/CartButton.tsx
index 7e8ed8c8..07042123 100644
--- a/frontend/components/shop/header/cart-button.tsx
+++ b/frontend/components/shop/header/CartButton.tsx
@@ -1,27 +1,32 @@
 'use client';
 
 import { ShoppingBag } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 
-import { useMounted } from '@/hooks/use-mounted';
 import { HeaderButton } from '@/components/shared/HeaderButton';
+import { useMounted } from '@/hooks/use-mounted';
 
-import { useCart } from '../cart-provider';
+import { useCart } from '../CartProvider';
 
 export function CartButton() {
   const { cart } = useCart();
   const mounted = useMounted();
+  const t = useTranslations('aria');
 
   const itemCount = mounted ? cart.summary.itemCount : 0;
   const showCount = itemCount > 0;
 
   const badgeText = itemCount > 99 ? '99+' : itemCount;
+  const label = showCount
+    ? t('cartWithItems', { count: itemCount })
+    : t('cart');
 
   return (
     <HeaderButton
       href="/shop/cart"
       variant="icon"
       icon={ShoppingBag}
-      label={showCount ? `Cart, ${itemCount} items` : 'Cart'}
+      label={label}
       badge={showCount ? badgeText : undefined}
       badgeClassName="bg-[color:var(--accent-primary)] text-white"
     />
diff --git a/frontend/components/shop/header/nav-links.tsx b/frontend/components/shop/header/NavLinks.tsx
similarity index 79%
rename from frontend/components/shop/header/nav-links.tsx
rename to frontend/components/shop/header/NavLinks.tsx
index f86fe203..429b2c1f 100644
--- a/frontend/components/shop/header/nav-links.tsx
+++ b/frontend/components/shop/header/NavLinks.tsx
@@ -1,14 +1,14 @@
 'use client';
 
-import { useMemo } from 'react';
-import { useSearchParams } from 'next/navigation';
 import { Home } from 'lucide-react';
+import { useSearchParams } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import { useMemo } from 'react';
 
-import { usePathname } from '@/i18n/routing';
-import { cn } from '@/lib/utils';
 import { AnimatedNavLink } from '@/components/shared/AnimatedNavLink';
 import { HeaderButton } from '@/components/shared/HeaderButton';
+import { usePathname } from '@/i18n/routing';
+import { cn } from '@/lib/utils';
 
 interface NavLinksProps {
   className?: string;
@@ -36,12 +36,27 @@ export function NavLinks({
   const tProducts = useTranslations('shop.products');
   const tNav = useTranslations('shop.admin.navigation');
 
-  const navLinks = useMemo(() => [
-    { href: '/shop/products', label: tProducts('title'), slug: 'all' },
-    { href: '/shop/products?category=apparel', label: t('apparel'), slug: 'apparel' },
-    { href: '/shop/products?category=lifestyle', label: t('lifestyle'), slug: 'lifestyle' },
-    { href: '/shop/products?category=collectibles', label: t('collectibles'), slug: 'collectibles' },
-  ], [t, tProducts]);
+  const navLinks = useMemo(
+    () => [
+      { href: '/shop/products', label: tProducts('title'), slug: 'all' },
+      {
+        href: '/shop/products?category=apparel',
+        label: t('apparel'),
+        slug: 'apparel',
+      },
+      {
+        href: '/shop/products?category=lifestyle',
+        label: t('lifestyle'),
+        slug: 'lifestyle',
+      },
+      {
+        href: '/shop/products?category=collectibles',
+        label: t('collectibles'),
+        slug: 'collectibles',
+      },
+    ],
+    [t, tProducts]
+  );
 
   const computed = useMemo(() => {
     return navLinks.map(link => {
@@ -68,7 +83,7 @@ export function NavLinks({
               href="/"
               onClick={onNavigate}
               icon={Home}
-              className={cn(isHomeActive && '[color:var(--accent-primary)]')}
+              className={cn(isHomeActive && 'text-(--accent-primary)')}
             >
               {tNav('home')}
             </HeaderButton>
diff --git a/frontend/components/tests/CookieBanner.test.tsx b/frontend/components/tests/CookieBanner.test.tsx
index 998509b5..d0f5d617 100644
--- a/frontend/components/tests/CookieBanner.test.tsx
+++ b/frontend/components/tests/CookieBanner.test.tsx
@@ -1,8 +1,9 @@
 /**
  * @vitest-environment jsdom
  */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, screen, act, fireEvent } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { CookieBanner } from '@/components/shared/CookieBanner';
 
 vi.mock('next-intl', () => ({
diff --git a/frontend/components/tests/blog/blog-card.test.tsx b/frontend/components/tests/blog/blog-card.test.tsx
index 29ec1a99..826bee0e 100644
--- a/frontend/components/tests/blog/blog-card.test.tsx
+++ b/frontend/components/tests/blog/blog-card.test.tsx
@@ -1,8 +1,9 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
-import type { Author, Post } from '@/components/blog/BlogFilters';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
 import BlogCard from '@/components/blog/BlogCard';
+import type { Author, Post } from '@/components/blog/BlogFilters';
 
 vi.mock('next/image', () => ({
   __esModule: true,
@@ -11,9 +12,13 @@ vi.mock('next/image', () => ({
 
 vi.mock('next/link', () => ({
   __esModule: true,
-  default: ({ href, children }: { href: string; children: React.ReactNode }) => (
-    <a href={href}>{children}</a>
-  ),
+  default: ({
+    href,
+    children,
+  }: {
+    href: string;
+    children: React.ReactNode;
+  }) => <a href={href}>{children}</a>,
 }));
 
 vi.mock('next-intl', () => ({
@@ -48,9 +53,7 @@ describe('BlogCard', () => {
 
     const onAuthorSelect = vi.fn();
 
-    render(
-      <BlogCard post={post} onAuthorSelect={onAuthorSelect} />
-    );
+    render(<BlogCard post={post} onAuthorSelect={onAuthorSelect} />);
 
     expect(screen.getByText('Пост про співбесіду')).toBeInTheDocument();
     expect(screen.getByText('Опис поста')).toBeInTheDocument();
@@ -70,9 +73,7 @@ describe('BlogCard', () => {
 
     const onAuthorSelect = vi.fn();
 
-    render(
-      <BlogCard post={post} onAuthorSelect={onAuthorSelect} />
-    );
+    render(<BlogCard post={post} onAuthorSelect={onAuthorSelect} />);
 
     fireEvent.click(screen.getByRole('button', { name: 'Анна' }));
     expect(onAuthorSelect).toHaveBeenCalledWith(author);
diff --git a/frontend/components/tests/blog/blog-category-grid.test.tsx b/frontend/components/tests/blog/blog-category-grid.test.tsx
index ec9e4bb3..8ddec738 100644
--- a/frontend/components/tests/blog/blog-category-grid.test.tsx
+++ b/frontend/components/tests/blog/blog-category-grid.test.tsx
@@ -1,8 +1,9 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
-import type { Author, Post } from '@/components/blog/BlogFilters';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
 import { BlogCategoryGrid } from '@/components/blog/BlogCategoryGrid';
+import type { Author, Post } from '@/components/blog/BlogFilters';
 
 const pushMock = vi.fn();
 
@@ -14,11 +15,12 @@ vi.mock('@/i18n/routing', () => ({
 
 vi.mock('@/components/blog/BlogGrid', () => ({
   __esModule: true,
-  default: ({ onAuthorSelect }: { onAuthorSelect: (author: Author) => void }) => (
-    <button
-      type="button"
-      onClick={() => onAuthorSelect({ name: 'Анна' })}
-    >
+  default: ({
+    onAuthorSelect,
+  }: {
+    onAuthorSelect: (author: Author) => void;
+  }) => (
+    <button type="button" onClick={() => onAuthorSelect({ name: 'Анна' })}>
       select-author
     </button>
   ),
@@ -33,6 +35,8 @@ describe('BlogCategoryGrid', () => {
     render(<BlogCategoryGrid posts={posts} />);
 
     fireEvent.click(screen.getByText('select-author'));
-    expect(pushMock).toHaveBeenCalledWith('/blog?author=%D0%90%D0%BD%D0%BD%D0%B0');
+    expect(pushMock).toHaveBeenCalledWith(
+      '/blog?author=%D0%90%D0%BD%D0%BD%D0%B0'
+    );
   });
 });
diff --git a/frontend/components/tests/blog/blog-category-links.test.tsx b/frontend/components/tests/blog/blog-category-links.test.tsx
index fff8f846..3fdafe8d 100644
--- a/frontend/components/tests/blog/blog-category-links.test.tsx
+++ b/frontend/components/tests/blog/blog-category-links.test.tsx
@@ -1,16 +1,17 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
 import { render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
 import { BlogCategoryLinks } from '@/components/blog/BlogCategoryLinks';
 
 vi.mock('next-intl', () => ({
   useTranslations: () => (key: string) => {
     const map: Record<string, string> = {
       'categories.tech': 'Технології',
-      'categories.career': 'Кар\'єра',
+      'categories.career': "Кар'єра",
       'categories.insights': 'Інсайти',
       'categories.news': 'Новини',
-      'categories.growth': 'Кар\'єра',
+      'categories.growth': "Кар'єра",
       home: 'Головна',
     };
     return map[key] || key;
diff --git a/frontend/components/tests/blog/blog-filters.test.tsx b/frontend/components/tests/blog/blog-filters.test.tsx
index cd340651..c4b8bcd6 100644
--- a/frontend/components/tests/blog/blog-filters.test.tsx
+++ b/frontend/components/tests/blog/blog-filters.test.tsx
@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import type { Author, Post } from '@/components/blog/BlogFilters';
 import BlogFilters from '@/components/blog/BlogFilters';
 
@@ -25,7 +26,7 @@ vi.mock('next-intl', () => ({
   useTranslations: () => (key: string) => {
     const map: Record<string, string> = {
       'categories.tech': 'Технології',
-      'categories.career': 'Кар\'єра',
+      'categories.career': "Кар'єра",
       'categories.insights': 'Інсайти',
       'categories.news': 'Новини',
       author: 'Автор',
@@ -126,9 +127,7 @@ describe('BlogFilters', () => {
       expect(fetchMock).toHaveBeenCalled();
     });
 
-    expect(
-      screen.getByRole('heading', { name: 'Анна' })
-    ).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'Анна' })).toBeInTheDocument();
 
     const grid = screen.getByTestId('blog-grid');
     expect(grid).toHaveTextContent('Пост Анни');
diff --git a/frontend/components/tests/blog/blog-grid.test.tsx b/frontend/components/tests/blog/blog-grid.test.tsx
index 105844e3..ae6ef423 100644
--- a/frontend/components/tests/blog/blog-grid.test.tsx
+++ b/frontend/components/tests/blog/blog-grid.test.tsx
@@ -1,11 +1,13 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
 import { render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+
 import type { Post } from '@/components/blog/BlogFilters';
 import BlogGrid from '@/components/blog/BlogGrid';
 
 vi.mock('next-intl', () => ({
-  useTranslations: () => (key: string) => (key === 'noPosts' ? 'Статей не знайдено' : key),
+  useTranslations: () => (key: string) =>
+    key === 'noPosts' ? 'Статей не знайдено' : key,
 }));
 
 vi.mock('@/components/blog/BlogCard', () => ({
diff --git a/frontend/components/tests/blog/blog-header-search.test.tsx b/frontend/components/tests/blog/blog-header-search.test.tsx
index f8689757..53f06a99 100644
--- a/frontend/components/tests/blog/blog-header-search.test.tsx
+++ b/frontend/components/tests/blog/blog-header-search.test.tsx
@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { BlogHeaderSearch } from '@/components/blog/BlogHeaderSearch';
 
 const pushMock = vi.fn();
diff --git a/frontend/components/tests/blog/blog-nav-links.test.tsx b/frontend/components/tests/blog/blog-nav-links.test.tsx
index 40f8acbb..704ddb74 100644
--- a/frontend/components/tests/blog/blog-nav-links.test.tsx
+++ b/frontend/components/tests/blog/blog-nav-links.test.tsx
@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
 import { BlogNavLinks } from '@/components/blog/BlogNavLinks';
 
 const fetchMock = vi.fn();
diff --git a/frontend/components/tests/q&a/accordion-list.test.tsx b/frontend/components/tests/q&a/accordion-list.test.tsx
index f4e95abf..a7a3eced 100644
--- a/frontend/components/tests/q&a/accordion-list.test.tsx
+++ b/frontend/components/tests/q&a/accordion-list.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const getCachedTermsMock = vi.fn();
 
@@ -25,13 +25,9 @@ vi.mock('@/components/ui/accordion', () => ({
 
 vi.mock('@/components/q&a/CodeBlock', () => ({
   __esModule: true,
-  default: ({
-    code,
-    content,
-  }: {
-    code?: string;
-    content?: string;
-  }) => <pre data-testid="code-block">{content ?? code}</pre>,
+  default: ({ code, content }: { code?: string; content?: string }) => (
+    <pre data-testid="code-block">{content ?? code}</pre>
+  ),
 }));
 
 vi.mock('@/components/q&a/SelectableText', () => ({
@@ -82,16 +78,8 @@ vi.mock('@/components/q&a/FloatingExplainButton', () => ({
 
 vi.mock('@/components/q&a/AIWordHelper', () => ({
   __esModule: true,
-  default: ({
-    term,
-    isOpen,
-  }: {
-    term: string;
-    isOpen: boolean;
-  }) => (
-    <div data-testid="ai-helper">
-      {isOpen ? `open:${term}` : 'closed'}
-    </div>
+  default: ({ term, isOpen }: { term: string; isOpen: boolean }) => (
+    <div data-testid="ai-helper">{isOpen ? `open:${term}` : 'closed'}</div>
   ),
 }));
 
diff --git a/frontend/components/tests/q&a/ai-word-helper.test.tsx b/frontend/components/tests/q&a/ai-word-helper.test.tsx
index 130610f7..29f87597 100644
--- a/frontend/components/tests/q&a/ai-word-helper.test.tsx
+++ b/frontend/components/tests/q&a/ai-word-helper.test.tsx
@@ -1,7 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, screen, act } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import type React from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const getCachedExplanationMock = vi.fn();
 const setCachedExplanationMock = vi.fn();
@@ -28,7 +28,13 @@ vi.mock('@/i18n/routing', () => ({
 
 import AIWordHelper from '@/components/q&a/AIWordHelper';
 
-function mockFetchSequence(responses: Array<{ ok: boolean; status: number; json: () => Promise<unknown> }>) {
+function mockFetchSequence(
+  responses: Array<{
+    ok: boolean;
+    status: number;
+    json: () => Promise<unknown>;
+  }>
+) {
   const fetchMock = vi.fn();
   responses.forEach(response => {
     fetchMock.mockResolvedValueOnce(response);
@@ -56,13 +62,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="CSS"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="CSS" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('guest.title')).toBeTruthy();
   });
@@ -82,13 +82,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('Cached')).toBeTruthy();
     expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -112,13 +106,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('Hello')).toBeTruthy();
     expect(setCachedExplanationMock).toHaveBeenCalled();
@@ -138,13 +126,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('Give it a moment')).toBeTruthy();
   });
@@ -163,13 +145,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('AI is taking a nap')).toBeTruthy();
   });
@@ -197,13 +173,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('Give it a moment')).toBeTruthy();
 
@@ -234,13 +204,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('loading')).toBeTruthy();
     expect(fetchMock).toHaveBeenCalled();
@@ -268,13 +232,7 @@ describe('AIWordHelper', () => {
       },
     ]);
 
-    render(
-      <AIWordHelper
-        term="Git"
-        isOpen
-        onClose={vi.fn()}
-      />
-    );
+    render(<AIWordHelper term="Git" isOpen onClose={vi.fn()} />);
 
     expect(await screen.findByText('Missing locales')).toBeTruthy();
   });
diff --git a/frontend/components/tests/q&a/code-block.test.tsx b/frontend/components/tests/q&a/code-block.test.tsx
index a1627410..a8671c7c 100644
--- a/frontend/components/tests/q&a/code-block.test.tsx
+++ b/frontend/components/tests/q&a/code-block.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, screen, fireEvent, act } from '@testing-library/react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('next-themes', () => ({
   useTheme: () => ({ resolvedTheme: 'light' }),
@@ -16,8 +16,12 @@ vi.mock('prism-react-renderer', () => ({
       className: string;
       style: Record<string, unknown>;
       tokens: Array<Array<{ content: string; types: string[] }>>;
-      getLineProps: (args: { line: { content: string }[] }) => Record<string, unknown>;
-      getTokenProps: (args: { token: { content: string } }) => Record<string, unknown>;
+      getLineProps: (args: {
+        line: { content: string }[];
+      }) => Record<string, unknown>;
+      getTokenProps: (args: {
+        token: { content: string };
+      }) => Record<string, unknown>;
     }) => unknown;
   }) =>
     children({
@@ -57,7 +61,9 @@ describe('CodeBlock', () => {
       await Promise.resolve();
     });
 
-    const writeText = navigator.clipboard.writeText as unknown as ReturnType<typeof vi.fn>;
+    const writeText = navigator.clipboard.writeText as unknown as ReturnType<
+      typeof vi.fn
+    >;
     expect(writeText).toHaveBeenCalledWith('const a = 1;');
 
     expect(screen.getByText('Copied')).toBeTruthy();
diff --git a/frontend/components/tests/q&a/floating-explain-button.test.tsx b/frontend/components/tests/q&a/floating-explain-button.test.tsx
index 6fad0620..7eca395c 100644
--- a/frontend/components/tests/q&a/floating-explain-button.test.tsx
+++ b/frontend/components/tests/q&a/floating-explain-button.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('next-intl', () => ({
   useTranslations: () => (key: string) => key,
diff --git a/frontend/components/tests/q&a/highlight-cached-terms.test.tsx b/frontend/components/tests/q&a/highlight-cached-terms.test.tsx
index fa4a142d..fbb9bfa3 100644
--- a/frontend/components/tests/q&a/highlight-cached-terms.test.tsx
+++ b/frontend/components/tests/q&a/highlight-cached-terms.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
 
 import HighlightCachedTerms from '@/components/q&a/HighlightCachedTerms';
 
diff --git a/frontend/components/tests/q&a/pagination.test.tsx b/frontend/components/tests/q&a/pagination.test.tsx
index 9b4d4f0c..f5587e37 100644
--- a/frontend/components/tests/q&a/pagination.test.tsx
+++ b/frontend/components/tests/q&a/pagination.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('next-intl', () => ({
   useTranslations: () => (key: string, values?: { page?: number }) =>
diff --git a/frontend/components/tests/q&a/qa-section.test.tsx b/frontend/components/tests/q&a/qa-section.test.tsx
index 1ae52c2f..60faa0d7 100644
--- a/frontend/components/tests/q&a/qa-section.test.tsx
+++ b/frontend/components/tests/q&a/qa-section.test.tsx
@@ -1,7 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import type React from 'react';
+import { describe, expect, it, vi } from 'vitest';
 
 vi.mock('next-intl', () => ({
   useTranslations: () => (key: string) => key,
@@ -31,7 +31,9 @@ vi.mock('@/components/q&a/AccordionList', () => ({
 
 vi.mock('@/components/ui/tabs', () => ({
   Tabs: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  TabsList: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  TabsList: ({ children }: { children: React.ReactNode }) => (
+    <div>{children}</div>
+  ),
   TabsContent: ({ children }: { children: React.ReactNode }) => (
     <div>{children}</div>
   ),
diff --git a/frontend/components/tests/q&a/selectable-text.test.tsx b/frontend/components/tests/q&a/selectable-text.test.tsx
index 6b08933f..68621444 100644
--- a/frontend/components/tests/q&a/selectable-text.test.tsx
+++ b/frontend/components/tests/q&a/selectable-text.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render, fireEvent } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import SelectableText from '@/components/q&a/SelectableText';
 
diff --git a/frontend/components/tests/q&a/types.test.ts b/frontend/components/tests/q&a/types.test.ts
index 4d84d368..f81b7fdc 100644
--- a/frontend/components/tests/q&a/types.test.ts
+++ b/frontend/components/tests/q&a/types.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 import { qaConstants } from '@/components/q&a/types';
 
diff --git a/frontend/components/tests/q&a/use-qa-tabs.test.tsx b/frontend/components/tests/q&a/use-qa-tabs.test.tsx
index 285c76c6..da82fe87 100644
--- a/frontend/components/tests/q&a/use-qa-tabs.test.tsx
+++ b/frontend/components/tests/q&a/use-qa-tabs.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { renderHook, act, waitFor } from '@testing-library/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const routerReplace = vi.fn();
 let searchParamsValue = new URLSearchParams();
diff --git a/frontend/components/theme/ThemeProvider.tsx b/frontend/components/theme/ThemeProvider.tsx
index 1b23b473..be8ff7d1 100644
--- a/frontend/components/theme/ThemeProvider.tsx
+++ b/frontend/components/theme/ThemeProvider.tsx
@@ -1,11 +1,11 @@
-'use client'
+'use client';
 
-import * as React from 'react'
 import {
   ThemeProvider as NextThemesProvider,
   type ThemeProviderProps,
-} from 'next-themes'
+} from 'next-themes';
+import * as React from 'react';
 
 export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
-  return <NextThemesProvider {...props}>{children}</NextThemesProvider>
-}
\ No newline at end of file
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
+}
diff --git a/frontend/components/theme/ThemeToggle.tsx b/frontend/components/theme/ThemeToggle.tsx
index 515f96d4..c97e6ac8 100644
--- a/frontend/components/theme/ThemeToggle.tsx
+++ b/frontend/components/theme/ThemeToggle.tsx
@@ -1,18 +1,20 @@
 'use client';
 
-import { useTheme } from 'next-themes';
-import { Monitor, Sun, Moon } from 'lucide-react';
 import { motion } from 'framer-motion';
+import { Monitor, Moon, Sun } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import { useTheme } from 'next-themes';
 import { useEffect, useState } from 'react';
 
 const themes = [
-  { value: 'system', icon: Monitor, label: 'System theme' },
-  { value: 'light', icon: Sun, label: 'Light theme' },
-  { value: 'dark', icon: Moon, label: 'Dark theme' },
+  { value: 'system', icon: Monitor, labelKey: 'themeSystem' },
+  { value: 'light', icon: Sun, labelKey: 'themeLight' },
+  { value: 'dark', icon: Moon, labelKey: 'themeDark' },
 ] as const;
 
 export function ThemeToggle() {
   const { theme, setTheme } = useTheme();
+  const t = useTranslations('aria');
   const [mounted, setMounted] = useState(false);
 
   useEffect(() => {
@@ -36,11 +38,11 @@ export function ThemeToggle() {
 
   return (
     <div className="flex h-9 items-center gap-1 rounded-full bg-neutral-100 p-1 dark:border dark:border-neutral-800 dark:bg-neutral-950">
-      {themes.map(({ value, icon: Icon, label }) => (
+      {themes.map(({ value, icon: Icon, labelKey }) => (
         <button
           key={value}
           onClick={() => setTheme(value)}
-          aria-label={label}
+          aria-label={t(labelKey)}
           className="theme-toggle-btn relative flex h-7 w-7 items-center justify-center rounded-full"
         >
           {theme === value && (
@@ -50,7 +52,7 @@ export function ThemeToggle() {
               transition={{ type: 'spring', stiffness: 400, damping: 30 }}
             />
           )}
-          <Icon className="relative z-10 h-4 w-4 text-neutral-500 dark:text-neutral-400 transition-colors" />
+          <Icon className="relative z-10 h-4 w-4 text-neutral-500 transition-colors dark:text-neutral-400" />
         </button>
       ))}
 
diff --git a/frontend/components/ui/accordion.tsx b/frontend/components/ui/accordion.tsx
index 4a8cca46..b3cb453a 100644
--- a/frontend/components/ui/accordion.tsx
+++ b/frontend/components/ui/accordion.tsx
@@ -1,15 +1,15 @@
-"use client"
+'use client';
 
-import * as React from "react"
-import * as AccordionPrimitive from "@radix-ui/react-accordion"
-import { ChevronDownIcon } from "lucide-react"
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
+import { ChevronDownIcon } from 'lucide-react';
+import * as React from 'react';
 
-import { cn } from "@/lib/utils"
+import { cn } from '@/lib/utils';
 
 function Accordion({
   ...props
 }: React.ComponentProps<typeof AccordionPrimitive.Root>) {
-  return <AccordionPrimitive.Root data-slot="accordion" {...props} />
+  return <AccordionPrimitive.Root data-slot="accordion" {...props} />;
 }
 
 function AccordionItem({
@@ -19,10 +19,10 @@ function AccordionItem({
   return (
     <AccordionPrimitive.Item
       data-slot="accordion-item"
-      className={cn("border-b last:border-b-0", className)}
+      className={cn('border-b last:border-b-0', className)}
       {...props}
     />
-  )
+  );
 }
 
 function AccordionTrigger({
@@ -35,7 +35,7 @@ function AccordionTrigger({
       <AccordionPrimitive.Trigger
         data-slot="accordion-trigger"
         className={cn(
-          "focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180",
+          'focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180',
           className
         )}
         {...props}
@@ -44,7 +44,7 @@ function AccordionTrigger({
         <ChevronDownIcon className="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200" />
       </AccordionPrimitive.Trigger>
     </AccordionPrimitive.Header>
-  )
+  );
 }
 
 function AccordionContent({
@@ -58,9 +58,9 @@ function AccordionContent({
       className="data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm"
       {...props}
     >
-      <div className={cn("pt-0 pb-4", className)}>{children}</div>
+      <div className={cn('pt-0 pb-4', className)}>{children}</div>
     </AccordionPrimitive.Content>
-  )
+  );
 }
 
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
+export { Accordion, AccordionContent, AccordionItem, AccordionTrigger };
diff --git a/frontend/components/ui/badge.tsx b/frontend/components/ui/badge.tsx
index d2816d47..3b96841b 100644
--- a/frontend/components/ui/badge.tsx
+++ b/frontend/components/ui/badge.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { cn } from '@/lib/utils';
 
 export interface BadgeProps extends React.HTMLAttributes<HTMLSpanElement> {
@@ -11,18 +12,18 @@ const Badge = React.forwardRef<HTMLSpanElement, BadgeProps>(
       <span
         className={cn(
           'inline-flex items-center rounded-md px-2 py-0.5 text-xs font-medium',
-          
+
           variant === 'default' &&
-            'bg-gray-100 dark:bg-gray-800 text-gray-700 dark:text-gray-300',
+            'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300',
           variant === 'success' &&
-            'bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400',
+            'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400',
           variant === 'blue' &&
-            'bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-400',
+            'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
           variant === 'purple' &&
-            'bg-purple-100 dark:bg-purple-900/30 text-purple-700 dark:text-purple-400',
+            'bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400',
           variant === 'gray' &&
-            'bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-400',
-          
+            'bg-gray-100 text-gray-600 dark:bg-gray-800 dark:text-gray-400',
+
           className
         )}
         ref={ref}
diff --git a/frontend/components/ui/button.tsx b/frontend/components/ui/button.tsx
index 18117a5e..40cccaef 100644
--- a/frontend/components/ui/button.tsx
+++ b/frontend/components/ui/button.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+
 import { cn } from '@/lib/utils';
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
@@ -12,16 +13,16 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
       <button
         className={cn(
           'inline-flex items-center justify-center rounded-xl font-medium transition-colors',
-          'disabled:opacity-50 disabled:pointer-events-none',
+          'disabled:pointer-events-none disabled:opacity-50',
 
           variant === 'accent' &&
             'bg-accent text-accent-foreground hover:bg-accent/90',
           variant === 'primary' &&
             'bg-[var(--accent-primary)] text-white hover:bg-[var(--accent-hover)] active:brightness-90',
           variant === 'secondary' &&
-            'bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100 hover:bg-gray-300 dark:hover:bg-gray-700',
+            'bg-gray-200 text-gray-900 hover:bg-gray-300 dark:bg-gray-800 dark:text-gray-100 dark:hover:bg-gray-700',
           variant === 'outline' &&
-            'border border-gray-300 dark:border-gray-700 hover:bg-gray-100 dark:hover:bg-gray-800',
+            'border border-gray-300 hover:bg-gray-100 dark:border-gray-700 dark:hover:bg-gray-800',
 
           size === 'sm' && 'px-4 py-2 text-sm',
           size === 'md' && 'px-6 py-3 text-base',
diff --git a/frontend/components/ui/confirm-modal.tsx b/frontend/components/ui/confirm-modal.tsx
index 655d37ed..8a9770fb 100644
--- a/frontend/components/ui/confirm-modal.tsx
+++ b/frontend/components/ui/confirm-modal.tsx
@@ -33,26 +33,17 @@ export function ConfirmModal({
 
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center">
-      <div 
-        className="absolute inset-0 bg-black/50" 
-        onClick={onCancel}
-      />
-      <div className="relative bg-white dark:bg-neutral-900 rounded-xl p-6 max-w-sm mx-4 shadow-xl border border-gray-200 dark:border-neutral-800">
-        <h3 className="text-xl font-bold text-gray-900 dark:text-gray-100 mb-2">
+      <div className="absolute inset-0 bg-black/50" onClick={onCancel} />
+      <div className="relative mx-4 max-w-sm rounded-xl border border-gray-200 bg-white p-6 shadow-xl dark:border-neutral-800 dark:bg-neutral-900">
+        <h3 className="mb-2 text-xl font-bold text-gray-900 dark:text-gray-100">
           {title}
         </h3>
-        <p className="text-gray-600 dark:text-gray-400 mb-6">
-          {message}
-        </p>
+        <p className="mb-6 text-gray-600 dark:text-gray-400">{message}</p>
         <div className="flex gap-3">
-          <Button 
-            variant="outline" 
-            onClick={onCancel}
-            className="flex-1"
-          >
+          <Button variant="outline" onClick={onCancel} className="flex-1">
             {cancelText}
           </Button>
-          <Button 
+          <Button
             onClick={onConfirm}
             className={`flex-1 ${confirmButtonClass}`}
           >
diff --git a/frontend/components/ui/gradient-badge.tsx b/frontend/components/ui/gradient-badge.tsx
index 8780c377..91daa68a 100644
--- a/frontend/components/ui/gradient-badge.tsx
+++ b/frontend/components/ui/gradient-badge.tsx
@@ -1,22 +1,22 @@
-import { LucideIcon } from "lucide-react"
+import { LucideIcon } from 'lucide-react';
 
 interface GradientBadgeProps {
-  icon?: LucideIcon
-  text: string
-  className?: string
+  icon?: LucideIcon;
+  text: string;
+  className?: string;
 }
 
-export function GradientBadge({ icon: Icon, text, className = "" }: GradientBadgeProps) {
+export function GradientBadge({
+  icon: Icon,
+  text,
+  className = '',
+}: GradientBadgeProps) {
   return (
-    <div 
-      className={`inline-flex items-center gap-2 px-3 py-1 rounded-full 
-        border border-[#1e5eff]/20 dark:border-[#ff2d55]/20 
-        bg-[#1e5eff]/10 dark:bg-[#ff2d55]/10 
-        text-[#1e5eff] dark:text-[#ff2d55] 
-        text-[10px] font-bold uppercase tracking-widest ${className}`}
+    <div
+      className={`inline-flex items-center gap-2 rounded-full border border-[#1e5eff]/20 bg-[#1e5eff]/10 px-3 py-1 text-[10px] font-bold tracking-widest text-[#1e5eff] uppercase dark:border-[#ff2d55]/20 dark:bg-[#ff2d55]/10 dark:text-[#ff2d55] ${className}`}
     >
       {Icon && <Icon size={12} aria-hidden="true" />}
       {text}
     </div>
-  )
+  );
 }
diff --git a/frontend/components/ui/radio-group.tsx b/frontend/components/ui/radio-group.tsx
index 8f441460..1585def6 100644
--- a/frontend/components/ui/radio-group.tsx
+++ b/frontend/components/ui/radio-group.tsx
@@ -1,46 +1,46 @@
- 'use client';
+'use client';
 
-  import * as React from 'react';
-  import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
+import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
+import * as React from 'react';
 
-  import { cn } from '@/lib/utils';
+import { cn } from '@/lib/utils';
 
-  const RadioGroup = React.forwardRef<
-    React.ElementRef<typeof RadioGroupPrimitive.Root>,
-    React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
-  >(({ className, ...props }, ref) => {
-    return (
-      <RadioGroupPrimitive.Root
-        className={cn('flex flex-col gap-2', className)}
-        {...props}
-        ref={ref}
-      />
-    );
-  });
-  RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
+const RadioGroup = React.forwardRef<
+  React.ElementRef<typeof RadioGroupPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
+>(({ className, ...props }, ref) => {
+  return (
+    <RadioGroupPrimitive.Root
+      className={cn('flex flex-col gap-2', className)}
+      {...props}
+      ref={ref}
+    />
+  );
+});
+RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
 
-  const RadioGroupItem = React.forwardRef<
-    React.ElementRef<typeof RadioGroupPrimitive.Item>,
-    React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
-  >(({ className, ...props }, ref) => {
-    return (
-      <RadioGroupPrimitive.Item
-        ref={ref}
-        className={cn(
-          'aspect-square h-5 w-5 rounded-full border border-gray-300',
-          'focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2',
-          'disabled:cursor-not-allowed disabled:opacity-50',
-          'data-[state=checked]:border-blue-600 data-[state=checked]:bg-blue-600',
-          className
-        )}
-        {...props}
-      >
-        <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
-          <div className="h-2 w-2 rounded-full bg-white" />
-        </RadioGroupPrimitive.Indicator>
-      </RadioGroupPrimitive.Item>
-    );
-  });
-  RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
+const RadioGroupItem = React.forwardRef<
+  React.ElementRef<typeof RadioGroupPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
+>(({ className, ...props }, ref) => {
+  return (
+    <RadioGroupPrimitive.Item
+      ref={ref}
+      className={cn(
+        'aspect-square h-5 w-5 rounded-full border border-gray-300',
+        'focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2',
+        'disabled:cursor-not-allowed disabled:opacity-50',
+        'data-[state=checked]:border-blue-600 data-[state=checked]:bg-blue-600',
+        className
+      )}
+      {...props}
+    >
+      <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
+        <div className="h-2 w-2 rounded-full bg-white" />
+      </RadioGroupPrimitive.Indicator>
+    </RadioGroupPrimitive.Item>
+  );
+});
+RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
 
-  export { RadioGroup, RadioGroupItem };
\ No newline at end of file
+export { RadioGroup, RadioGroupItem };
diff --git a/frontend/components/ui/section-heading.tsx b/frontend/components/ui/section-heading.tsx
index c3719324..36af776d 100644
--- a/frontend/components/ui/section-heading.tsx
+++ b/frontend/components/ui/section-heading.tsx
@@ -1,25 +1,38 @@
 interface SectionHeadingProps {
-  title: string
-  highlight?: string
-  subtitle?: string
-  align?: "left" | "center"
-  className?: string
+  title: string;
+  highlight?: string;
+  subtitle?: string;
+  align?: 'left' | 'center';
+  className?: string;
 }
 
-export function SectionHeading({ title, highlight, subtitle, align = "center", className = "" }: SectionHeadingProps) {
+export function SectionHeading({
+  title,
+  highlight,
+  subtitle,
+  align = 'center',
+  className = '',
+}: SectionHeadingProps) {
   return (
-    <div className={`mb-12 ${align === "center" ? "text-center mx-auto" : ""} max-w-3xl ${className}`}>
-      <h2 className="text-4xl md:text-5xl lg:text-6xl font-black mb-6 tracking-tight text-gray-900 dark:text-white leading-[1.1]">
-        {title} 
+    <div
+      className={`mb-12 ${align === 'center' ? 'mx-auto text-center' : ''} max-w-3xl ${className}`}
+    >
+      <h2 className="mb-6 text-4xl leading-[1.1] font-black tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white">
+        {title}
         {highlight && (
-          <> <span className="text-transparent bg-clip-text bg-gradient-to-r from-[#1e5eff] via-[#1e5eff]/70 to-[#1e5eff] dark:from-[#ff2d55] dark:via-[#ff2d55]/70 dark:to-[#ff2d55] bg-[length:200%_auto] animate-gradient">{highlight}</span></>
+          <>
+            {' '}
+            <span className="animate-gradient bg-gradient-to-r from-[#1e5eff] via-[#1e5eff]/70 to-[#1e5eff] bg-[length:200%_auto] bg-clip-text text-transparent dark:from-[#ff2d55] dark:via-[#ff2d55]/70 dark:to-[#ff2d55]">
+              {highlight}
+            </span>
+          </>
         )}
       </h2>
       {subtitle && (
-        <p className="text-lg md:text-xl text-gray-700 dark:text-neutral-300 font-light leading-relaxed max-w-2xl mx-auto">
+        <p className="mx-auto max-w-2xl text-lg leading-relaxed font-light text-gray-700 md:text-xl dark:text-neutral-300">
           {subtitle}
         </p>
       )}
     </div>
-  )
+  );
 }
diff --git a/frontend/components/ui/tabs.tsx b/frontend/components/ui/tabs.tsx
index 497ba5ea..ce098ebf 100644
--- a/frontend/components/ui/tabs.tsx
+++ b/frontend/components/ui/tabs.tsx
@@ -1,9 +1,9 @@
-"use client"
+'use client';
 
-import * as React from "react"
-import * as TabsPrimitive from "@radix-ui/react-tabs"
+import * as TabsPrimitive from '@radix-ui/react-tabs';
+import * as React from 'react';
 
-import { cn } from "@/lib/utils"
+import { cn } from '@/lib/utils';
 
 function Tabs({
   className,
@@ -12,10 +12,10 @@ function Tabs({
   return (
     <TabsPrimitive.Root
       data-slot="tabs"
-      className={cn("flex flex-col gap-2", className)}
+      className={cn('flex flex-col gap-2', className)}
       {...props}
     />
-  )
+  );
 }
 
 function TabsList({
@@ -26,12 +26,12 @@ function TabsList({
     <TabsPrimitive.List
       data-slot="tabs-list"
       className={cn(
-        "bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]",
+        'bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]',
         className
       )}
       {...props}
     />
-  )
+  );
 }
 
 function TabsTrigger({
@@ -47,7 +47,7 @@ function TabsTrigger({
       )}
       {...props}
     />
-  )
+  );
 }
 
 function TabsContent({
@@ -57,10 +57,10 @@ function TabsContent({
   return (
     <TabsPrimitive.Content
       data-slot="tabs-content"
-      className={cn("flex-1 outline-none", className)}
+      className={cn('flex-1 outline-none', className)}
       {...props}
     />
-  )
+  );
 }
 
-export { Tabs, TabsList, TabsTrigger, TabsContent }
+export { Tabs, TabsContent, TabsList, TabsTrigger };
diff --git a/frontend/data/about.ts b/frontend/data/about.ts
index 3f4ed008..af4b9785 100644
--- a/frontend/data/about.ts
+++ b/frontend/data/about.ts
@@ -1,145 +1,158 @@
-import { Twitter, Linkedin, Github } from "lucide-react"
+import { Github, Linkedin, Twitter } from 'lucide-react';
 
 export const TESTIMONIALS = [
-    {
-        name: "Alex Chen",
-        role: "Frontend @ Meta",
-        avatar: "AC",
-        content: "Cheap therapy for React devs.",
-        platform: "Twitter",
-        icon: Twitter,
-        color: "text-sky-500 bg-sky-500/10"
-    },
-    {
-        name: "Sarah J.",
-        role: "Senior SWE @ Google",
-        avatar: "SJ",
-        content: "Harder than my actual interview. 10/10.",
-        platform: "LinkedIn",
-        icon: Linkedin,
-        color: "text-blue-600 bg-blue-600/10"
-    },
-    {
-        name: "git_push_force",
-        role: "Open Source Contributor",
-        avatar: "GP",
-        content: "Found a bug in the quiz, reported it, got points. Now I'm addicted to fixing your typos.",
-        platform: "GitHub",
-        icon: Github,
-        color: "text-gray-900 dark:text-white bg-gray-500/10"
-    },
-    {
-        name: "Emily Park",
-        role: "Full Stack @ Vercel",
-        avatar: "EP",
-        content: "This is the only place where 'centering a div' is explained like I'm 5. Bless you.",
-        platform: "Twitter",
-        icon: Twitter,
-        color: "text-sky-500 bg-sky-500/10"
-    },
-    {
-        name: "David Kim",
-        role: "Staff Engineer @ Netflix",
-        avatar: "DK",
-        content: "I use the Q&A section to win arguments with my juniors. Don't tell them.",
-        platform: "LinkedIn",
-        icon: Linkedin,
-        color: "text-blue-600 bg-blue-600/10"
-    },
-]
+  {
+    name: 'Alex Chen',
+    role: 'Frontend @ Meta',
+    avatar: 'AC',
+    content: 'Cheap therapy for React devs.',
+    platform: 'Twitter',
+    icon: Twitter,
+    color: 'text-sky-500 bg-sky-500/10',
+  },
+  {
+    name: 'Sarah J.',
+    role: 'Senior SWE @ Google',
+    avatar: 'SJ',
+    content: 'Harder than my actual interview. 10/10.',
+    platform: 'LinkedIn',
+    icon: Linkedin,
+    color: 'text-blue-600 bg-blue-600/10',
+  },
+  {
+    name: 'git_push_force',
+    role: 'Open Source Contributor',
+    avatar: 'GP',
+    content:
+      "Found a bug in the quiz, reported it, got points. Now I'm addicted to fixing your typos.",
+    platform: 'GitHub',
+    icon: Github,
+    color: 'text-gray-900 dark:text-white bg-gray-500/10',
+  },
+  {
+    name: 'Emily Park',
+    role: 'Full Stack @ Vercel',
+    avatar: 'EP',
+    content:
+      "This is the only place where 'centering a div' is explained like I'm 5. Bless you.",
+    platform: 'Twitter',
+    icon: Twitter,
+    color: 'text-sky-500 bg-sky-500/10',
+  },
+  {
+    name: 'David Kim',
+    role: 'Staff Engineer @ Netflix',
+    avatar: 'DK',
+    content:
+      "I use the Q&A section to win arguments with my juniors. Don't tell them.",
+    platform: 'LinkedIn',
+    icon: Linkedin,
+    color: 'text-blue-600 bg-blue-600/10',
+  },
+];
 
 export const TOPICS = [
-    {
-        id: "git",
-        name: "Git & Version Control",
-        questions: "90+ Questions",
-        icon: "/icons/git.svg",
-        color: "group-hover:border-[#F05032]/50 dark:group-hover:border-[#F05032]/50 group-hover:bg-[#F05032]/10",
-        glow: "bg-[#F05032]",
-        href: "/q&a"
-    },
-    {
-        id: "html",
-        name: "HTML5 & Semantic",
-        questions: "120+ Questions",
-        icon: "/icons/html5.svg",
-        color: "group-hover:border-[#E34F26]/50 dark:group-hover:border-[#E34F26]/50 group-hover:bg-[#E34F26]/10",
-        glow: "bg-[#E34F26]",
-        href: "/q&a/?category=html"
-    },
-    {
-        id: "css",
-        name: "CSS3 & Responsive",
-        questions: "180+ Questions",
-        icon: "/icons/css3.svg",
-        color: "group-hover:border-[#663399]/50 dark:group-hover:border-[#663399]/50 group-hover:bg-[#663399]/10",
-        glow: "bg-[#663399]",
-        href: "/q&a/?category=css"
-    },
-    {
-        id: "js",
-        name: "JavaScript (ES6+)",
-        questions: "450+ Questions",
-        icon: "/icons/javascript.svg",
-        color: "group-hover:border-[#F7DF1E]/50 dark:group-hover:border-[#F7DF1E]/50 group-hover:bg-[#F7DF1E]/10",
-        glow: "bg-[#F7DF1E]",
-        href: "/q&a/?category=javascript"
-    },
-    {
-        id: "ts",
-        name: "TypeScript",
-        questions: "210+ Questions",
-        icon: "/icons/typescript.svg",
-        color: "group-hover:border-[#3178C6]/50 dark:group-hover:border-[#3178C6]/50 group-hover:bg-[#3178C6]/10",
-        glow: "bg-[#3178C6]",
-        href: "/q&a/?category=typescript"
-    },
-    {
-        id: "react",
-        name: "React.js Ecosystem",
-        questions: "320+ Questions",
-        icon: "/icons/react.svg",
-        color: "group-hover:border-[#61DAFB]/50 dark:group-hover:border-[#61DAFB]/50 group-hover:bg-[#61DAFB]/10",
-        glow: "bg-[#61DAFB]",
-        href: "/q&a/?category=react"
-    },
-    {
-        id: "next",
-        name: "Next.js & SSR",
-        questions: "140+ Questions",
-        icon: "/icons/nextjs.svg",
-        color: "group-hover:border-black/50 dark:group-hover:border-white/50 group-hover:bg-black/5 dark:group-hover:bg-white/10",
-        glow: "bg-black dark:bg-white",
-        href: "/q&a/?category=next"
-    },
-    {
-        id: "vue",
-        name: "Vue.js",
-        questions: "110+ Questions",
-        icon: "/icons/vuejs.svg",
-        color: "group-hover:border-[#4FC08D]/50 dark:group-hover:border-[#4FC08D]/50 group-hover:bg-[#4FC08D]/10",
-        glow: "bg-[#4FC08D]",
-        href: "/q&a/?category=vue"
-    },
-    {
-        id: "angular",
-        name: "Angular",
-        questions: "95+ Questions",
-        icon: "/icons/angular.svg",
-        color: "group-hover:border-[#DD0031]/50 dark:group-hover:border-[#DD0031]/50 group-hover:bg-[#DD0031]/10",
-        glow: "bg-[#DD0031]",
-        href: "/q&a/?category=angular"
-    },
-    {
-        id: "node",
-        name: "Node.js & Backend",
-        questions: "150+ Questions",
-        icon: "/icons/nodejs.svg",
-        color: "group-hover:border-[#339933]/50 dark:group-hover:border-[#339933]/50 group-hover:bg-[#339933]/10",
-        glow: "bg-[#339933]",
-        href: "/q&a/?category=node"
-    },
-]
+  {
+    id: 'git',
+    name: 'Git & Version Control',
+    questions: '90+ Questions',
+    icon: '/icons/git.svg',
+    color:
+      'group-hover:border-[#F05032]/50 dark:group-hover:border-[#F05032]/50 group-hover:bg-[#F05032]/10',
+    glow: 'bg-[#F05032]',
+    href: '/q&a',
+  },
+  {
+    id: 'html',
+    name: 'HTML5 & Semantic',
+    questions: '120+ Questions',
+    icon: '/icons/html5.svg',
+    color:
+      'group-hover:border-[#E34F26]/50 dark:group-hover:border-[#E34F26]/50 group-hover:bg-[#E34F26]/10',
+    glow: 'bg-[#E34F26]',
+    href: '/q&a/?category=html',
+  },
+  {
+    id: 'css',
+    name: 'CSS3 & Responsive',
+    questions: '180+ Questions',
+    icon: '/icons/css3.svg',
+    color:
+      'group-hover:border-[#663399]/50 dark:group-hover:border-[#663399]/50 group-hover:bg-[#663399]/10',
+    glow: 'bg-[#663399]',
+    href: '/q&a/?category=css',
+  },
+  {
+    id: 'js',
+    name: 'JavaScript (ES6+)',
+    questions: '450+ Questions',
+    icon: '/icons/javascript.svg',
+    color:
+      'group-hover:border-[#F7DF1E]/50 dark:group-hover:border-[#F7DF1E]/50 group-hover:bg-[#F7DF1E]/10',
+    glow: 'bg-[#F7DF1E]',
+    href: '/q&a/?category=javascript',
+  },
+  {
+    id: 'ts',
+    name: 'TypeScript',
+    questions: '210+ Questions',
+    icon: '/icons/typescript.svg',
+    color:
+      'group-hover:border-[#3178C6]/50 dark:group-hover:border-[#3178C6]/50 group-hover:bg-[#3178C6]/10',
+    glow: 'bg-[#3178C6]',
+    href: '/q&a/?category=typescript',
+  },
+  {
+    id: 'react',
+    name: 'React.js Ecosystem',
+    questions: '320+ Questions',
+    icon: '/icons/react.svg',
+    color:
+      'group-hover:border-[#61DAFB]/50 dark:group-hover:border-[#61DAFB]/50 group-hover:bg-[#61DAFB]/10',
+    glow: 'bg-[#61DAFB]',
+    href: '/q&a/?category=react',
+  },
+  {
+    id: 'next',
+    name: 'Next.js & SSR',
+    questions: '140+ Questions',
+    icon: '/icons/nextjs.svg',
+    color:
+      'group-hover:border-black/50 dark:group-hover:border-white/50 group-hover:bg-black/5 dark:group-hover:bg-white/10',
+    glow: 'bg-black dark:bg-white',
+    href: '/q&a/?category=next',
+  },
+  {
+    id: 'vue',
+    name: 'Vue.js',
+    questions: '110+ Questions',
+    icon: '/icons/vuejs.svg',
+    color:
+      'group-hover:border-[#4FC08D]/50 dark:group-hover:border-[#4FC08D]/50 group-hover:bg-[#4FC08D]/10',
+    glow: 'bg-[#4FC08D]',
+    href: '/q&a/?category=vue',
+  },
+  {
+    id: 'angular',
+    name: 'Angular',
+    questions: '95+ Questions',
+    icon: '/icons/angular.svg',
+    color:
+      'group-hover:border-[#DD0031]/50 dark:group-hover:border-[#DD0031]/50 group-hover:bg-[#DD0031]/10',
+    glow: 'bg-[#DD0031]',
+    href: '/q&a/?category=angular',
+  },
+  {
+    id: 'node',
+    name: 'Node.js & Backend',
+    questions: '150+ Questions',
+    icon: '/icons/nodejs.svg',
+    color:
+      'group-hover:border-[#339933]/50 dark:group-hover:border-[#339933]/50 group-hover:bg-[#339933]/10',
+    glow: 'bg-[#339933]',
+    href: '/q&a/?category=node',
+  },
+];
 
-export type Topic = typeof TOPICS[number];
-export type Testimonial = typeof TESTIMONIALS[number];
\ No newline at end of file
+export type Topic = (typeof TOPICS)[number];
+export type Testimonial = (typeof TESTIMONIALS)[number];
diff --git a/frontend/db/index.ts b/frontend/db/index.ts
index d65a6114..40058b68 100644
--- a/frontend/db/index.ts
+++ b/frontend/db/index.ts
@@ -1,15 +1,15 @@
-import { Pool } from 'pg';
 import { neon } from '@neondatabase/serverless';
-import { drizzle as drizzlePg } from 'drizzle-orm/node-postgres';
+import * as dotenv from 'dotenv';
 import { drizzle as drizzleNeon } from 'drizzle-orm/neon-http';
+import { drizzle as drizzlePg } from 'drizzle-orm/node-postgres';
 import type { PgDatabase, PgQueryResultHKT } from 'drizzle-orm/pg-core';
-import * as dotenv from 'dotenv';
+import { Pool } from 'pg';
 
 import * as schema from './schema';
 
 dotenv.config();
 
-type AppDatabase = PgDatabase<PgQueryResultHKT, typeof schema>
+type AppDatabase = PgDatabase<PgQueryResultHKT, typeof schema>;
 
 const APP_ENV = process.env.APP_ENV ?? 'local';
 
@@ -19,9 +19,7 @@ if (APP_ENV === 'local') {
   const url = process.env.DATABASE_URL_LOCAL;
 
   if (!url) {
-    throw new Error(
-      '[db] APP_ENV=local requires DATABASE_URL_LOCAL to be set'
-    );
+    throw new Error('[db] APP_ENV=local requires DATABASE_URL_LOCAL to be set');
   }
 
   const pool = new Pool({
@@ -37,9 +35,7 @@ if (APP_ENV === 'local') {
   const url = process.env.DATABASE_URL;
 
   if (!url) {
-    throw new Error(
-      `[db] APP_ENV=${APP_ENV} requires DATABASE_URL to be set`
-    );
+    throw new Error(`[db] APP_ENV=${APP_ENV} requires DATABASE_URL to be set`);
   }
 
   const sql = neon(url);
@@ -51,4 +47,4 @@ if (APP_ENV === 'local') {
   }
 }
 
-export { db };
\ No newline at end of file
+export { db };
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0000_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0000_snapshot.json
index ed149c60..e944da8f 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0000_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0000_snapshot.json
@@ -28,9 +28,7 @@
         "categories_name_unique": {
           "name": "categories_name_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "name"
-          ]
+          "columns": ["name"]
         }
       },
       "policies": {},
@@ -72,12 +70,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -117,12 +111,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -130,10 +120,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -200,12 +187,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -281,12 +264,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -294,12 +273,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -307,12 +282,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -475,12 +446,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -526,12 +493,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -539,10 +502,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -622,12 +582,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -673,12 +629,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -686,10 +638,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -769,10 +718,7 @@
         "quizzes_topic_id_slug_unique": {
           "name": "quizzes_topic_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "topic_id",
-            "slug"
-          ]
+          "columns": ["topic_id", "slug"]
         }
       },
       "policies": {},
@@ -849,9 +795,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -916,12 +860,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -944,4 +884,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0001_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0001_snapshot.json
index da453ae3..aca5a592 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0001_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0001_snapshot.json
@@ -28,9 +28,7 @@
         "categories_name_unique": {
           "name": "categories_name_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "name"
-          ]
+          "columns": ["name"]
         }
       },
       "policies": {},
@@ -72,12 +70,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -117,12 +111,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -130,10 +120,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -200,12 +187,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -281,12 +264,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -294,12 +273,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -307,12 +282,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -475,12 +446,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -526,12 +493,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -539,10 +502,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -622,12 +582,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -673,12 +629,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -686,10 +638,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -769,10 +718,7 @@
         "quizzes_topic_id_slug_unique": {
           "name": "quizzes_topic_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "topic_id",
-            "slug"
-          ]
+          "columns": ["topic_id", "slug"]
         }
       },
       "policies": {},
@@ -849,9 +795,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -916,12 +860,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -998,12 +938,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1011,12 +947,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1161,9 +1093,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1419,12 +1349,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1440,29 +1366,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD"
-      ]
+      "values": ["USD"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1475,4 +1389,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0002_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0002_snapshot.json
index b13a1b1d..c002e157 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0002_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0002_snapshot.json
@@ -28,9 +28,7 @@
         "categories_name_unique": {
           "name": "categories_name_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "name"
-          ]
+          "columns": ["name"]
         }
       },
       "policies": {},
@@ -72,12 +70,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -117,12 +111,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -130,10 +120,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -200,12 +187,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -281,12 +264,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -294,12 +273,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -307,12 +282,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -475,12 +446,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -526,12 +493,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -539,10 +502,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -622,12 +582,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -673,12 +629,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -686,10 +638,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -769,10 +718,7 @@
         "quizzes_topic_id_slug_unique": {
           "name": "quizzes_topic_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "topic_id",
-            "slug"
-          ]
+          "columns": ["topic_id", "slug"]
         }
       },
       "policies": {},
@@ -849,9 +795,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -916,12 +860,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -998,12 +938,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1011,12 +947,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1161,9 +1093,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1419,12 +1349,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1440,29 +1366,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD"
-      ]
+      "values": ["USD"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1475,4 +1389,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0003_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0003_snapshot.json
index 528dd51d..ac15afe5 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0003_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0003_snapshot.json
@@ -28,9 +28,7 @@
         "categories_name_unique": {
           "name": "categories_name_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "name"
-          ]
+          "columns": ["name"]
         }
       },
       "policies": {},
@@ -72,12 +70,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -117,12 +111,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -130,10 +120,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -200,12 +187,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -281,12 +264,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -294,12 +273,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -307,12 +282,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -475,12 +446,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -526,12 +493,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -539,10 +502,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -622,12 +582,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -673,12 +629,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -686,10 +638,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -769,10 +718,7 @@
         "quizzes_topic_id_slug_unique": {
           "name": "quizzes_topic_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "topic_id",
-            "slug"
-          ]
+          "columns": ["topic_id", "slug"]
         }
       },
       "policies": {},
@@ -849,9 +795,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -916,12 +860,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -998,12 +938,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1011,12 +947,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1144,12 +1076,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1159,9 +1087,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1417,12 +1343,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1438,29 +1360,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD"
-      ]
+      "values": ["USD"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1473,4 +1383,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0004_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0004_snapshot.json
index 660937d8..677435a1 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0004_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0004_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -216,12 +200,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -261,12 +241,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -274,10 +250,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -344,12 +317,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -425,12 +394,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -438,12 +403,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -451,12 +412,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -619,12 +576,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -670,12 +623,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -683,10 +632,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -766,12 +712,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -817,12 +759,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -830,10 +768,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -913,10 +848,7 @@
         "quizzes_topic_id_slug_unique": {
           "name": "quizzes_topic_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "topic_id",
-            "slug"
-          ]
+          "columns": ["topic_id", "slug"]
         }
       },
       "policies": {},
@@ -993,9 +925,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1060,12 +990,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1142,12 +1068,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1155,12 +1077,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1288,12 +1206,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1303,9 +1217,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1561,12 +1473,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1582,29 +1490,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD"
-      ]
+      "values": ["USD"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1617,4 +1513,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0005_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0005_snapshot.json
index fd616c60..04f2ca2f 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0005_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0005_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -216,12 +200,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -261,12 +241,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -274,10 +250,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -344,12 +317,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -425,12 +394,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -438,12 +403,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -451,12 +412,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -619,12 +576,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -670,12 +623,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -683,10 +632,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -766,12 +712,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -817,12 +759,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -830,10 +768,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -912,12 +847,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -927,10 +858,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1007,9 +935,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1074,12 +1000,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1156,12 +1078,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1169,12 +1087,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1302,12 +1216,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1317,9 +1227,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1575,12 +1483,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1596,29 +1500,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD"
-      ]
+      "values": ["USD"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1631,4 +1523,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0006_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0006_snapshot.json
index fa070a9c..484026eb 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0006_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0006_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -216,12 +200,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -261,12 +241,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -274,10 +250,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -344,12 +317,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -425,12 +394,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -438,12 +403,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -451,12 +412,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -619,12 +576,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -670,12 +623,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -683,10 +632,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -766,12 +712,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -817,12 +759,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -830,10 +768,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -912,12 +847,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -927,10 +858,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1007,9 +935,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1074,12 +1000,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1168,12 +1090,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1181,12 +1099,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1320,12 +1234,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1335,9 +1245,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1444,12 +1352,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1713,12 +1617,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1734,30 +1634,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1770,4 +1657,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0007_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0007_snapshot.json
index 40c6db14..4ee10ec3 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0007_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0007_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -216,12 +200,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -261,12 +241,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -274,10 +250,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -344,12 +317,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -425,12 +394,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -438,12 +403,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -451,12 +412,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -619,12 +576,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -670,12 +623,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -683,10 +632,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -766,12 +712,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -817,12 +759,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -830,10 +768,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -912,12 +847,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -927,10 +858,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1007,9 +935,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1074,12 +1000,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1168,12 +1090,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1181,12 +1099,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1337,12 +1251,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1352,9 +1262,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1465,12 +1373,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1734,12 +1638,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1755,30 +1655,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1791,4 +1678,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0008_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0008_snapshot.json
index a44bfd4c..5920f951 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0008_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0008_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -216,12 +200,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -261,12 +241,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -274,10 +250,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -344,12 +317,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -425,12 +394,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -438,12 +403,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -451,12 +412,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -619,12 +576,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -670,12 +623,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -683,10 +632,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -766,12 +712,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -817,12 +759,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -830,10 +768,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -912,12 +847,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -927,10 +858,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1020,9 +948,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1087,12 +1013,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1181,12 +1103,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1194,12 +1112,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1350,12 +1264,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1365,9 +1275,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1478,12 +1386,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1747,12 +1651,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1768,30 +1668,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1804,4 +1691,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0009_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0009_snapshot.json
index 263bc713..7cedd36b 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0009_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0009_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -671,12 +628,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -722,12 +675,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -735,10 +684,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -818,12 +764,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -869,12 +811,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -882,10 +820,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -980,12 +915,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -995,10 +926,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1110,9 +1038,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1177,12 +1103,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1287,12 +1209,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1300,12 +1218,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1464,12 +1378,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1479,9 +1389,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1615,12 +1523,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1908,12 +1812,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1929,30 +1829,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1965,4 +1852,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0010_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0010_snapshot.json
index 1822de6a..89514e67 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0010_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0010_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -648,12 +605,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -699,12 +652,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -712,10 +661,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -795,12 +741,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -846,12 +788,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -859,10 +797,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -957,12 +892,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -972,10 +903,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1080,9 +1008,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1163,12 +1089,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1273,12 +1195,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1286,12 +1204,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1450,12 +1364,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1465,9 +1375,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1601,12 +1509,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1894,12 +1798,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1915,30 +1815,17 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -1951,4 +1838,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0012_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0012_snapshot.json
index 810e0aa1..15d962e7 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0012_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0012_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -648,12 +605,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -699,12 +652,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -712,10 +661,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -795,12 +741,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -846,12 +788,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -859,10 +797,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -957,12 +892,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -972,10 +903,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1080,9 +1008,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1163,12 +1089,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1281,12 +1203,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1294,12 +1212,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1456,12 +1370,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1469,12 +1379,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1707,12 +1613,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1722,9 +1624,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1862,12 +1762,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2155,12 +2051,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2176,18 +2068,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2215,22 +2101,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2243,4 +2119,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0013_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0013_snapshot.json
index 2b0a460f..6a4826e2 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0013_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0013_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1943,12 +1839,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2242,12 +2134,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2317,18 +2205,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2356,22 +2238,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2384,4 +2256,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0014_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0014_snapshot.json
index 80625ee3..e76583f5 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0014_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0014_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1943,12 +1839,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2242,12 +2134,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2263,18 +2151,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2302,22 +2184,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2330,4 +2202,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/0015_snapshot.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/0015_snapshot.json
index e54330d5..c987ed46 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/0015_snapshot.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/0015_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -80,13 +78,9 @@
         "category_translations_category_id_categories_id_fk": {
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
-          "columnsFrom": [
-            "category_id"
-          ],
+          "columnsFrom": ["category_id"],
           "tableTo": "categories",
-          "columnsTo": [
-            "id"
-          ],
+          "columnsTo": ["id"],
           "onUpdate": "no action",
           "onDelete": "cascade"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -139,13 +130,9 @@
         "question_translations_question_id_questions_id_fk": {
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
-          "columnsFrom": [
-            "question_id"
-          ],
+          "columnsFrom": ["question_id"],
           "tableTo": "questions",
-          "columnsTo": [
-            "id"
-          ],
+          "columnsTo": ["id"],
           "onUpdate": "no action",
           "onDelete": "cascade"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -237,13 +221,9 @@
         "questions_category_id_categories_id_fk": {
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
-          "columnsFrom": [
-            "category_id"
-          ],
+          "columnsFrom": ["category_id"],
           "tableTo": "categories",
-          "columnsTo": [
-            "id"
-          ],
+          "columnsTo": ["id"],
           "onUpdate": "no action",
           "onDelete": "restrict"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -648,12 +605,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -699,12 +652,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -712,10 +661,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -795,12 +741,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -846,12 +788,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -859,10 +797,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -957,12 +892,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -972,10 +903,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1080,9 +1008,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1163,12 +1089,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1319,12 +1241,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1332,12 +1250,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1494,12 +1408,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1507,12 +1417,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1745,12 +1651,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1760,9 +1662,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1900,12 +1800,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2199,12 +2095,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2328,18 +2220,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2367,22 +2253,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2395,4 +2271,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/meta/_journal.json b/frontend/db/legacy-migrations/drizzle_legacy/meta/_journal.json
index 11bef9c3..50917f5c 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/meta/_journal.json
+++ b/frontend/db/legacy-migrations/drizzle_legacy/meta/_journal.json
@@ -96,27 +96,8 @@
     {
       "idx": 13,
       "version": "7",
-<<<<<<< HEAD
       "when": 1768162667947,
       "tag": "0013_brown_gamora",
-=======
-      "when": 1767697281389,
-      "tag": "0013_low_roughhouse",
-      "breakpoints": true
-    },
-    {
-      "idx": 14,
-      "version": "7",
-      "when": 1768045270184,
-      "tag": "0014_dapper_kang",
-      "breakpoints": true
-    },
-    {
-      "idx": 15,
-      "version": "7",
-      "when": 1768166276337,
-      "tag": "0015_glamorous_eternity",
->>>>>>> b30415e (feat(auth): add email verification, password reset, and improved auth UX)
       "breakpoints": true
     },
     {
@@ -127,4 +108,4 @@
       "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/relations.ts b/frontend/db/legacy-migrations/drizzle_legacy/relations.ts
index 8733c36a..48e7b5f1 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/relations.ts
+++ b/frontend/db/legacy-migrations/drizzle_legacy/relations.ts
@@ -1,162 +1,207 @@
-import { relations } from "drizzle-orm/relations";
-import { users, orders, quizzes, quizQuestions, pointTransactions, products, productPrices, categories, questions, quizAnswers, orderItems, quizAttempts, quizAttemptAnswers, stripeEvents, quizAnswerTranslations, categoryTranslations, questionTranslations, quizTranslations, quizQuestionContent } from "./schema";
+import { relations } from 'drizzle-orm/relations';
+
+import {
+  categories,
+  categoryTranslations,
+  orderItems,
+  orders,
+  pointTransactions,
+  productPrices,
+  products,
+  questions,
+  questionTranslations,
+  quizAnswers,
+  quizAnswerTranslations,
+  quizAttemptAnswers,
+  quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
+  stripeEvents,
+  users,
+} from './schema';
 
 export const ordersRelations = relations(orders, ({ one, many }) => ({
-	user: one(users, {
-		fields: [orders.userId],
-		references: [users.id]
-	}),
-	orderItems: many(orderItems),
-	stripeEvents: many(stripeEvents),
+  user: one(users, {
+    fields: [orders.userId],
+    references: [users.id],
+  }),
+  orderItems: many(orderItems),
+  stripeEvents: many(stripeEvents),
 }));
 
 export const usersRelations = relations(users, ({ many }) => ({
-	orders: many(orders),
-	pointTransactions: many(pointTransactions),
-	quizAttempts: many(quizAttempts),
-}));
-
-export const quizQuestionsRelations = relations(quizQuestions, ({ one, many }) => ({
-	quiz: one(quizzes, {
-		fields: [quizQuestions.quizId],
-		references: [quizzes.id]
-	}),
-	quizAnswers: many(quizAnswers),
-	quizAttemptAnswers: many(quizAttemptAnswers),
-	quizQuestionContents: many(quizQuestionContent),
-}));
+  orders: many(orders),
+  pointTransactions: many(pointTransactions),
+  quizAttempts: many(quizAttempts),
+}));
+
+export const quizQuestionsRelations = relations(
+  quizQuestions,
+  ({ one, many }) => ({
+    quiz: one(quizzes, {
+      fields: [quizQuestions.quizId],
+      references: [quizzes.id],
+    }),
+    quizAnswers: many(quizAnswers),
+    quizAttemptAnswers: many(quizAttemptAnswers),
+    quizQuestionContents: many(quizQuestionContent),
+  })
+);
 
 export const quizzesRelations = relations(quizzes, ({ one, many }) => ({
-	quizQuestions: many(quizQuestions),
-	category: one(categories, {
-		fields: [quizzes.categoryId],
-		references: [categories.id]
-	}),
-	quizAttempts: many(quizAttempts),
-	quizTranslations: many(quizTranslations),
-}));
-
-export const pointTransactionsRelations = relations(pointTransactions, ({ one }) => ({
-	user: one(users, {
-		fields: [pointTransactions.userId],
-		references: [users.id]
-	}),
-}));
+  quizQuestions: many(quizQuestions),
+  category: one(categories, {
+    fields: [quizzes.categoryId],
+    references: [categories.id],
+  }),
+  quizAttempts: many(quizAttempts),
+  quizTranslations: many(quizTranslations),
+}));
+
+export const pointTransactionsRelations = relations(
+  pointTransactions,
+  ({ one }) => ({
+    user: one(users, {
+      fields: [pointTransactions.userId],
+      references: [users.id],
+    }),
+  })
+);
 
 export const productPricesRelations = relations(productPrices, ({ one }) => ({
-	product: one(products, {
-		fields: [productPrices.productId],
-		references: [products.id]
-	}),
+  product: one(products, {
+    fields: [productPrices.productId],
+    references: [products.id],
+  }),
 }));
 
 export const productsRelations = relations(products, ({ many }) => ({
-	productPrices: many(productPrices),
-	orderItems: many(orderItems),
+  productPrices: many(productPrices),
+  orderItems: many(orderItems),
 }));
 
 export const questionsRelations = relations(questions, ({ one, many }) => ({
-	category: one(categories, {
-		fields: [questions.categoryId],
-		references: [categories.id]
-	}),
-	questionTranslations: many(questionTranslations),
+  category: one(categories, {
+    fields: [questions.categoryId],
+    references: [categories.id],
+  }),
+  questionTranslations: many(questionTranslations),
 }));
 
 export const categoriesRelations = relations(categories, ({ many }) => ({
-	questions: many(questions),
-	quizzes: many(quizzes),
-	categoryTranslations: many(categoryTranslations),
+  questions: many(questions),
+  quizzes: many(quizzes),
+  categoryTranslations: many(categoryTranslations),
 }));
 
 export const quizAnswersRelations = relations(quizAnswers, ({ one, many }) => ({
-	quizQuestion: one(quizQuestions, {
-		fields: [quizAnswers.quizQuestionId],
-		references: [quizQuestions.id]
-	}),
-	quizAttemptAnswers: many(quizAttemptAnswers),
-	quizAnswerTranslations: many(quizAnswerTranslations),
+  quizQuestion: one(quizQuestions, {
+    fields: [quizAnswers.quizQuestionId],
+    references: [quizQuestions.id],
+  }),
+  quizAttemptAnswers: many(quizAttemptAnswers),
+  quizAnswerTranslations: many(quizAnswerTranslations),
 }));
 
 export const orderItemsRelations = relations(orderItems, ({ one }) => ({
-	order: one(orders, {
-		fields: [orderItems.orderId],
-		references: [orders.id]
-	}),
-	product: one(products, {
-		fields: [orderItems.productId],
-		references: [products.id]
-	}),
+  order: one(orders, {
+    fields: [orderItems.orderId],
+    references: [orders.id],
+  }),
+  product: one(products, {
+    fields: [orderItems.productId],
+    references: [products.id],
+  }),
 }));
 
 export const quizAttemptsRelations = relations(
-	quizAttempts,
-	({ one, many }) => ({
-		user: one(users, {
-			fields: [quizAttempts.userId],
-			references: [users.id],
-		}),
-		quiz: one(quizzes, {
-			fields: [quizAttempts.quizId],
-			references: [quizzes.id],
-		}),
-		answers: many(quizAttemptAnswers),
-	})
+  quizAttempts,
+  ({ one, many }) => ({
+    user: one(users, {
+      fields: [quizAttempts.userId],
+      references: [users.id],
+    }),
+    quiz: one(quizzes, {
+      fields: [quizAttempts.quizId],
+      references: [quizzes.id],
+    }),
+    answers: many(quizAttemptAnswers),
+  })
 );
 
-export const quizAttemptAnswersRelations = relations(quizAttemptAnswers, ({ one }) => ({
-	quizAttempt: one(quizAttempts, {
-		fields: [quizAttemptAnswers.attemptId],
-		references: [quizAttempts.id]
-	}),
-	quizQuestion: one(quizQuestions, {
-		fields: [quizAttemptAnswers.quizQuestionId],
-		references: [quizQuestions.id]
-	}),
-	quizAnswer: one(quizAnswers, {
-		fields: [quizAttemptAnswers.selectedAnswerId],
-		references: [quizAnswers.id]
-	}),
-}));
+export const quizAttemptAnswersRelations = relations(
+  quizAttemptAnswers,
+  ({ one }) => ({
+    quizAttempt: one(quizAttempts, {
+      fields: [quizAttemptAnswers.attemptId],
+      references: [quizAttempts.id],
+    }),
+    quizQuestion: one(quizQuestions, {
+      fields: [quizAttemptAnswers.quizQuestionId],
+      references: [quizQuestions.id],
+    }),
+    quizAnswer: one(quizAnswers, {
+      fields: [quizAttemptAnswers.selectedAnswerId],
+      references: [quizAnswers.id],
+    }),
+  })
+);
 
 export const stripeEventsRelations = relations(stripeEvents, ({ one }) => ({
-	order: one(orders, {
-		fields: [stripeEvents.orderId],
-		references: [orders.id]
-	}),
-}));
-
-export const quizAnswerTranslationsRelations = relations(quizAnswerTranslations, ({ one }) => ({
-	quizAnswer: one(quizAnswers, {
-		fields: [quizAnswerTranslations.quizAnswerId],
-		references: [quizAnswers.id]
-	}),
-}));
+  order: one(orders, {
+    fields: [stripeEvents.orderId],
+    references: [orders.id],
+  }),
+}));
+
+export const quizAnswerTranslationsRelations = relations(
+  quizAnswerTranslations,
+  ({ one }) => ({
+    quizAnswer: one(quizAnswers, {
+      fields: [quizAnswerTranslations.quizAnswerId],
+      references: [quizAnswers.id],
+    }),
+  })
+);
 
-export const categoryTranslationsRelations = relations(categoryTranslations, ({ one }) => ({
-	category: one(categories, {
-		fields: [categoryTranslations.categoryId],
-		references: [categories.id]
-	}),
-}));
+export const categoryTranslationsRelations = relations(
+  categoryTranslations,
+  ({ one }) => ({
+    category: one(categories, {
+      fields: [categoryTranslations.categoryId],
+      references: [categories.id],
+    }),
+  })
+);
 
-export const questionTranslationsRelations = relations(questionTranslations, ({ one }) => ({
-	question: one(questions, {
-		fields: [questionTranslations.questionId],
-		references: [questions.id]
-	}),
-}));
+export const questionTranslationsRelations = relations(
+  questionTranslations,
+  ({ one }) => ({
+    question: one(questions, {
+      fields: [questionTranslations.questionId],
+      references: [questions.id],
+    }),
+  })
+);
 
-export const quizTranslationsRelations = relations(quizTranslations, ({ one }) => ({
-	quiz: one(quizzes, {
-		fields: [quizTranslations.quizId],
-		references: [quizzes.id]
-	}),
-}));
+export const quizTranslationsRelations = relations(
+  quizTranslations,
+  ({ one }) => ({
+    quiz: one(quizzes, {
+      fields: [quizTranslations.quizId],
+      references: [quizzes.id],
+    }),
+  })
+);
 
-export const quizQuestionContentRelations = relations(quizQuestionContent, ({ one }) => ({
-	quizQuestion: one(quizQuestions, {
-		fields: [quizQuestionContent.quizQuestionId],
-		references: [quizQuestions.id]
-	}),
-}));
\ No newline at end of file
+export const quizQuestionContentRelations = relations(
+  quizQuestionContent,
+  ({ one }) => ({
+    quizQuestion: one(quizQuestions, {
+      fields: [quizQuestionContent.quizQuestionId],
+      references: [quizQuestions.id],
+    }),
+  })
+);
diff --git a/frontend/db/legacy-migrations/drizzle_legacy/schema.ts b/frontend/db/legacy-migrations/drizzle_legacy/schema.ts
index b13c31c7..6aa9ddd2 100644
--- a/frontend/db/legacy-migrations/drizzle_legacy/schema.ts
+++ b/frontend/db/legacy-migrations/drizzle_legacy/schema.ts
@@ -1,359 +1,553 @@
 // ⚠️ Legacy file — not used by drizzle or runtime.
 // Canonical schemas live in frontend/db/schema/*
 
-import { pgTable, foreignKey, unique, check, uuid, text, numeric, jsonb, boolean, timestamp, varchar, integer, index, uniqueIndex, primaryKey, pgEnum } from "drizzle-orm/pg-core"
-import { sql } from "drizzle-orm"
+import { sql } from 'drizzle-orm';
+import {
+  boolean,
+  check,
+  foreignKey,
+  index,
+  integer,
+  jsonb,
+  numeric,
+  pgEnum,
+  pgTable,
+  primaryKey,
+  text,
+  timestamp,
+  unique,
+  uniqueIndex,
+  uuid,
+  varchar,
+} from 'drizzle-orm/pg-core';
 
-export const currency = pgEnum("currency", ['USD', 'UAH'])
-export const paymentStatus = pgEnum("payment_status", ['pending', 'requires_payment', 'paid', 'failed', 'refunded'])
-export const productBadge = pgEnum("product_badge", ['NEW', 'SALE', 'NONE'])
-
-export const users = pgTable("users", {
-	id: text().default(sql`gen_random_uuid()`).primaryKey().notNull(),
-	name: text(),
-	email: text().notNull(),
-	passwordHash: text("password_hash"),
-	provider: text().default('credentials').notNull(),
-	providerId: text("provider_id"),
-	emailVerified: timestamp("email_verified", { mode: 'date' }),
-	image: text(),
-	role: text().default("user").notNull(),
-	points: integer().default(0).notNull(),
-	createdAt: timestamp("created_at", { mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	unique("users_email_unique").on(table.email),
-	unique("users_provider_provider_id_unique").on(table.provider, table.providerId),
+export const currency = pgEnum('currency', ['USD', 'UAH']);
+export const paymentStatus = pgEnum('payment_status', [
+  'pending',
+  'requires_payment',
+  'paid',
+  'failed',
+  'refunded',
 ]);
+export const productBadge = pgEnum('product_badge', ['NEW', 'SALE', 'NONE']);
 
-export const orders = pgTable("orders", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	userId: text("user_id"),
-	totalAmount: numeric("total_amount", { precision: 10, scale: 2 }).notNull(),
-	currency: currency().default('USD').notNull(),
-	paymentStatus: paymentStatus("payment_status").default('pending').notNull(),
-	paymentProvider: text("payment_provider").default('stripe').notNull(),
-	paymentIntentId: text("payment_intent_id"),
-	pspChargeId: text("psp_charge_id"),
-	pspPaymentMethod: text("psp_payment_method"),
-	pspStatusReason: text("psp_status_reason"),
-	pspMetadata: jsonb("psp_metadata").default({}),
-	stockRestored: boolean("stock_restored").default(false).notNull(),
-	restockedAt: timestamp("restocked_at", { mode: 'date' }),
-	idempotencyKey: varchar("idempotency_key", { length: 128 }).notNull(),
-	createdAt: timestamp("created_at", { mode: 'date' }).defaultNow().notNull(),
-	updatedAt: timestamp("updated_at", { mode: 'date' }).defaultNow().notNull(),
-	totalAmountMinor: integer("total_amount_minor").notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.userId],
-		foreignColumns: [users.id],
-		name: "orders_user_id_users_id_fk"
-	}).onDelete("set null"),
-	unique("orders_idempotency_key_unique").on(table.idempotencyKey),
-	check("orders_payment_intent_id_null_when_none", sql`(payment_provider <> 'none'::text) OR (payment_intent_id IS NULL)`),
-	check("orders_payment_provider_valid", sql`payment_provider = ANY (ARRAY['stripe'::text, 'none'::text])`),
-	check("orders_total_amount_minor_non_negative", sql`total_amount_minor >= 0`)
-]);
+export const users = pgTable(
+  'users',
+  {
+    id: text()
+      .default(sql`gen_random_uuid()`)
+      .primaryKey()
+      .notNull(),
+    name: text(),
+    email: text().notNull(),
+    passwordHash: text('password_hash'),
+    provider: text().default('credentials').notNull(),
+    providerId: text('provider_id'),
+    emailVerified: timestamp('email_verified', { mode: 'date' }),
+    image: text(),
+    role: text().default('user').notNull(),
+    points: integer().default(0).notNull(),
+    createdAt: timestamp('created_at', { mode: 'date' }).defaultNow().notNull(),
+  },
+  table => [
+    unique('users_email_unique').on(table.email),
+    unique('users_provider_provider_id_unique').on(
+      table.provider,
+      table.providerId
+    ),
+  ]
+);
 
-export const categories = pgTable("categories", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	slug: varchar({ length: 50 }).notNull(),
-	displayOrder: integer("display_order").default(0).notNull(),
-	createdAt: timestamp("created_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	unique("categories_slug_unique").on(table.slug),
-]);
-
-export const quizzes = pgTable("quizzes", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	categoryId: uuid("category_id").notNull(),
-	slug: varchar({ length: 100 }).notNull(),
-	displayOrder: integer("display_order").default(0).notNull(),
-	questionsCount: integer("questions_count").default(10).notNull(),
-	timeLimitSeconds: integer("time_limit_seconds"),
-	isActive: boolean("is_active").default(true).notNull(),
-	createdAt: timestamp("created_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-	updatedAt: timestamp("updated_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.categoryId],
-		foreignColumns: [categories.id],
-		name: "quizzes_category_id_categories_id_fk"
-	}).onDelete("restrict"),
-	unique("quizzes_category_id_slug_unique").on(table.categoryId, table.slug),
-]);
+export const orders = pgTable(
+  'orders',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    userId: text('user_id'),
+    totalAmount: numeric('total_amount', { precision: 10, scale: 2 }).notNull(),
+    currency: currency().default('USD').notNull(),
+    paymentStatus: paymentStatus('payment_status').default('pending').notNull(),
+    paymentProvider: text('payment_provider').default('stripe').notNull(),
+    paymentIntentId: text('payment_intent_id'),
+    pspChargeId: text('psp_charge_id'),
+    pspPaymentMethod: text('psp_payment_method'),
+    pspStatusReason: text('psp_status_reason'),
+    pspMetadata: jsonb('psp_metadata').default({}),
+    stockRestored: boolean('stock_restored').default(false).notNull(),
+    restockedAt: timestamp('restocked_at', { mode: 'date' }),
+    idempotencyKey: varchar('idempotency_key', { length: 128 }).notNull(),
+    createdAt: timestamp('created_at', { mode: 'date' }).defaultNow().notNull(),
+    updatedAt: timestamp('updated_at', { mode: 'date' }).defaultNow().notNull(),
+    totalAmountMinor: integer('total_amount_minor').notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.userId],
+      foreignColumns: [users.id],
+      name: 'orders_user_id_users_id_fk',
+    }).onDelete('set null'),
+    unique('orders_idempotency_key_unique').on(table.idempotencyKey),
+    check(
+      'orders_payment_intent_id_null_when_none',
+      sql`(payment_provider <> 'none'::text) OR (payment_intent_id IS NULL)`
+    ),
+    check(
+      'orders_payment_provider_valid',
+      sql`payment_provider = ANY (ARRAY['stripe'::text, 'none'::text])`
+    ),
+    check(
+      'orders_total_amount_minor_non_negative',
+      sql`total_amount_minor >= 0`
+    ),
+  ]
+);
 
-export const quizQuestions = pgTable("quiz_questions", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	quizId: uuid("quiz_id").notNull(),
-	displayOrder: integer("display_order").notNull(),
-	sourceQuestionId: uuid("source_question_id"),
-	difficulty: varchar({ length: 20 }).default('medium'),
-	createdAt: timestamp("created_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	index("quiz_questions_quiz_display_order_idx").using("btree", table.quizId.asc().nullsLast().op("int4_ops"), table.displayOrder.asc().nullsLast().op("int4_ops")),
-	foreignKey({
-		columns: [table.quizId],
-		foreignColumns: [quizzes.id],
-		name: "quiz_questions_quiz_id_quizzes_id_fk"
-	}).onDelete("cascade"),
-]);
+export const categories = pgTable(
+  'categories',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    slug: varchar({ length: 50 }).notNull(),
+    displayOrder: integer('display_order').default(0).notNull(),
+    createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [unique('categories_slug_unique').on(table.slug)]
+);
 
-export const products = pgTable("products", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	slug: varchar({ length: 255 }).notNull(),
-	title: text().notNull(),
-	description: text(),
-	imageUrl: text("image_url").notNull(),
-	imagePublicId: text("image_public_id"),
-	price: numeric({ precision: 10, scale: 2 }).notNull(),
-	originalPrice: numeric("original_price", { precision: 10, scale: 2 }),
-	currency: currency().default('USD').notNull(),
-	category: text(),
-	type: text(),
-	colors: text().array().default([""]).notNull(),
-	sizes: text().array().default([""]).notNull(),
-	badge: productBadge().default('NONE').notNull(),
-	isActive: boolean("is_active").default(true).notNull(),
-	isFeatured: boolean("is_featured").default(false).notNull(),
-	stock: integer().default(0).notNull(),
-	sku: text(),
-	createdAt: timestamp("created_at", { mode: 'date' }).defaultNow().notNull(),
-	updatedAt: timestamp("updated_at", { mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	uniqueIndex("products_slug_unique").using("btree", table.slug.asc().nullsLast().op("text_ops")),
-	check("products_stock_non_negative", sql`stock >= 0`),
-]);
+export const quizzes = pgTable(
+  'quizzes',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    categoryId: uuid('category_id').notNull(),
+    slug: varchar({ length: 100 }).notNull(),
+    displayOrder: integer('display_order').default(0).notNull(),
+    questionsCount: integer('questions_count').default(10).notNull(),
+    timeLimitSeconds: integer('time_limit_seconds'),
+    isActive: boolean('is_active').default(true).notNull(),
+    createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+    updatedAt: timestamp('updated_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.categoryId],
+      foreignColumns: [categories.id],
+      name: 'quizzes_category_id_categories_id_fk',
+    }).onDelete('restrict'),
+    unique('quizzes_category_id_slug_unique').on(table.categoryId, table.slug),
+  ]
+);
 
-export const pointTransactions = pgTable("point_transactions", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	userId: text("user_id").notNull(),
-	points: integer().default(0).notNull(),
-	source: varchar({ length: 50 }).default('quiz').notNull(),
-	sourceId: uuid("source_id"),
-	metadata: jsonb().default({}),
-	createdAt: timestamp("created_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.userId],
-		foreignColumns: [users.id],
-		name: "point_transactions_user_id_users_id_fk"
-	}).onDelete("cascade"),
-]);
+export const quizQuestions = pgTable(
+  'quiz_questions',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    quizId: uuid('quiz_id').notNull(),
+    displayOrder: integer('display_order').notNull(),
+    sourceQuestionId: uuid('source_question_id'),
+    difficulty: varchar({ length: 20 }).default('medium'),
+    createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    index('quiz_questions_quiz_display_order_idx').using(
+      'btree',
+      table.quizId.asc().nullsLast().op('int4_ops'),
+      table.displayOrder.asc().nullsLast().op('int4_ops')
+    ),
+    foreignKey({
+      columns: [table.quizId],
+      foreignColumns: [quizzes.id],
+      name: 'quiz_questions_quiz_id_quizzes_id_fk',
+    }).onDelete('cascade'),
+  ]
+);
 
-export const productPrices = pgTable("product_prices", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	productId: uuid("product_id").notNull(),
-	currency: currency().notNull(),
-	price: numeric({ precision: 10, scale: 2 }).notNull(),
-	originalPrice: numeric("original_price", { precision: 10, scale: 2 }),
-	createdAt: timestamp("created_at", { mode: 'date' }).defaultNow().notNull(),
-	updatedAt: timestamp("updated_at", { mode: 'date' }).defaultNow().notNull(),
-	priceMinor: integer("price_minor").notNull(),
-	originalPriceMinor: integer("original_price_minor"),
-}, (table) => [
-	index("product_prices_currency_idx").using("btree", table.currency.asc().nullsLast().op("enum_ops")),
-	uniqueIndex("product_prices_product_currency_uq").using("btree", table.productId.asc().nullsLast().op("uuid_ops"), table.currency.asc().nullsLast().op("uuid_ops")),
-	foreignKey({
-		columns: [table.productId],
-		foreignColumns: [products.id],
-		name: "product_prices_product_id_fkey"
-	}).onDelete("cascade"),
-	check("product_prices_original_price_valid", sql`(original_price_minor IS NULL) OR (original_price_minor > price_minor)`),
-	check("product_prices_price_positive", sql`price_minor > 0`),
-]);
+export const products = pgTable(
+  'products',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    slug: varchar({ length: 255 }).notNull(),
+    title: text().notNull(),
+    description: text(),
+    imageUrl: text('image_url').notNull(),
+    imagePublicId: text('image_public_id'),
+    price: numeric({ precision: 10, scale: 2 }).notNull(),
+    originalPrice: numeric('original_price', { precision: 10, scale: 2 }),
+    currency: currency().default('USD').notNull(),
+    category: text(),
+    type: text(),
+    colors: text().array().default(['']).notNull(),
+    sizes: text().array().default(['']).notNull(),
+    badge: productBadge().default('NONE').notNull(),
+    isActive: boolean('is_active').default(true).notNull(),
+    isFeatured: boolean('is_featured').default(false).notNull(),
+    stock: integer().default(0).notNull(),
+    sku: text(),
+    createdAt: timestamp('created_at', { mode: 'date' }).defaultNow().notNull(),
+    updatedAt: timestamp('updated_at', { mode: 'date' }).defaultNow().notNull(),
+  },
+  table => [
+    uniqueIndex('products_slug_unique').using(
+      'btree',
+      table.slug.asc().nullsLast().op('text_ops')
+    ),
+    check('products_stock_non_negative', sql`stock >= 0`),
+  ]
+);
 
-export const questions = pgTable("questions", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	sortOrder: integer("sort_order").default(0).notNull(),
-	categoryId: uuid("category_id").notNull(),
-	difficulty: varchar({ length: 20 }).default('medium'),
-	createdAt: timestamp("created_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-	updatedAt: timestamp("updated_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.categoryId],
-		foreignColumns: [categories.id],
-		name: "questions_category_id_categories_id_fk"
-	}).onDelete("restrict"),
-]);
+export const pointTransactions = pgTable(
+  'point_transactions',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    userId: text('user_id').notNull(),
+    points: integer().default(0).notNull(),
+    source: varchar({ length: 50 }).default('quiz').notNull(),
+    sourceId: uuid('source_id'),
+    metadata: jsonb().default({}),
+    createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.userId],
+      foreignColumns: [users.id],
+      name: 'point_transactions_user_id_users_id_fk',
+    }).onDelete('cascade'),
+  ]
+);
 
-export const quizAnswers = pgTable("quiz_answers", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	quizQuestionId: uuid("quiz_question_id").notNull(),
-	displayOrder: integer("display_order").notNull(),
-	isCorrect: boolean("is_correct").default(false).notNull(),
-}, (table) => [
-	index("quiz_answers_question_display_order_idx").using("btree", table.quizQuestionId.asc().nullsLast().op("int4_ops"), table.displayOrder.asc().nullsLast().op("int4_ops")),
-	foreignKey({
-		columns: [table.quizQuestionId],
-		foreignColumns: [quizQuestions.id],
-		name: "quiz_answers_quiz_question_id_quiz_questions_id_fk"
-	}).onDelete("cascade"),
-]);
+export const productPrices = pgTable(
+  'product_prices',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    productId: uuid('product_id').notNull(),
+    currency: currency().notNull(),
+    price: numeric({ precision: 10, scale: 2 }).notNull(),
+    originalPrice: numeric('original_price', { precision: 10, scale: 2 }),
+    createdAt: timestamp('created_at', { mode: 'date' }).defaultNow().notNull(),
+    updatedAt: timestamp('updated_at', { mode: 'date' }).defaultNow().notNull(),
+    priceMinor: integer('price_minor').notNull(),
+    originalPriceMinor: integer('original_price_minor'),
+  },
+  table => [
+    index('product_prices_currency_idx').using(
+      'btree',
+      table.currency.asc().nullsLast().op('enum_ops')
+    ),
+    uniqueIndex('product_prices_product_currency_uq').using(
+      'btree',
+      table.productId.asc().nullsLast().op('uuid_ops'),
+      table.currency.asc().nullsLast().op('uuid_ops')
+    ),
+    foreignKey({
+      columns: [table.productId],
+      foreignColumns: [products.id],
+      name: 'product_prices_product_id_fkey',
+    }).onDelete('cascade'),
+    check(
+      'product_prices_original_price_valid',
+      sql`(original_price_minor IS NULL) OR (original_price_minor > price_minor)`
+    ),
+    check('product_prices_price_positive', sql`price_minor > 0`),
+  ]
+);
 
-export const orderItems = pgTable("order_items", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	orderId: uuid("order_id").notNull(),
-	productId: uuid("product_id").notNull(),
-	quantity: integer().notNull(),
-	unitPrice: numeric("unit_price", { precision: 10, scale: 2 }).notNull(),
-	lineTotal: numeric("line_total", { precision: 10, scale: 2 }).notNull(),
-	productTitle: text("product_title"),
-	productSlug: text("product_slug"),
-	productSku: text("product_sku"),
-	unitPriceMinor: integer("unit_price_minor").notNull(),
-	lineTotalMinor: integer("line_total_minor").notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.orderId],
-		foreignColumns: [orders.id],
-		name: "order_items_order_id_orders_id_fk"
-	}).onDelete("cascade"),
-	foreignKey({
-		columns: [table.productId],
-		foreignColumns: [products.id],
-		name: "order_items_product_id_products_id_fk"
-	}),
-	check("order_items_line_total_consistent", sql`line_total_minor = (unit_price_minor * quantity)`),
-	check("order_items_line_total_minor_non_negative", sql`line_total_minor >= 0`),
-	check("order_items_quantity_positive", sql`quantity > 0`),
-	check("order_items_unit_price_minor_non_negative", sql`unit_price_minor >= 0`),
-]);
+export const questions = pgTable(
+  'questions',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    sortOrder: integer('sort_order').default(0).notNull(),
+    categoryId: uuid('category_id').notNull(),
+    difficulty: varchar({ length: 20 }).default('medium'),
+    createdAt: timestamp('created_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+    updatedAt: timestamp('updated_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.categoryId],
+      foreignColumns: [categories.id],
+      name: 'questions_category_id_categories_id_fk',
+    }).onDelete('restrict'),
+  ]
+);
 
-export const quizAttempts = pgTable("quiz_attempts", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	userId: text("user_id").notNull(),
-	quizId: uuid("quiz_id").notNull(),
-	score: integer().notNull(),
-	totalQuestions: integer("total_questions").notNull(),
-	percentage: numeric({ precision: 5, scale: 2 }).notNull(),
-	timeSpentSeconds: integer("time_spent_seconds"),
-	integrityScore: integer("integrity_score").default(100),
-	metadata: jsonb().default({}),
-	startedAt: timestamp("started_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-	completedAt: timestamp("completed_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	index("quiz_attempts_quiz_integrity_score_idx").using("btree", table.quizId.asc().nullsLast().op("int4_ops"), table.integrityScore.asc().nullsLast().op("int4_ops")),
-	index("quiz_attempts_quiz_percentage_completed_at_idx").using("btree", table.quizId.asc().nullsLast().op("uuid_ops"), table.percentage.asc().nullsLast().op("timestamptz_ops"), table.completedAt.asc().nullsLast().op("numeric_ops")),
-	index("quiz_attempts_user_completed_at_idx").using("btree", table.userId.asc().nullsLast().op("text_ops"), table.completedAt.asc().nullsLast().op("timestamptz_ops")),
-	foreignKey({
-		columns: [table.quizId],
-		foreignColumns: [quizzes.id],
-		name: "quiz_attempts_quiz_id_quizzes_id_fk"
-	}).onDelete("cascade"),
-]);
+export const quizAnswers = pgTable(
+  'quiz_answers',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    quizQuestionId: uuid('quiz_question_id').notNull(),
+    displayOrder: integer('display_order').notNull(),
+    isCorrect: boolean('is_correct').default(false).notNull(),
+  },
+  table => [
+    index('quiz_answers_question_display_order_idx').using(
+      'btree',
+      table.quizQuestionId.asc().nullsLast().op('int4_ops'),
+      table.displayOrder.asc().nullsLast().op('int4_ops')
+    ),
+    foreignKey({
+      columns: [table.quizQuestionId],
+      foreignColumns: [quizQuestions.id],
+      name: 'quiz_answers_quiz_question_id_quiz_questions_id_fk',
+    }).onDelete('cascade'),
+  ]
+);
 
-export const quizAttemptAnswers = pgTable("quiz_attempt_answers", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	attemptId: uuid("attempt_id").notNull(),
-	quizQuestionId: uuid("quiz_question_id").notNull(),
-	selectedAnswerId: uuid("selected_answer_id"),
-	isCorrect: boolean("is_correct").notNull(),
-	answeredAt: timestamp("answered_at", { withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	index("quiz_attempt_answers_attempt_idx").using("btree", table.attemptId.asc().nullsLast().op("uuid_ops")),
-	foreignKey({
-		columns: [table.attemptId],
-		foreignColumns: [quizAttempts.id],
-		name: "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk"
-	}).onDelete("cascade"),
-	foreignKey({
-		columns: [table.quizQuestionId],
-		foreignColumns: [quizQuestions.id],
-		name: "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk"
-	}).onDelete("cascade"),
-	foreignKey({
-		columns: [table.selectedAnswerId],
-		foreignColumns: [quizAnswers.id],
-		name: "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk"
-	}).onDelete("set null"),
-]);
+export const orderItems = pgTable(
+  'order_items',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    orderId: uuid('order_id').notNull(),
+    productId: uuid('product_id').notNull(),
+    quantity: integer().notNull(),
+    unitPrice: numeric('unit_price', { precision: 10, scale: 2 }).notNull(),
+    lineTotal: numeric('line_total', { precision: 10, scale: 2 }).notNull(),
+    productTitle: text('product_title'),
+    productSlug: text('product_slug'),
+    productSku: text('product_sku'),
+    unitPriceMinor: integer('unit_price_minor').notNull(),
+    lineTotalMinor: integer('line_total_minor').notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.orderId],
+      foreignColumns: [orders.id],
+      name: 'order_items_order_id_orders_id_fk',
+    }).onDelete('cascade'),
+    foreignKey({
+      columns: [table.productId],
+      foreignColumns: [products.id],
+      name: 'order_items_product_id_products_id_fk',
+    }),
+    check(
+      'order_items_line_total_consistent',
+      sql`line_total_minor = (unit_price_minor * quantity)`
+    ),
+    check(
+      'order_items_line_total_minor_non_negative',
+      sql`line_total_minor >= 0`
+    ),
+    check('order_items_quantity_positive', sql`quantity > 0`),
+    check(
+      'order_items_unit_price_minor_non_negative',
+      sql`unit_price_minor >= 0`
+    ),
+  ]
+);
 
-export const stripeEvents = pgTable("stripe_events", {
-	id: uuid().defaultRandom().primaryKey().notNull(),
-	provider: text().default('stripe').notNull(),
-	eventId: text("event_id").notNull(),
-	paymentIntentId: text("payment_intent_id"),
-	orderId: uuid("order_id"),
-	eventType: text("event_type").notNull(),
-	paymentStatus: text("payment_status"),
-	createdAt: timestamp("created_at", { mode: 'date' }).defaultNow().notNull(),
-}, (table) => [
-	uniqueIndex("stripe_events_event_id_idx").using("btree", table.eventId.asc().nullsLast().op("text_ops")),
-	foreignKey({
-		columns: [table.orderId],
-		foreignColumns: [orders.id],
-		name: "stripe_events_order_id_orders_id_fk"
-	}),
-]);
+export const quizAttempts = pgTable(
+  'quiz_attempts',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    userId: text('user_id').notNull(),
+    quizId: uuid('quiz_id').notNull(),
+    score: integer().notNull(),
+    totalQuestions: integer('total_questions').notNull(),
+    percentage: numeric({ precision: 5, scale: 2 }).notNull(),
+    timeSpentSeconds: integer('time_spent_seconds'),
+    integrityScore: integer('integrity_score').default(100),
+    metadata: jsonb().default({}),
+    startedAt: timestamp('started_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+    completedAt: timestamp('completed_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    index('quiz_attempts_quiz_integrity_score_idx').using(
+      'btree',
+      table.quizId.asc().nullsLast().op('int4_ops'),
+      table.integrityScore.asc().nullsLast().op('int4_ops')
+    ),
+    index('quiz_attempts_quiz_percentage_completed_at_idx').using(
+      'btree',
+      table.quizId.asc().nullsLast().op('uuid_ops'),
+      table.percentage.asc().nullsLast().op('timestamptz_ops'),
+      table.completedAt.asc().nullsLast().op('numeric_ops')
+    ),
+    index('quiz_attempts_user_completed_at_idx').using(
+      'btree',
+      table.userId.asc().nullsLast().op('text_ops'),
+      table.completedAt.asc().nullsLast().op('timestamptz_ops')
+    ),
+    foreignKey({
+      columns: [table.quizId],
+      foreignColumns: [quizzes.id],
+      name: 'quiz_attempts_quiz_id_quizzes_id_fk',
+    }).onDelete('cascade'),
+  ]
+);
 
+export const quizAttemptAnswers = pgTable(
+  'quiz_attempt_answers',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    attemptId: uuid('attempt_id').notNull(),
+    quizQuestionId: uuid('quiz_question_id').notNull(),
+    selectedAnswerId: uuid('selected_answer_id'),
+    isCorrect: boolean('is_correct').notNull(),
+    answeredAt: timestamp('answered_at', { withTimezone: true, mode: 'date' })
+      .defaultNow()
+      .notNull(),
+  },
+  table => [
+    index('quiz_attempt_answers_attempt_idx').using(
+      'btree',
+      table.attemptId.asc().nullsLast().op('uuid_ops')
+    ),
+    foreignKey({
+      columns: [table.attemptId],
+      foreignColumns: [quizAttempts.id],
+      name: 'quiz_attempt_answers_attempt_id_quiz_attempts_id_fk',
+    }).onDelete('cascade'),
+    foreignKey({
+      columns: [table.quizQuestionId],
+      foreignColumns: [quizQuestions.id],
+      name: 'quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk',
+    }).onDelete('cascade'),
+    foreignKey({
+      columns: [table.selectedAnswerId],
+      foreignColumns: [quizAnswers.id],
+      name: 'quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk',
+    }).onDelete('set null'),
+  ]
+);
 
+export const stripeEvents = pgTable(
+  'stripe_events',
+  {
+    id: uuid().defaultRandom().primaryKey().notNull(),
+    provider: text().default('stripe').notNull(),
+    eventId: text('event_id').notNull(),
+    paymentIntentId: text('payment_intent_id'),
+    orderId: uuid('order_id'),
+    eventType: text('event_type').notNull(),
+    paymentStatus: text('payment_status'),
+    createdAt: timestamp('created_at', { mode: 'date' }).defaultNow().notNull(),
+  },
+  table => [
+    uniqueIndex('stripe_events_event_id_idx').using(
+      'btree',
+      table.eventId.asc().nullsLast().op('text_ops')
+    ),
+    foreignKey({
+      columns: [table.orderId],
+      foreignColumns: [orders.id],
+      name: 'stripe_events_order_id_orders_id_fk',
+    }),
+  ]
+);
 
-export const quizAnswerTranslations = pgTable("quiz_answer_translations", {
-	quizAnswerId: uuid("quiz_answer_id").notNull(),
-	locale: varchar({ length: 5 }).notNull(),
-	answerText: text("answer_text").notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.quizAnswerId],
-		foreignColumns: [quizAnswers.id],
-		name: "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk"
-	}).onDelete("cascade"),
-	primaryKey({ columns: [table.quizAnswerId, table.locale], name: "quiz_answer_translations_quiz_answer_id_locale_pk" }),
-]);
+export const quizAnswerTranslations = pgTable(
+  'quiz_answer_translations',
+  {
+    quizAnswerId: uuid('quiz_answer_id').notNull(),
+    locale: varchar({ length: 5 }).notNull(),
+    answerText: text('answer_text').notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.quizAnswerId],
+      foreignColumns: [quizAnswers.id],
+      name: 'quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk',
+    }).onDelete('cascade'),
+    primaryKey({
+      columns: [table.quizAnswerId, table.locale],
+      name: 'quiz_answer_translations_quiz_answer_id_locale_pk',
+    }),
+  ]
+);
 
-export const categoryTranslations = pgTable("category_translations", {
-	categoryId: uuid("category_id").notNull(),
-	locale: varchar({ length: 5 }).notNull(),
-	title: text().notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.categoryId],
-		foreignColumns: [categories.id],
-		name: "category_translations_category_id_categories_id_fk"
-	}).onDelete("cascade"),
-	primaryKey({ columns: [table.categoryId, table.locale], name: "category_translations_category_id_locale_pk" }),
-]);
+export const categoryTranslations = pgTable(
+  'category_translations',
+  {
+    categoryId: uuid('category_id').notNull(),
+    locale: varchar({ length: 5 }).notNull(),
+    title: text().notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.categoryId],
+      foreignColumns: [categories.id],
+      name: 'category_translations_category_id_categories_id_fk',
+    }).onDelete('cascade'),
+    primaryKey({
+      columns: [table.categoryId, table.locale],
+      name: 'category_translations_category_id_locale_pk',
+    }),
+  ]
+);
 
-export const questionTranslations = pgTable("question_translations", {
-	questionId: uuid("question_id").notNull(),
-	locale: varchar({ length: 5 }).notNull(),
-	question: text().notNull(),
-	answerBlocks: jsonb("answer_blocks").notNull(),
-}, (table) => [
-	foreignKey({
-		columns: [table.questionId],
-		foreignColumns: [questions.id],
-		name: "question_translations_question_id_questions_id_fk"
-	}).onDelete("cascade"),
-	primaryKey({ columns: [table.questionId, table.locale], name: "question_translations_question_id_locale_pk" }),
-]);
+export const questionTranslations = pgTable(
+  'question_translations',
+  {
+    questionId: uuid('question_id').notNull(),
+    locale: varchar({ length: 5 }).notNull(),
+    question: text().notNull(),
+    answerBlocks: jsonb('answer_blocks').notNull(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.questionId],
+      foreignColumns: [questions.id],
+      name: 'question_translations_question_id_questions_id_fk',
+    }).onDelete('cascade'),
+    primaryKey({
+      columns: [table.questionId, table.locale],
+      name: 'question_translations_question_id_locale_pk',
+    }),
+  ]
+);
 
-export const quizTranslations = pgTable("quiz_translations", {
-	quizId: uuid("quiz_id").notNull(),
-	locale: varchar({ length: 5 }).notNull(),
-	title: varchar({ length: 200 }).notNull(),
-	description: text(),
-}, (table) => [
-	foreignKey({
-		columns: [table.quizId],
-		foreignColumns: [quizzes.id],
-		name: "quiz_translations_quiz_id_quizzes_id_fk"
-	}).onDelete("cascade"),
-	primaryKey({ columns: [table.quizId, table.locale], name: "quiz_translations_quiz_id_locale_pk" }),
-]);
+export const quizTranslations = pgTable(
+  'quiz_translations',
+  {
+    quizId: uuid('quiz_id').notNull(),
+    locale: varchar({ length: 5 }).notNull(),
+    title: varchar({ length: 200 }).notNull(),
+    description: text(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.quizId],
+      foreignColumns: [quizzes.id],
+      name: 'quiz_translations_quiz_id_quizzes_id_fk',
+    }).onDelete('cascade'),
+    primaryKey({
+      columns: [table.quizId, table.locale],
+      name: 'quiz_translations_quiz_id_locale_pk',
+    }),
+  ]
+);
 
-export const quizQuestionContent = pgTable("quiz_question_content", {
-	quizQuestionId: uuid("quiz_question_id").notNull(),
-	locale: varchar({ length: 5 }).notNull(),
-	questionText: text("question_text").notNull(),
-	explanation: jsonb(),
-}, (table) => [
-	foreignKey({
-		columns: [table.quizQuestionId],
-		foreignColumns: [quizQuestions.id],
-		name: "quiz_question_content_quiz_question_id_quiz_questions_id_fk"
-	}).onDelete("cascade"),
-	primaryKey({ columns: [table.quizQuestionId, table.locale], name: "quiz_question_content_quiz_question_id_locale_pk" }),
-]);
+export const quizQuestionContent = pgTable(
+  'quiz_question_content',
+  {
+    quizQuestionId: uuid('quiz_question_id').notNull(),
+    locale: varchar({ length: 5 }).notNull(),
+    questionText: text('question_text').notNull(),
+    explanation: jsonb(),
+  },
+  table => [
+    foreignKey({
+      columns: [table.quizQuestionId],
+      foreignColumns: [quizQuestions.id],
+      name: 'quiz_question_content_quiz_question_id_quiz_questions_id_fk',
+    }).onDelete('cascade'),
+    primaryKey({
+      columns: [table.quizQuestionId, table.locale],
+      name: 'quiz_question_content_quiz_question_id_locale_pk',
+    }),
+  ]
+);
diff --git a/frontend/db/queries/leaderboard.ts b/frontend/db/queries/leaderboard.ts
index a5288afb..d90c9d49 100644
--- a/frontend/db/queries/leaderboard.ts
+++ b/frontend/db/queries/leaderboard.ts
@@ -1,10 +1,12 @@
-import { cache } from 'react';
+import { desc, eq, sql } from 'drizzle-orm';
 import { unstable_cache } from 'next/cache';
+import { cache } from 'react';
+
+import { User } from '@/components/leaderboard/types';
+
 import { db } from '../index';
-import { users } from '../schema/users';
 import { pointTransactions } from '../schema/points';
-import { desc, sql, eq } from 'drizzle-orm';
-import { User } from '@/components/leaderboard/types';
+import { users } from '../schema/users';
 
 const getLeaderboardDataCached = unstable_cache(
   async (): Promise<User[]> => {
diff --git a/frontend/db/queries/points.ts b/frontend/db/queries/points.ts
index c90abec7..e8f0c156 100644
--- a/frontend/db/queries/points.ts
+++ b/frontend/db/queries/points.ts
@@ -1,8 +1,9 @@
+import { and, eq, sql } from 'drizzle-orm';
 import { revalidateTag } from 'next/cache';
+
 import { db } from '../index';
 import { pointTransactions } from '../schema/points';
 import { quizAttempts } from '../schema/quiz';
-import { eq, and, sql } from 'drizzle-orm';
 
 export function calculateQuizPoints(params: {
   score: number;
@@ -52,9 +53,7 @@ export async function awardQuizPoints(params: {
     return 0;
   }
 
-  await db
-  .insert(pointTransactions)
-  .values({
+  await db.insert(pointTransactions).values({
     userId,
     points: pointsToAward,
     source: 'quiz',
@@ -71,4 +70,4 @@ export async function awardQuizPoints(params: {
   revalidateTag('leaderboard', 'default');
 
   return pointsToAward;
-}
\ No newline at end of file
+}
diff --git a/frontend/db/queries/quiz.ts b/frontend/db/queries/quiz.ts
index da70e6f6..710d472a 100644
--- a/frontend/db/queries/quiz.ts
+++ b/frontend/db/queries/quiz.ts
@@ -1,18 +1,19 @@
-import { cache } from 'react';
+import { and, desc, eq, inArray, sql } from 'drizzle-orm';
 import { unstable_cache } from 'next/cache';
+import { cache } from 'react';
+
 import { db } from '../index';
+import { categories, categoryTranslations } from '../schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
-  quizAttempts,
   quizAttemptAnswers,
+  quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from '../schema/quiz';
-import { categories, categoryTranslations } from '../schema/categories';
-import { eq, and, desc, sql, inArray } from 'drizzle-orm';
 
 export interface Quiz {
   id: string;
diff --git a/frontend/db/queries/shop/admin-orders.ts b/frontend/db/queries/shop/admin-orders.ts
index 72c08d0d..8d0e5e90 100644
--- a/frontend/db/queries/shop/admin-orders.ts
+++ b/frontend/db/queries/shop/admin-orders.ts
@@ -1,11 +1,12 @@
 import 'server-only';
 
 import { count, desc, eq, sql } from 'drizzle-orm';
+
 import { db } from '@/db';
 import { orderItems, orders } from '@/db/schema';
 import type { CurrencyCode } from '@/lib/shop/currency';
-import type { PaymentProvider, PaymentStatus } from '@/lib/shop/payments';
 import { toDbMoney } from '@/lib/shop/money';
+import type { PaymentProvider, PaymentStatus } from '@/lib/shop/payments';
 
 export type AdminOrderListItem = {
   id: string;
diff --git a/frontend/db/queries/shop/orders.ts b/frontend/db/queries/shop/orders.ts
index 641c8972..9fc7812b 100644
--- a/frontend/db/queries/shop/orders.ts
+++ b/frontend/db/queries/shop/orders.ts
@@ -1,93 +1,117 @@
-import { and, eq, inArray } from "drizzle-orm"
-import { products } from "@/db/schema"
-import { db } from "@/db"
-
-import { type OrderSummary as ValidationOrderSummary } from "@/lib/validation/shop"
-import { InsufficientStockError } from "@/lib/services/errors"
-import { MoneyCents, fromCents, fromDbMoney, sumLineTotals, toCents } from "@/lib/shop/money"
-export { InsufficientStockError } from "@/lib/services/errors"
+import { and, eq, inArray } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { products } from '@/db/schema';
+import { InsufficientStockError } from '@/lib/services/errors';
+import {
+  fromCents,
+  fromDbMoney,
+  MoneyCents,
+  sumLineTotals,
+  toCents,
+} from '@/lib/shop/money';
+import { type OrderSummary as ValidationOrderSummary } from '@/lib/validation/shop';
+export { InsufficientStockError } from '@/lib/services/errors';
 
 export class MoneyValueError extends Error {
-  field?: string
-  rawValue: unknown
-  productId?: string
-
-  constructor({ field, rawValue, productId }: { field?: string; rawValue: unknown; productId?: string }) {
-    super(`Invalid monetary value for ${field ?? "price"}`)
-    this.name = "MoneyValueError"
-    this.field = field
-    this.rawValue = rawValue
-    this.productId = productId
+  field?: string;
+  rawValue: unknown;
+  productId?: string;
+
+  constructor({
+    field,
+    rawValue,
+    productId,
+  }: {
+    field?: string;
+    rawValue: unknown;
+    productId?: string;
+  }) {
+    super(`Invalid monetary value for ${field ?? 'price'}`);
+    this.name = 'MoneyValueError';
+    this.field = field;
+    this.rawValue = rawValue;
+    this.productId = productId;
   }
 }
 
 export interface OrderItemSummary {
-  productId: string
-  productTitle: string
-  productSlug: string
-  quantity: number
-  unitPrice: number
-  lineTotal: number
+  productId: string;
+  productTitle: string;
+  productSlug: string;
+  quantity: number;
+  unitPrice: number;
+  lineTotal: number;
 }
 
-export type OrderSummary = ValidationOrderSummary
+export type OrderSummary = ValidationOrderSummary;
 
-export function coercePriceFromDb(price: unknown, context?: { field?: string; productId?: string }): number {
+export function coercePriceFromDb(
+  price: unknown,
+  context?: { field?: string; productId?: string }
+): number {
   if (price === null || price === undefined) {
     throw new MoneyValueError({
       field: context?.field,
       rawValue: price,
       productId: context?.productId,
-    })
+    });
   }
 
   try {
-    return fromCents(fromDbMoney(price))
+    return fromCents(fromDbMoney(price));
   } catch {
     throw new MoneyValueError({
       field: context?.field,
       rawValue: price,
       productId: context?.productId,
-    })
+    });
   }
 }
 
+export function calculateOrderTotal(
+  items: Array<{ lineTotal: number; lineTotalCents?: MoneyCents }>
+): number {
+  const normalized = items.map(
+    item => item.lineTotalCents ?? toCents(item.lineTotal)
+  );
 
-export function calculateOrderTotal(items: Array<{ lineTotal: number; lineTotalCents?: MoneyCents }>): number {
-  const normalized = items.map((item) => item.lineTotalCents ?? toCents(item.lineTotal))
-
-  return fromCents(sumLineTotals(normalized))
+  return fromCents(sumLineTotals(normalized));
 }
 
 export interface PricedItemInput {
-  productId: string
-  stock: number
-  requestedQty: number
+  productId: string;
+  stock: number;
+  requestedQty: number;
 }
 
 export function ensureSufficientStock(items: PricedItemInput[]) {
   for (const item of items) {
     if (item.stock < 0) {
-      throw new Error(`Invalid stock configuration for product ${item.productId}`)
+      throw new Error(
+        `Invalid stock configuration for product ${item.productId}`
+      );
     }
 
     if (item.stock <= 0 && item.requestedQty > 0) {
-      throw new InsufficientStockError(`Product ${item.productId} is out of stock`)
+      throw new InsufficientStockError(
+        `Product ${item.productId} is out of stock`
+      );
     }
 
     if (item.requestedQty > item.stock) {
       throw new InsufficientStockError(
-        `Requested quantity exceeds stock for product ${item.productId}`,
-      )
+        `Requested quantity exceeds stock for product ${item.productId}`
+      );
     }
   }
 }
 
 export async function getActiveProductsWithIds(ids: string[]) {
-  if (ids.length === 0) return []
+  if (ids.length === 0) return [];
 
   return db
     .select()
     .from(products)
-    .where(and(eq(products.isActive, true), inArray(products.id, ids)))
+    .where(and(eq(products.isActive, true), inArray(products.id, ids)));
 }
diff --git a/frontend/db/queries/shop/products.ts b/frontend/db/queries/shop/products.ts
index b473be5f..7b3debe5 100644
--- a/frontend/db/queries/shop/products.ts
+++ b/frontend/db/queries/shop/products.ts
@@ -4,16 +4,17 @@ import {
   count,
   desc,
   eq,
-  or,
   inArray,
-  sql,
+  or,
   type SQL,
+  sql,
 } from 'drizzle-orm';
+
 import { db } from '@/db';
+import { productPrices, products } from '@/db/schema';
 import type { CatalogSort } from '@/lib/config/catalog';
-import { products, productPrices } from '@/db/schema';
-import { dbProductSchema, type DbProduct } from '@/lib/validation/shop';
 import type { CurrencyCode } from '@/lib/shop/currency';
+import { type DbProduct, dbProductSchema } from '@/lib/validation/shop';
 
 const publicProductBaseSelect = {
   id: products.id,
diff --git a/frontend/db/queries/users.ts b/frontend/db/queries/users.ts
index 4eee8841..d9370a1b 100644
--- a/frontend/db/queries/users.ts
+++ b/frontend/db/queries/users.ts
@@ -1,9 +1,11 @@
 import 'server-only';
-import { cache } from 'react';
+
 import { eq, sql } from 'drizzle-orm';
+import { cache } from 'react';
+
 import { db } from '@/db';
-import { users } from '@/db/schema/users';
 import { pointTransactions } from '@/db/schema/points';
+import { users } from '@/db/schema/users';
 
 export const getUserProfile = cache(async (userId: string) => {
   const user = await db.query.users.findFirst({
diff --git a/frontend/db/schema/categories.ts b/frontend/db/schema/categories.ts
index bf42b7c8..f60d83fd 100644
--- a/frontend/db/schema/categories.ts
+++ b/frontend/db/schema/categories.ts
@@ -1,13 +1,13 @@
+import { relations } from 'drizzle-orm';
 import {
+  integer,
   pgTable,
-  uuid,
-  varchar,
+  primaryKey,
   text,
-  integer,
   timestamp,
-  primaryKey,
+  uuid,
+  varchar,
 } from 'drizzle-orm/pg-core';
-import { relations } from 'drizzle-orm';
 
 export const categories = pgTable('categories', {
   id: uuid('id').defaultRandom().primaryKey(),
@@ -44,4 +44,4 @@ export const categoryTranslationsRelations = relations(
       references: [categories.id],
     }),
   })
-);
\ No newline at end of file
+);
diff --git a/frontend/db/schema/emailVerificationTokens.ts b/frontend/db/schema/emailVerificationTokens.ts
index 28620b04..921f1a9a 100644
--- a/frontend/db/schema/emailVerificationTokens.ts
+++ b/frontend/db/schema/emailVerificationTokens.ts
@@ -1,18 +1,14 @@
-import { pgTable, text, timestamp, index } from "drizzle-orm/pg-core";
+import { index, pgTable, text, timestamp } from 'drizzle-orm/pg-core';
 
 export const emailVerificationTokens = pgTable(
-    "email_verification_tokens",
-    {
-        token: text("token").primaryKey(),
-        userId: text("user_id").notNull(),
-        expiresAt: timestamp("expires_at", { mode: "date" }).notNull(),
-        createdAt: timestamp("created_at", { mode: "date" })
-            .notNull()
-            .defaultNow(),
-    },
-    table => ({
-        userIdIdx: index("email_verification_tokens_user_id_idx").on(
-            table.userId
-        ),
-    })
-);
\ No newline at end of file
+  'email_verification_tokens',
+  {
+    token: text('token').primaryKey(),
+    userId: text('user_id').notNull(),
+    expiresAt: timestamp('expires_at', { mode: 'date' }).notNull(),
+    createdAt: timestamp('created_at', { mode: 'date' }).notNull().defaultNow(),
+  },
+  table => ({
+    userIdIdx: index('email_verification_tokens_user_id_idx').on(table.userId),
+  })
+);
diff --git a/frontend/db/schema/index.ts b/frontend/db/schema/index.ts
index d249498f..765dd210 100644
--- a/frontend/db/schema/index.ts
+++ b/frontend/db/schema/index.ts
@@ -1,9 +1,9 @@
 export * from './categories';
-export * from './questions';
-export * from './quiz';
-export * from './users';
-export * from './points';
-export * from './shop';
 export * from './emailVerificationTokens';
 export * from './passwordResetTokens';
+export * from './points';
+export * from './questions';
+export * from './quiz';
 export * from './sessions';
+export * from './shop';
+export * from './users';
diff --git a/frontend/db/schema/passwordResetTokens.ts b/frontend/db/schema/passwordResetTokens.ts
index aef507fc..a76cea62 100644
--- a/frontend/db/schema/passwordResetTokens.ts
+++ b/frontend/db/schema/passwordResetTokens.ts
@@ -1,18 +1,14 @@
-import { pgTable, text, timestamp, index } from "drizzle-orm/pg-core";
+import { index, pgTable, text, timestamp } from 'drizzle-orm/pg-core';
 
 export const passwordResetTokens = pgTable(
-    "password_reset_tokens",
-    {
-        token: text("token").primaryKey(),
-        userId: text("user_id").notNull(),
-        expiresAt: timestamp("expires_at", { mode: "date" }).notNull(),
-        createdAt: timestamp("created_at", { mode: "date" })
-            .notNull()
-            .defaultNow(),
-    },
-    table => ({
-        userIdIdx: index("password_reset_tokens_user_id_idx").on(
-            table.userId
-        ),
-    })
-);
\ No newline at end of file
+  'password_reset_tokens',
+  {
+    token: text('token').primaryKey(),
+    userId: text('user_id').notNull(),
+    expiresAt: timestamp('expires_at', { mode: 'date' }).notNull(),
+    createdAt: timestamp('created_at', { mode: 'date' }).notNull().defaultNow(),
+  },
+  table => ({
+    userIdIdx: index('password_reset_tokens_user_id_idx').on(table.userId),
+  })
+);
diff --git a/frontend/db/schema/points.ts b/frontend/db/schema/points.ts
index 93fee0d4..150a576f 100644
--- a/frontend/db/schema/points.ts
+++ b/frontend/db/schema/points.ts
@@ -1,27 +1,32 @@
 import {
-  pgTable,
-  uuid,
-  text,
+  index,
   integer,
-  varchar,
   jsonb,
+  pgTable,
+  text,
   timestamp,
-  index
+  uuid,
+  varchar,
 } from 'drizzle-orm/pg-core';
+
 import { users } from './users';
 
-export const pointTransactions = pgTable('point_transactions', {
-  id: uuid('id').defaultRandom().primaryKey(),
-  userId: text('user_id')
-    .notNull()
-    .references(() => users.id, { onDelete: 'cascade' }),
-  points: integer('points').notNull().default(0),
-  source: varchar('source', { length: 50 }).notNull().default('quiz'),
-  sourceId: uuid('source_id'),
-  metadata: jsonb('metadata').default({}),
-  createdAt: timestamp('created_at', { withTimezone: true })
-    .notNull()
-    .defaultNow(),
-}, (table) => ({
-  userIdIdx: index('point_transactions_user_id_idx').on(table.userId),
-}));
\ No newline at end of file
+export const pointTransactions = pgTable(
+  'point_transactions',
+  {
+    id: uuid('id').defaultRandom().primaryKey(),
+    userId: text('user_id')
+      .notNull()
+      .references(() => users.id, { onDelete: 'cascade' }),
+    points: integer('points').notNull().default(0),
+    source: varchar('source', { length: 50 }).notNull().default('quiz'),
+    sourceId: uuid('source_id'),
+    metadata: jsonb('metadata').default({}),
+    createdAt: timestamp('created_at', { withTimezone: true })
+      .notNull()
+      .defaultNow(),
+  },
+  table => ({
+    userIdIdx: index('point_transactions_user_id_idx').on(table.userId),
+  })
+);
diff --git a/frontend/db/schema/questions.ts b/frontend/db/schema/questions.ts
index 6512e087..d8ec185a 100644
--- a/frontend/db/schema/questions.ts
+++ b/frontend/db/schema/questions.ts
@@ -1,15 +1,16 @@
+import { relations } from 'drizzle-orm';
 import {
+  index,
+  integer,
+  jsonb,
   pgTable,
-  uuid,
-  varchar,
+  primaryKey,
   text,
-  integer,
   timestamp,
-  primaryKey,
-  jsonb,
-  index,
+  uuid,
+  varchar,
 } from 'drizzle-orm/pg-core';
-import { relations } from 'drizzle-orm';
+
 import { categories } from './categories';
 
 export const questions = pgTable(
diff --git a/frontend/db/schema/quiz.ts b/frontend/db/schema/quiz.ts
index 8bf1569a..52e9b4ff 100644
--- a/frontend/db/schema/quiz.ts
+++ b/frontend/db/schema/quiz.ts
@@ -1,20 +1,21 @@
+import { relations } from 'drizzle-orm';
 import {
-  pgTable,
-  uuid,
-  varchar,
-  text,
-  integer,
   boolean,
-  timestamp,
   decimal,
+  index,
+  integer,
   jsonb,
+  pgTable,
   primaryKey,
-  index,
+  text,
+  timestamp,
   unique,
+  uuid,
+  varchar,
 } from 'drizzle-orm/pg-core';
-import { relations } from 'drizzle-orm';
-import { users } from './users';
+
 import { categories } from './categories';
+import { users } from './users';
 
 export const quizzes = pgTable(
   'quizzes',
@@ -151,7 +152,7 @@ export const quizAttempts = pgTable(
       .defaultNow(),
   },
   table => ({
-    userIdIdx: index('quiz_attempts_user_id_idx').on(table.userId),       // ← NEW
+    userIdIdx: index('quiz_attempts_user_id_idx').on(table.userId), // ← NEW
     quizIdIdx: index('quiz_attempts_quiz_id_idx').on(table.quizId),
     userCompletedAtIdx: index('quiz_attempts_user_completed_at_idx').on(
       table.userId,
diff --git a/frontend/db/schema/sessions.ts b/frontend/db/schema/sessions.ts
index 9d010dc8..11f0490d 100644
--- a/frontend/db/schema/sessions.ts
+++ b/frontend/db/schema/sessions.ts
@@ -1,4 +1,4 @@
-import { pgTable, text, timestamp, index } from 'drizzle-orm/pg-core';
+import { index, pgTable, text, timestamp } from 'drizzle-orm/pg-core';
 
 export const activeSessions = pgTable(
   'active_sessions',
@@ -6,7 +6,9 @@ export const activeSessions = pgTable(
     sessionId: text('session_id').primaryKey(),
     lastActivity: timestamp('last_activity').notNull().defaultNow(),
   },
-  (table) => ({
-    lastActivityIdx: index('active_sessions_last_activity_idx').on(table.lastActivity),
+  table => ({
+    lastActivityIdx: index('active_sessions_last_activity_idx').on(
+      table.lastActivity
+    ),
   })
-);
\ No newline at end of file
+);
diff --git a/frontend/db/schema/shop.ts b/frontend/db/schema/shop.ts
index 1f726234..e14f00db 100644
--- a/frontend/db/schema/shop.ts
+++ b/frontend/db/schema/shop.ts
@@ -2,9 +2,9 @@ import { sql } from 'drizzle-orm';
 import {
   boolean,
   check,
+  index,
   integer,
   jsonb,
-  index,
   numeric,
   pgEnum,
   pgTable,
@@ -14,6 +14,7 @@ import {
   uuid,
   varchar,
 } from 'drizzle-orm/pg-core';
+
 import { users } from '@/db/schema/users';
 import type { PaymentProvider, PaymentStatus } from '@/lib/shop/payments';
 
@@ -262,7 +263,9 @@ export const stripeEvents = pgTable(
     provider: text('provider').notNull().default('stripe'),
     eventId: text('event_id').notNull(),
     paymentIntentId: text('payment_intent_id'),
-    orderId: uuid('order_id').references(() => orders.id, { onDelete: 'cascade' }),
+    orderId: uuid('order_id').references(() => orders.id, {
+      onDelete: 'cascade',
+    }),
     eventType: text('event_type').notNull(),
     paymentStatus: text('payment_status'),
     claimedAt: timestamp('claimed_at', { withTimezone: true }),
diff --git a/frontend/db/schema/users.ts b/frontend/db/schema/users.ts
index 208e9bc7..0c530b6d 100644
--- a/frontend/db/schema/users.ts
+++ b/frontend/db/schema/users.ts
@@ -1,42 +1,39 @@
-import {
-  pgTable,
-  text,
-  timestamp,
-  uniqueIndex,
-} from "drizzle-orm/pg-core";
-import { relations, sql } from "drizzle-orm";
-import { quizAttempts } from "./quiz";
+import { relations, sql } from 'drizzle-orm';
+import { pgTable, text, timestamp, uniqueIndex } from 'drizzle-orm/pg-core';
+
+import { quizAttempts } from './quiz';
 
 export const users = pgTable(
-  "users",
+  'users',
   {
-    id: text("id")
+    id: text('id')
       .primaryKey()
       .notNull()
       .default(sql`gen_random_uuid()`),
 
-    name: text("name"),
+    name: text('name'),
 
-    email: text("email").notNull().unique(),
+    email: text('email').notNull().unique(),
 
-    passwordHash: text("password_hash"),
+    passwordHash: text('password_hash'),
 
-    provider: text("provider").notNull().default("credentials"),
+    provider: text('provider').notNull().default('credentials'),
 
-    providerId: text("provider_id"),
+    providerId: text('provider_id'),
 
-    emailVerified: timestamp("email_verified", { mode: "date" }),
+    emailVerified: timestamp('email_verified', { mode: 'date' }),
 
-    image: text("image"),
+    image: text('image'),
 
-    role: text("role").notNull().default("user"),
+    role: text('role').notNull().default('user'),
 
-    createdAt: timestamp("created_at").notNull().defaultNow(),
+    createdAt: timestamp('created_at').notNull().defaultNow(),
   },
   table => ({
-    providerProviderIdUq: uniqueIndex(
-      "users_provider_provider_id_unique"
-    ).on(table.provider, table.providerId),
+    providerProviderIdUq: uniqueIndex('users_provider_provider_id_unique').on(
+      table.provider,
+      table.providerId
+    ),
   })
 );
 
diff --git a/frontend/db/seed-categories.ts b/frontend/db/seed-categories.ts
index 1067f03e..c1cf2936 100644
--- a/frontend/db/seed-categories.ts
+++ b/frontend/db/seed-categories.ts
@@ -1,7 +1,8 @@
 import 'dotenv/config';
+
+import { categoryData } from '../data/category';
 import { db } from './index';
 import { categories, categoryTranslations } from './schema';
-import { categoryData } from '../data/category';
 
 const LOCALES = ['uk', 'en', 'pl'] as const;
 
diff --git a/frontend/db/seed-demo-leaderboard.ts b/frontend/db/seed-demo-leaderboard.ts
index 3ed5e6e6..ca8568cd 100644
--- a/frontend/db/seed-demo-leaderboard.ts
+++ b/frontend/db/seed-demo-leaderboard.ts
@@ -1,7 +1,8 @@
+import { and, eq, inArray } from 'drizzle-orm';
+
 import { db } from './index';
-import { users } from './schema/users';
 import { pointTransactions } from './schema/points';
-import { and, eq, inArray } from 'drizzle-orm';
+import { users } from './schema/users';
 
 async function main() {
   console.log('Seeding demo leaderboard users...');
diff --git a/frontend/db/seed-questions.ts b/frontend/db/seed-questions.ts
index 52fa7d38..2c86ce17 100644
--- a/frontend/db/seed-questions.ts
+++ b/frontend/db/seed-questions.ts
@@ -1,8 +1,10 @@
 import 'dotenv/config';
+
 import { eq } from 'drizzle-orm';
+
+import rawData from '../parse/questions.json';
 import { db } from './index';
 import { categories, questions, questionTranslations } from './schema';
-import rawData from '../parse/questions.json';
 
 type RawQuestion = {
   category: string;
diff --git a/frontend/db/seed-quiz-angular-advanced.ts b/frontend/db/seed-quiz-angular-advanced.ts
index 42045220..94ecb066 100644
--- a/frontend/db/seed-quiz-angular-advanced.ts
+++ b/frontend/db/seed-quiz-angular-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
-import { readFileSync, existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-angular.ts b/frontend/db/seed-quiz-angular.ts
index 2af5a7c4..c9a4cdec 100644
--- a/frontend/db/seed-quiz-angular.ts
+++ b/frontend/db/seed-quiz-angular.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
-import { readFileSync, existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-css-advanced.ts b/frontend/db/seed-quiz-css-advanced.ts
index 735bfc56..51da4e3e 100644
--- a/frontend/db/seed-quiz-css-advanced.ts
+++ b/frontend/db/seed-quiz-css-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-css.ts b/frontend/db/seed-quiz-css.ts
index a3c2e583..32cbaf20 100644
--- a/frontend/db/seed-quiz-css.ts
+++ b/frontend/db/seed-quiz-css.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-from-json.ts b/frontend/db/seed-quiz-from-json.ts
index 6ff75be0..865fa29c 100644
--- a/frontend/db/seed-quiz-from-json.ts
+++ b/frontend/db/seed-quiz-from-json.ts
@@ -1,18 +1,20 @@
 import 'dotenv/config';
+
+import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
-import { eq } from 'drizzle-orm';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-git.ts b/frontend/db/seed-quiz-git.ts
index 3a11013b..0fbe1893 100644
--- a/frontend/db/seed-quiz-git.ts
+++ b/frontend/db/seed-quiz-git.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
@@ -44,15 +45,18 @@ const QUIZ_METADATA = {
   translations: {
     uk: {
       title: 'Основи Git',
-      description: 'Перевірте свої знання системи контролю версій Git: команди, гілки, злиття, workflows та найкращі практики.',
+      description:
+        'Перевірте свої знання системи контролю версій Git: команди, гілки, злиття, workflows та найкращі практики.',
     },
     en: {
       title: 'Git Fundamentals',
-      description: 'Test your knowledge of Git version control: commands, branches, merging, workflows and best practices.',
+      description:
+        'Test your knowledge of Git version control: commands, branches, merging, workflows and best practices.',
     },
     pl: {
       title: 'Podstawy Git',
-      description: 'Sprawdź swoją wiedzę o systemie kontroli wersji Git: polecenia, gałęzie, scalanie, workflows i najlepsze praktyki.',
+      description:
+        'Sprawdź swoją wiedzę o systemie kontroli wersji Git: polecenia, gałęzie, scalanie, workflows i najlepsze praktyki.',
     },
   },
 };
@@ -62,7 +66,12 @@ function createExplanation(text: string) {
 }
 
 async function loadQuestions(partNumber: number): Promise<QuestionData[]> {
-  const partPath = join(process.cwd(), 'parse', 'git', `git-quiz-part${partNumber}.json`);
+  const partPath = join(
+    process.cwd(),
+    'parse',
+    'git',
+    `git-quiz-part${partNumber}.json`
+  );
   const partData: QuizPartData = JSON.parse(readFileSync(partPath, 'utf-8'));
   return partData.questions;
 }
@@ -77,7 +86,9 @@ async function ensureQuizExists(): Promise<string> {
     .limit(1);
 
   if (!category) {
-    throw new Error(`Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`);
+    throw new Error(
+      `Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`
+    );
   }
 
   const existing = await db.query.quizzes.findFirst({
@@ -88,19 +99,26 @@ async function ensureQuizExists(): Promise<string> {
       where: eq(quizAttempts.quizId, existing.id),
     });
     if (existingAttempt) {
-      throw new Error(`Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`);
+      throw new Error(
+        `Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`
+      );
     }
 
     await db.delete(quizQuestions).where(eq(quizQuestions.quizId, existing.id));
-    await db.delete(quizTranslations).where(eq(quizTranslations.quizId, existing.id));
-    await db.update(quizzes).set({
-      categoryId: category.id,
-      slug: QUIZ_METADATA.slug,
-      displayOrder: 1,
-      questionsCount: QUIZ_METADATA.questionsCount,
-      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-      isActive: true,
-    }).where(eq(quizzes.id, existing.id));
+    await db
+      .delete(quizTranslations)
+      .where(eq(quizTranslations.quizId, existing.id));
+    await db
+      .update(quizzes)
+      .set({
+        categoryId: category.id,
+        slug: QUIZ_METADATA.slug,
+        displayOrder: 1,
+        questionsCount: QUIZ_METADATA.questionsCount,
+        timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+        isActive: true,
+      })
+      .where(eq(quizzes.id, existing.id));
 
     const quizId = existing.id;
     for (const locale of LOCALES) {
@@ -115,14 +133,17 @@ async function ensureQuizExists(): Promise<string> {
     return quizId;
   }
 
-  const [quiz] = await db.insert(quizzes).values({
-    categoryId: category.id,
-    slug: QUIZ_METADATA.slug,
-    displayOrder: 1,
-    questionsCount: QUIZ_METADATA.questionsCount,
-    timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-    isActive: true,
-  }).returning();
+  const [quiz] = await db
+    .insert(quizzes)
+    .values({
+      categoryId: category.id,
+      slug: QUIZ_METADATA.slug,
+      displayOrder: 1,
+      questionsCount: QUIZ_METADATA.questionsCount,
+      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+      isActive: true,
+    })
+    .returning();
 
   for (const locale of LOCALES) {
     await db.insert(quizTranslations).values({
@@ -136,15 +157,24 @@ async function ensureQuizExists(): Promise<string> {
   return quiz.id;
 }
 
-async function seedQuestions(questions: QuestionData[], quizId: string, partNumber: number) {
-  console.log(`Seeding ${questions.length} questions from part ${partNumber}...`);
+async function seedQuestions(
+  questions: QuestionData[],
+  quizId: string,
+  partNumber: number
+) {
+  console.log(
+    `Seeding ${questions.length} questions from part ${partNumber}...`
+  );
 
   for (const question of questions) {
-    const [q] = await db.insert(quizQuestions).values({
-      quizId,
-      displayOrder: question.order,
-      difficulty: question.difficulty,
-    }).returning();
+    const [q] = await db
+      .insert(quizQuestions)
+      .values({
+        quizId,
+        displayOrder: question.order,
+        difficulty: question.difficulty,
+      })
+      .returning();
 
     for (const locale of LOCALES) {
       await db.insert(quizQuestionContent).values({
@@ -157,12 +187,15 @@ async function seedQuestions(questions: QuestionData[], quizId: string, partNumb
 
     for (let i = 0; i < question.answers.length; i++) {
       const answer = question.answers[i];
-      
-      const [a] = await db.insert(quizAnswers).values({
-        quizQuestionId: q.id,
-        displayOrder: i + 1,
-        isCorrect: answer.correct,
-      }).returning();
+
+      const [a] = await db
+        .insert(quizAnswers)
+        .values({
+          quizQuestionId: q.id,
+          displayOrder: i + 1,
+          isCorrect: answer.correct,
+        })
+        .returning();
 
       for (const locale of LOCALES) {
         await db.insert(quizAnswerTranslations).values({
@@ -207,7 +240,9 @@ async function seedQuizFromJson() {
       console.log('\nAll parts seeded successfully!');
       console.log(`   - 1 quiz with ${LOCALES.length} translations`);
       console.log(`   - ${totalQuestions} questions total`);
-      console.log(`   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`
+      );
     } else {
       const partNumber = parseInt(partArg, 10);
 
@@ -222,7 +257,9 @@ async function seedQuizFromJson() {
       console.log('\nPart seeded successfully!');
       console.log(`   - Quiz: ${QUIZ_METADATA.translations.en.title}`);
       console.log(`   - Part ${partNumber}: ${questions.length} questions`);
-      console.log(`   - ${questions.length * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${questions.length * 4} answers with ${LOCALES.length} translations each`
+      );
     }
   } catch (error) {
     console.error('\nError seeding quiz:', error);
@@ -232,7 +269,7 @@ async function seedQuizFromJson() {
 
 seedQuizFromJson()
   .then(() => process.exit(0))
-  .catch((error) => {
+  .catch(error => {
     console.error(error);
     process.exit(1);
   });
diff --git a/frontend/db/seed-quiz-html-advanced.ts b/frontend/db/seed-quiz-html-advanced.ts
index fac7337f..a3d22456 100644
--- a/frontend/db/seed-quiz-html-advanced.ts
+++ b/frontend/db/seed-quiz-html-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-html.ts b/frontend/db/seed-quiz-html.ts
index 4847f686..de29fc1d 100644
--- a/frontend/db/seed-quiz-html.ts
+++ b/frontend/db/seed-quiz-html.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-javascript-advanced.ts b/frontend/db/seed-quiz-javascript-advanced.ts
index 8854549a..904521ee 100644
--- a/frontend/db/seed-quiz-javascript-advanced.ts
+++ b/frontend/db/seed-quiz-javascript-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-javascript.ts b/frontend/db/seed-quiz-javascript.ts
index 74ed960d..540ae82c 100644
--- a/frontend/db/seed-quiz-javascript.ts
+++ b/frontend/db/seed-quiz-javascript.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-nodejs-advanced.ts b/frontend/db/seed-quiz-nodejs-advanced.ts
index e3241f36..b562b648 100644
--- a/frontend/db/seed-quiz-nodejs-advanced.ts
+++ b/frontend/db/seed-quiz-nodejs-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
-import { readFileSync, existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-nodejs.ts b/frontend/db/seed-quiz-nodejs.ts
index 4f393930..de4fcdd1 100644
--- a/frontend/db/seed-quiz-nodejs.ts
+++ b/frontend/db/seed-quiz-nodejs.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
-import { readFileSync, existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-react.ts b/frontend/db/seed-quiz-react.ts
index 39931d82..9782bc26 100644
--- a/frontend/db/seed-quiz-react.ts
+++ b/frontend/db/seed-quiz-react.ts
@@ -1,16 +1,18 @@
 import 'dotenv/config';
+
+import { randomUUID } from 'crypto';
 import { eq } from 'drizzle-orm';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
-import { randomUUID } from 'crypto';
 
 type Locale = 'uk' | 'en' | 'pl';
 
@@ -987,7 +989,7 @@ async function seedReactQuiz() {
   }
 }
 
-async function cleanupReactQuiz() {
+async function _cleanupReactQuiz() {
   console.log('🧹 Cleaning up React quiz...');
 
   await db.delete(quizAnswerTranslations);
@@ -1006,10 +1008,3 @@ seedReactQuiz()
     console.error(error);
     process.exit(1);
   });
-
-// cleanupReactQuiz()
-//   .then(() => process.exit(0))
-//   .catch((error) => {
-//     console.error(error);
-//     process.exit(1);
-//   });
diff --git a/frontend/db/seed-quiz-typescript-advanced.ts b/frontend/db/seed-quiz-typescript-advanced.ts
index 80783a11..0c7573d9 100644
--- a/frontend/db/seed-quiz-typescript-advanced.ts
+++ b/frontend/db/seed-quiz-typescript-advanced.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
@@ -44,15 +45,18 @@ const QUIZ_METADATA = {
   translations: {
     uk: {
       title: 'TypeScript Advanced',
-      description: 'Поглиблений квіз з TypeScript: декоратори, рефлексія, утилітні типи, infer, template literal types, патерни проектування та інтеграція з фреймворками.',
+      description:
+        'Поглиблений квіз з TypeScript: декоратори, рефлексія, утилітні типи, infer, template literal types, патерни проектування та інтеграція з фреймворками.',
     },
     en: {
       title: 'TypeScript Advanced',
-      description: 'Advanced TypeScript quiz: decorators, reflection, utility types, infer, template literal types, design patterns and framework integration.',
+      description:
+        'Advanced TypeScript quiz: decorators, reflection, utility types, infer, template literal types, design patterns and framework integration.',
     },
     pl: {
       title: 'TypeScript Advanced',
-      description: 'Zaawansowany quiz z TypeScript: dekoratory, refleksja, typy narzędziowe, infer, template literal types, wzorce projektowe i integracja z frameworkami.',
+      description:
+        'Zaawansowany quiz z TypeScript: dekoratory, refleksja, typy narzędziowe, infer, template literal types, wzorce projektowe i integracja z frameworkami.',
     },
   },
 };
@@ -62,7 +66,13 @@ function createExplanation(text: string) {
 }
 
 async function loadQuestions(partNumber: number): Promise<QuestionData[]> {
-  const partPath = join(process.cwd(), 'parse', 'typescript', 'advanced', `typescript-advanced-quiz-part${partNumber}.json`);
+  const partPath = join(
+    process.cwd(),
+    'parse',
+    'typescript',
+    'advanced',
+    `typescript-advanced-quiz-part${partNumber}.json`
+  );
   const partData: QuizPartData = JSON.parse(readFileSync(partPath, 'utf-8'));
   return partData.questions;
 }
@@ -77,7 +87,9 @@ async function ensureQuizExists(): Promise<string> {
     .limit(1);
 
   if (!category) {
-    throw new Error(`Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`);
+    throw new Error(
+      `Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`
+    );
   }
 
   const existing = await db.query.quizzes.findFirst({
@@ -88,19 +100,26 @@ async function ensureQuizExists(): Promise<string> {
       where: eq(quizAttempts.quizId, existing.id),
     });
     if (existingAttempt) {
-      throw new Error(`Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`);
+      throw new Error(
+        `Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`
+      );
     }
 
     await db.delete(quizQuestions).where(eq(quizQuestions.quizId, existing.id));
-    await db.delete(quizTranslations).where(eq(quizTranslations.quizId, existing.id));
-    await db.update(quizzes).set({
-      categoryId: category.id,
-      slug: QUIZ_METADATA.slug,
-      displayOrder: 2,
-      questionsCount: QUIZ_METADATA.questionsCount,
-      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-      isActive: true,
-    }).where(eq(quizzes.id, existing.id));
+    await db
+      .delete(quizTranslations)
+      .where(eq(quizTranslations.quizId, existing.id));
+    await db
+      .update(quizzes)
+      .set({
+        categoryId: category.id,
+        slug: QUIZ_METADATA.slug,
+        displayOrder: 2,
+        questionsCount: QUIZ_METADATA.questionsCount,
+        timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+        isActive: true,
+      })
+      .where(eq(quizzes.id, existing.id));
 
     const quizId = existing.id;
     for (const locale of LOCALES) {
@@ -115,14 +134,17 @@ async function ensureQuizExists(): Promise<string> {
     return quizId;
   }
 
-  const [quiz] = await db.insert(quizzes).values({
-    categoryId: category.id,
-    slug: QUIZ_METADATA.slug,
-    displayOrder: 2,
-    questionsCount: QUIZ_METADATA.questionsCount,
-    timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-    isActive: true,
-  }).returning();
+  const [quiz] = await db
+    .insert(quizzes)
+    .values({
+      categoryId: category.id,
+      slug: QUIZ_METADATA.slug,
+      displayOrder: 2,
+      questionsCount: QUIZ_METADATA.questionsCount,
+      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+      isActive: true,
+    })
+    .returning();
 
   for (const locale of LOCALES) {
     await db.insert(quizTranslations).values({
@@ -136,15 +158,24 @@ async function ensureQuizExists(): Promise<string> {
   return quiz.id;
 }
 
-async function seedQuestions(questions: QuestionData[], quizId: string, partNumber: number) {
-  console.log(`Seeding ${questions.length} questions from part ${partNumber}...`);
+async function seedQuestions(
+  questions: QuestionData[],
+  quizId: string,
+  partNumber: number
+) {
+  console.log(
+    `Seeding ${questions.length} questions from part ${partNumber}...`
+  );
 
   for (const question of questions) {
-    const [q] = await db.insert(quizQuestions).values({
-      quizId,
-      displayOrder: question.order,
-      difficulty: question.difficulty,
-    }).returning();
+    const [q] = await db
+      .insert(quizQuestions)
+      .values({
+        quizId,
+        displayOrder: question.order,
+        difficulty: question.difficulty,
+      })
+      .returning();
 
     for (const locale of LOCALES) {
       await db.insert(quizQuestionContent).values({
@@ -157,12 +188,15 @@ async function seedQuestions(questions: QuestionData[], quizId: string, partNumb
 
     for (let i = 0; i < question.answers.length; i++) {
       const answer = question.answers[i];
-      
-      const [a] = await db.insert(quizAnswers).values({
-        quizQuestionId: q.id,
-        displayOrder: i + 1,
-        isCorrect: answer.correct,
-      }).returning();
+
+      const [a] = await db
+        .insert(quizAnswers)
+        .values({
+          quizQuestionId: q.id,
+          displayOrder: i + 1,
+          isCorrect: answer.correct,
+        })
+        .returning();
 
       for (const locale of LOCALES) {
         await db.insert(quizAnswerTranslations).values({
@@ -183,9 +217,13 @@ async function seedQuizFromJson() {
 
   if (!partArg) {
     console.error('Error: Please specify which part to upload');
-    console.log('Usage: npx tsx db/seeds/seed-quiz-typescript-advanced.ts <part-number>');
+    console.log(
+      'Usage: npx tsx db/seeds/seed-quiz-typescript-advanced.ts <part-number>'
+    );
     console.log('Example: npx tsx db/seeds/seed-quiz-typescript-advanced.ts 1');
-    console.log('Or upload all: npx tsx db/seeds/seed-quiz-typescript-advanced.ts all');
+    console.log(
+      'Or upload all: npx tsx db/seeds/seed-quiz-typescript-advanced.ts all'
+    );
     process.exit(1);
   }
 
@@ -207,7 +245,9 @@ async function seedQuizFromJson() {
       console.log('\nAll parts seeded successfully!');
       console.log(`   - 1 quiz with ${LOCALES.length} translations`);
       console.log(`   - ${totalQuestions} questions total`);
-      console.log(`   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`
+      );
     } else {
       const partNumber = parseInt(partArg, 10);
 
@@ -222,7 +262,9 @@ async function seedQuizFromJson() {
       console.log('\nPart seeded successfully!');
       console.log(`   - Quiz: ${QUIZ_METADATA.translations.en.title}`);
       console.log(`   - Part ${partNumber}: ${questions.length} questions`);
-      console.log(`   - ${questions.length * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${questions.length * 4} answers with ${LOCALES.length} translations each`
+      );
     }
   } catch (error) {
     console.error('\nError seeding quiz:', error);
@@ -232,7 +274,7 @@ async function seedQuizFromJson() {
 
 seedQuizFromJson()
   .then(() => process.exit(0))
-  .catch((error) => {
+  .catch(error => {
     console.error(error);
     process.exit(1);
   });
diff --git a/frontend/db/seed-quiz-typescript.ts b/frontend/db/seed-quiz-typescript.ts
index bd46baf9..614ebeee 100644
--- a/frontend/db/seed-quiz-typescript.ts
+++ b/frontend/db/seed-quiz-typescript.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
 import { readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
diff --git a/frontend/db/seed-quiz-verify.ts b/frontend/db/seed-quiz-verify.ts
index 650a4fca..bd24e457 100644
--- a/frontend/db/seed-quiz-verify.ts
+++ b/frontend/db/seed-quiz-verify.ts
@@ -1,13 +1,15 @@
-import { db } from './index';
+import { eq, sql } from 'drizzle-orm';
+
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from '@/db/schema/quiz';
-import { eq, sql } from 'drizzle-orm';
+
+import { db } from './index';
 
 async function verifyQuizSeed() {
   console.log('Verifying quiz seed data...\n');
diff --git a/frontend/db/seed-quiz-vue.ts b/frontend/db/seed-quiz-vue.ts
index ac260d00..96f2fd08 100644
--- a/frontend/db/seed-quiz-vue.ts
+++ b/frontend/db/seed-quiz-vue.ts
@@ -1,16 +1,17 @@
 import { eq } from 'drizzle-orm';
-import { readFileSync, existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { db } from './index';
 import { categories } from './schema/categories';
 import {
-  quizzes,
-  quizTranslations,
-  quizQuestions,
-  quizQuestionContent,
   quizAnswers,
   quizAnswerTranslations,
   quizAttempts,
+  quizQuestionContent,
+  quizQuestions,
+  quizTranslations,
+  quizzes,
 } from './schema/quiz';
 
 type Locale = 'uk' | 'en' | 'pl';
@@ -44,15 +45,18 @@ const QUIZ_METADATA = {
   translations: {
     uk: {
       title: 'Основи Vue.js',
-      description: 'Перевірте свої знання базових концепцій Vue.js: компоненти, реактивність, директиви, Composition API, Vue Router, Pinia та життєвий цикл.',
+      description:
+        'Перевірте свої знання базових концепцій Vue.js: компоненти, реактивність, директиви, Composition API, Vue Router, Pinia та життєвий цикл.',
     },
     en: {
       title: 'Vue.js Fundamentals',
-      description: 'Test your knowledge of Vue.js basics: components, reactivity, directives, Composition API, Vue Router, Pinia, and lifecycle.',
+      description:
+        'Test your knowledge of Vue.js basics: components, reactivity, directives, Composition API, Vue Router, Pinia, and lifecycle.',
     },
     pl: {
       title: 'Podstawy Vue.js',
-      description: 'Sprawdź swoją wiedzę o podstawach Vue.js: komponenty, reaktywność, dyrektywy, Composition API, Vue Router, Pinia i cykl życia.',
+      description:
+        'Sprawdź swoją wiedzę o podstawach Vue.js: komponenty, reaktywność, dyrektywy, Composition API, Vue Router, Pinia i cykl życia.',
     },
   },
 };
@@ -66,7 +70,14 @@ const projectRoot = existsSync(join(process.cwd(), 'json'))
   : join(process.cwd(), '..');
 
 async function loadQuestions(partNumber: number): Promise<QuestionData[]> {
-  const partPath = join(projectRoot, 'json', 'quizzes', 'vue', 'beginner_medium', `vue-quiz-part${partNumber}.json`);
+  const partPath = join(
+    projectRoot,
+    'json',
+    'quizzes',
+    'vue',
+    'beginner_medium',
+    `vue-quiz-part${partNumber}.json`
+  );
   const partData: QuizPartData = JSON.parse(readFileSync(partPath, 'utf-8'));
   return partData.questions;
 }
@@ -81,7 +92,9 @@ async function ensureQuizExists(): Promise<string> {
     .limit(1);
 
   if (!category) {
-    throw new Error(`Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`);
+    throw new Error(
+      `Category "${CATEGORY_SLUG}" not found. Run seed:categories first.`
+    );
   }
 
   const existing = await db.query.quizzes.findFirst({
@@ -93,19 +106,26 @@ async function ensureQuizExists(): Promise<string> {
       where: eq(quizAttempts.quizId, existing.id),
     });
     if (existingAttempt) {
-      throw new Error(`Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`);
+      throw new Error(
+        `Quiz ${QUIZ_METADATA.slug} has existing attempts. Aborting to avoid data loss.`
+      );
     }
 
     await db.delete(quizQuestions).where(eq(quizQuestions.quizId, existing.id));
-    await db.delete(quizTranslations).where(eq(quizTranslations.quizId, existing.id));
-    await db.update(quizzes).set({
-      categoryId: category.id,
-      slug: QUIZ_METADATA.slug,
-      displayOrder: 1,
-      questionsCount: QUIZ_METADATA.questionsCount,
-      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-      isActive: true,
-    }).where(eq(quizzes.id, existing.id));
+    await db
+      .delete(quizTranslations)
+      .where(eq(quizTranslations.quizId, existing.id));
+    await db
+      .update(quizzes)
+      .set({
+        categoryId: category.id,
+        slug: QUIZ_METADATA.slug,
+        displayOrder: 1,
+        questionsCount: QUIZ_METADATA.questionsCount,
+        timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+        isActive: true,
+      })
+      .where(eq(quizzes.id, existing.id));
 
     const quizId = existing.id;
     for (const locale of LOCALES) {
@@ -120,14 +140,17 @@ async function ensureQuizExists(): Promise<string> {
     return quizId;
   }
 
-  const [quiz] = await db.insert(quizzes).values({
-    categoryId: category.id,
-    slug: QUIZ_METADATA.slug,
-    displayOrder: 1,
-    questionsCount: QUIZ_METADATA.questionsCount,
-    timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
-    isActive: true,
-  }).returning();
+  const [quiz] = await db
+    .insert(quizzes)
+    .values({
+      categoryId: category.id,
+      slug: QUIZ_METADATA.slug,
+      displayOrder: 1,
+      questionsCount: QUIZ_METADATA.questionsCount,
+      timeLimitSeconds: QUIZ_METADATA.timeLimitSeconds,
+      isActive: true,
+    })
+    .returning();
 
   for (const locale of LOCALES) {
     await db.insert(quizTranslations).values({
@@ -141,15 +164,24 @@ async function ensureQuizExists(): Promise<string> {
   return quiz.id;
 }
 
-async function seedQuestions(questions: QuestionData[], quizId: string, partNumber: number) {
-  console.log(`Seeding ${questions.length} questions from part ${partNumber}...`);
+async function seedQuestions(
+  questions: QuestionData[],
+  quizId: string,
+  partNumber: number
+) {
+  console.log(
+    `Seeding ${questions.length} questions from part ${partNumber}...`
+  );
 
   for (const question of questions) {
-    const [q] = await db.insert(quizQuestions).values({
-      quizId,
-      displayOrder: question.order,
-      difficulty: question.difficulty,
-    }).returning();
+    const [q] = await db
+      .insert(quizQuestions)
+      .values({
+        quizId,
+        displayOrder: question.order,
+        difficulty: question.difficulty,
+      })
+      .returning();
 
     for (const locale of LOCALES) {
       await db.insert(quizQuestionContent).values({
@@ -162,12 +194,15 @@ async function seedQuestions(questions: QuestionData[], quizId: string, partNumb
 
     for (let i = 0; i < question.answers.length; i++) {
       const answer = question.answers[i];
-      
-      const [a] = await db.insert(quizAnswers).values({
-        quizQuestionId: q.id,
-        displayOrder: i + 1,
-        isCorrect: answer.correct,
-      }).returning();
+
+      const [a] = await db
+        .insert(quizAnswers)
+        .values({
+          quizQuestionId: q.id,
+          displayOrder: i + 1,
+          isCorrect: answer.correct,
+        })
+        .returning();
 
       for (const locale of LOCALES) {
         await db.insert(quizAnswerTranslations).values({
@@ -212,7 +247,9 @@ async function seedQuizFromJson() {
       console.log('\nAll parts seeded successfully!');
       console.log(`   - 1 quiz with ${LOCALES.length} translations`);
       console.log(`   - ${totalQuestions} questions total`);
-      console.log(`   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${totalQuestions * 4} answers with ${LOCALES.length} translations each`
+      );
     } else {
       const partNumber = parseInt(partArg, 10);
 
@@ -227,7 +264,9 @@ async function seedQuizFromJson() {
       console.log('\nPart seeded successfully!');
       console.log(`   - Quiz: ${QUIZ_METADATA.translations.en.title}`);
       console.log(`   - Part ${partNumber}: ${questions.length} questions`);
-      console.log(`   - ${questions.length * 4} answers with ${LOCALES.length} translations each`);
+      console.log(
+        `   - ${questions.length * 4} answers with ${LOCALES.length} translations each`
+      );
     }
   } catch (error) {
     console.error('\nError seeding quiz:', error);
@@ -237,7 +276,7 @@ async function seedQuizFromJson() {
 
 seedQuizFromJson()
   .then(() => process.exit(0))
-  .catch((error) => {
+  .catch(error => {
     console.error(error);
     process.exit(1);
   });
diff --git a/frontend/db/seed-users.ts b/frontend/db/seed-users.ts
index 2f6d0165..5dfd7dc5 100644
--- a/frontend/db/seed-users.ts
+++ b/frontend/db/seed-users.ts
@@ -1,40 +1,41 @@
-import "dotenv/config";
-import bcrypt from "bcryptjs";
+import 'dotenv/config';
 
-import { db } from "./index";
-import { users } from "./schema";
-import { eq } from "drizzle-orm";
+import bcrypt from 'bcryptjs';
+import { eq } from 'drizzle-orm';
+
+import { db } from './index';
+import { users } from './schema';
 
 if (!process.env.DATABASE_URL) {
-  throw new Error("DATABASE_URL is missing");
+  throw new Error('DATABASE_URL is missing');
 }
 
 async function main() {
-  console.log("[seed] Seeding users...");
+  console.log('[seed] Seeding users...');
 
-  const passwordHash = await bcrypt.hash("password123", 10);
+  const passwordHash = await bcrypt.hash('password123', 10);
 
   const seedUsers = [
     {
-      name: "Admin User",
-      email: "admin@example.com",
+      name: 'Admin User',
+      email: 'admin@example.com',
       passwordHash,
       emailVerified: new Date(),
-      role: "admin",
+      role: 'admin',
     },
     {
-      name: "Test User",
-      email: "user@example.com",
+      name: 'Test User',
+      email: 'user@example.com',
       passwordHash,
       emailVerified: null,
-      role: "user",
+      role: 'user',
     },
     {
-      name: "Google User",
-      email: "google@example.com",
+      name: 'Google User',
+      email: 'google@example.com',
       passwordHash: null,
       emailVerified: new Date(),
-      role: "user",
+      role: 'user',
     },
   ] as const;
 
@@ -54,12 +55,12 @@ async function main() {
     console.log(`[seed] Inserted user: ${user.email}`);
   }
 
-  console.log("[seed] Users seeding completed");
+  console.log('[seed] Users seeding completed');
 }
 
 main()
   .then(() => process.exit(0))
-  .catch((err) => {
-    console.error("[seed] Failed:", err);
+  .catch(err => {
+    console.error('[seed] Failed:', err);
     process.exit(1);
   });
diff --git a/frontend/drizzle/meta/0000_snapshot.json b/frontend/drizzle/meta/0000_snapshot.json
index 086f0216..0aa88c18 100644
--- a/frontend/drizzle/meta/0000_snapshot.json
+++ b/frontend/drizzle/meta/0000_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -1943,12 +1839,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2242,12 +2134,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2371,18 +2259,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2410,22 +2292,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2438,4 +2310,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/0001_snapshot.json b/frontend/drizzle/meta/0001_snapshot.json
index 50cd427b..3c61d472 100644
--- a/frontend/drizzle/meta/0001_snapshot.json
+++ b/frontend/drizzle/meta/0001_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -2038,12 +1934,8 @@
           "name": "payment_attempts_order_id_orders_id_fk",
           "tableFrom": "payment_attempts",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2169,12 +2061,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2468,12 +2356,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2597,18 +2481,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2636,22 +2514,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2664,4 +2532,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/0002_snapshot.json b/frontend/drizzle/meta/0002_snapshot.json
index fd0c1606..6e2c17f3 100644
--- a/frontend/drizzle/meta/0002_snapshot.json
+++ b/frontend/drizzle/meta/0002_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -2038,12 +1934,8 @@
           "name": "payment_attempts_order_id_orders_id_fk",
           "tableFrom": "payment_attempts",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2169,12 +2061,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2468,12 +2356,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2639,18 +2523,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2678,22 +2556,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2706,4 +2574,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/0003_snapshot.json b/frontend/drizzle/meta/0003_snapshot.json
index 4150d714..e581a44e 100644
--- a/frontend/drizzle/meta/0003_snapshot.json
+++ b/frontend/drizzle/meta/0003_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1362,12 +1280,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1375,12 +1289,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1537,12 +1447,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1550,12 +1456,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1788,12 +1690,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1803,9 +1701,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -2038,12 +1934,8 @@
           "name": "payment_attempts_order_id_orders_id_fk",
           "tableFrom": "payment_attempts",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2169,12 +2061,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2501,12 +2389,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2672,18 +2556,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2711,22 +2589,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2739,4 +2607,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/0004_snapshot.json b/frontend/drizzle/meta/0004_snapshot.json
index fb3c0b67..5cca1738 100644
--- a/frontend/drizzle/meta/0004_snapshot.json
+++ b/frontend/drizzle/meta/0004_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1421,12 +1339,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1434,12 +1348,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1596,12 +1506,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1609,12 +1515,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1847,12 +1749,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1862,9 +1760,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -2097,12 +1993,8 @@
           "name": "payment_attempts_order_id_orders_id_fk",
           "tableFrom": "payment_attempts",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2232,12 +2124,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2564,12 +2452,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -2735,18 +2619,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2774,22 +2652,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2802,4 +2670,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/0005_snapshot.json b/frontend/drizzle/meta/0005_snapshot.json
index 7e8abb4f..a1f68e72 100644
--- a/frontend/drizzle/meta/0005_snapshot.json
+++ b/frontend/drizzle/meta/0005_snapshot.json
@@ -43,9 +43,7 @@
         "categories_slug_unique": {
           "name": "categories_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "slug"
-          ]
+          "columns": ["slug"]
         }
       },
       "policies": {},
@@ -81,12 +79,8 @@
           "name": "category_translations_category_id_categories_id_fk",
           "tableFrom": "category_translations",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -94,10 +88,7 @@
       "compositePrimaryKeys": {
         "category_translations_category_id_locale_pk": {
           "name": "category_translations_category_id_locale_pk",
-          "columns": [
-            "category_id",
-            "locale"
-          ]
+          "columns": ["category_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -140,12 +131,8 @@
           "name": "question_translations_question_id_questions_id_fk",
           "tableFrom": "question_translations",
           "tableTo": "questions",
-          "columnsFrom": [
-            "question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -153,10 +140,7 @@
       "compositePrimaryKeys": {
         "question_translations_question_id_locale_pk": {
           "name": "question_translations_question_id_locale_pk",
-          "columns": [
-            "question_id",
-            "locale"
-          ]
+          "columns": ["question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -238,12 +222,8 @@
           "name": "questions_category_id_categories_id_fk",
           "tableFrom": "questions",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -283,12 +263,8 @@
           "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_answer_translations",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "quiz_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -296,10 +272,7 @@
       "compositePrimaryKeys": {
         "quiz_answer_translations_quiz_answer_id_locale_pk": {
           "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
-          "columns": [
-            "quiz_answer_id",
-            "locale"
-          ]
+          "columns": ["quiz_answer_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -366,12 +339,8 @@
           "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -447,12 +416,8 @@
           "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_attempts",
-          "columnsFrom": [
-            "attempt_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["attempt_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -460,12 +425,8 @@
           "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -473,12 +434,8 @@
           "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
           "tableFrom": "quiz_attempt_answers",
           "tableTo": "quiz_answers",
-          "columnsFrom": [
-            "selected_answer_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["selected_answer_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -678,12 +635,8 @@
           "name": "quiz_attempts_user_id_users_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -691,12 +644,8 @@
           "name": "quiz_attempts_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_attempts",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -742,12 +691,8 @@
           "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
           "tableFrom": "quiz_question_content",
           "tableTo": "quiz_questions",
-          "columnsFrom": [
-            "quiz_question_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_question_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -755,10 +700,7 @@
       "compositePrimaryKeys": {
         "quiz_question_content_quiz_question_id_locale_pk": {
           "name": "quiz_question_content_quiz_question_id_locale_pk",
-          "columns": [
-            "quiz_question_id",
-            "locale"
-          ]
+          "columns": ["quiz_question_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -838,12 +780,8 @@
           "name": "quiz_questions_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_questions",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -889,12 +827,8 @@
           "name": "quiz_translations_quiz_id_quizzes_id_fk",
           "tableFrom": "quiz_translations",
           "tableTo": "quizzes",
-          "columnsFrom": [
-            "quiz_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["quiz_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -902,10 +836,7 @@
       "compositePrimaryKeys": {
         "quiz_translations_quiz_id_locale_pk": {
           "name": "quiz_translations_quiz_id_locale_pk",
-          "columns": [
-            "quiz_id",
-            "locale"
-          ]
+          "columns": ["quiz_id", "locale"]
         }
       },
       "uniqueConstraints": {},
@@ -1000,12 +931,8 @@
           "name": "quizzes_category_id_categories_id_fk",
           "tableFrom": "quizzes",
           "tableTo": "categories",
-          "columnsFrom": [
-            "category_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["category_id"],
+          "columnsTo": ["id"],
           "onDelete": "restrict",
           "onUpdate": "no action"
         }
@@ -1015,10 +942,7 @@
         "quizzes_category_id_slug_unique": {
           "name": "quizzes_category_id_slug_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "category_id",
-            "slug"
-          ]
+          "columns": ["category_id", "slug"]
         }
       },
       "policies": {},
@@ -1123,9 +1047,7 @@
         "users_email_unique": {
           "name": "users_email_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "email"
-          ]
+          "columns": ["email"]
         }
       },
       "policies": {},
@@ -1206,12 +1128,8 @@
           "name": "point_transactions_user_id_users_id_fk",
           "tableFrom": "point_transactions",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -1421,12 +1339,8 @@
           "name": "inventory_moves_order_id_orders_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1434,12 +1348,8 @@
           "name": "inventory_moves_product_id_products_id_fk",
           "tableFrom": "inventory_moves",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1596,12 +1506,8 @@
           "name": "order_items_order_id_orders_id_fk",
           "tableFrom": "order_items",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         },
@@ -1609,12 +1515,8 @@
           "name": "order_items_product_id_products_id_fk",
           "tableFrom": "order_items",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "no action",
           "onUpdate": "no action"
         }
@@ -1847,12 +1749,8 @@
           "name": "orders_user_id_users_id_fk",
           "tableFrom": "orders",
           "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
           "onDelete": "set null",
           "onUpdate": "no action"
         }
@@ -1862,9 +1760,7 @@
         "orders_idempotency_key_unique": {
           "name": "orders_idempotency_key_unique",
           "nullsNotDistinct": false,
-          "columns": [
-            "idempotency_key"
-          ]
+          "columns": ["idempotency_key"]
         }
       },
       "policies": {},
@@ -2097,12 +1993,8 @@
           "name": "payment_attempts_order_id_orders_id_fk",
           "tableFrom": "payment_attempts",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2232,12 +2124,8 @@
           "name": "product_prices_product_id_products_id_fk",
           "tableFrom": "product_prices",
           "tableTo": "products",
-          "columnsFrom": [
-            "product_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["product_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2564,12 +2452,8 @@
           "name": "stripe_events_order_id_orders_id_fk",
           "tableFrom": "stripe_events",
           "tableTo": "orders",
-          "columnsFrom": [
-            "order_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
+          "columnsFrom": ["order_id"],
+          "columnsTo": ["id"],
           "onDelete": "cascade",
           "onUpdate": "no action"
         }
@@ -2735,18 +2619,12 @@
     "public.currency": {
       "name": "currency",
       "schema": "public",
-      "values": [
-        "USD",
-        "UAH"
-      ]
+      "values": ["USD", "UAH"]
     },
     "public.inventory_move_type": {
       "name": "inventory_move_type",
       "schema": "public",
-      "values": [
-        "reserve",
-        "release"
-      ]
+      "values": ["reserve", "release"]
     },
     "public.inventory_status": {
       "name": "inventory_status",
@@ -2774,22 +2652,12 @@
     "public.payment_status": {
       "name": "payment_status",
       "schema": "public",
-      "values": [
-        "pending",
-        "requires_payment",
-        "paid",
-        "failed",
-        "refunded"
-      ]
+      "values": ["pending", "requires_payment", "paid", "failed", "refunded"]
     },
     "public.product_badge": {
       "name": "product_badge",
       "schema": "public",
-      "values": [
-        "NEW",
-        "SALE",
-        "NONE"
-      ]
+      "values": ["NEW", "SALE", "NONE"]
     }
   },
   "schemas": {},
@@ -2802,4 +2670,4 @@
     "schemas": {},
     "tables": {}
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/drizzle/meta/_journal.json b/frontend/drizzle/meta/_journal.json
index fc375b9f..177e50c8 100644
--- a/frontend/drizzle/meta/_journal.json
+++ b/frontend/drizzle/meta/_journal.json
@@ -45,4 +45,4 @@
       "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index 220a4ec3..d5f66b4e 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -1,24 +1,49 @@
-import { defineConfig, globalIgnores } from "eslint/config";
-import nextVitals from "eslint-config-next/core-web-vitals";
-import nextTs from "eslint-config-next/typescript";
+import { defineConfig, globalIgnores } from 'eslint/config';
+import nextVitals from 'eslint-config-next/core-web-vitals';
+import nextTs from 'eslint-config-next/typescript';
+import reactHooks from 'eslint-plugin-react-hooks';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
 
-const eslintConfig = defineConfig([
+export default defineConfig([
   ...nextVitals,
   ...nextTs,
 
   globalIgnores([
-    ".next/**",
-    "out/**",
-    "build/**",
-    "next-env.d.ts",
+    '.next/**',
+    'out/**',
+    'build/**',
+    'next-env.d.ts',
+    '_dev-notes/**',
   ]),
 
-  // Allow explicit any
   {
+    plugins: {
+      'react-hooks': reactHooks,
+      'simple-import-sort': simpleImportSort,
+    },
+
     rules: {
-      "@typescript-eslint/no-explicit-any": "off",
+      /**
+       * React hooks — must have
+       */
+      'react-hooks/rules-of-hooks': 'error',
+      'react-hooks/exhaustive-deps': 'warn',
+
+      /**
+       * Import sorting (auto-fix)
+       */
+      'simple-import-sort/imports': 'error',
+      'simple-import-sort/exports': 'error',
+
+      /**
+       * TS relax
+       */
+      '@typescript-eslint/no-explicit-any': 'off',
+
+      /**
+       * Let Prettier handle formatting
+       */
+      'react/jsx-curly-newline': 'off',
     },
   },
 ]);
-
-export default eslintConfig;
diff --git a/frontend/hooks/use-mounted.ts b/frontend/hooks/use-mounted.ts
index 9834ef48..6d82fe64 100644
--- a/frontend/hooks/use-mounted.ts
+++ b/frontend/hooks/use-mounted.ts
@@ -1,19 +1,19 @@
-"use client"
+'use client';
 
-import { useSyncExternalStore } from "react"
+import { useSyncExternalStore } from 'react';
 
 function subscribe() {
-  return () => {}
+  return () => {};
 }
 
 function getSnapshot() {
-  return true
+  return true;
 }
 
 function getServerSnapshot() {
-  return false
+  return false;
 }
 
 export function useMounted(): boolean {
-  return useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot)
+  return useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
 }
diff --git a/frontend/hooks/useAntiCheat.ts b/frontend/hooks/useAntiCheat.ts
index 2922d000..752e898f 100644
--- a/frontend/hooks/useAntiCheat.ts
+++ b/frontend/hooks/useAntiCheat.ts
@@ -1,7 +1,7 @@
 'use client';
 
-import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslations } from 'next-intl';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { toast } from 'sonner';
 
 export type AntiCheatViolation = {
diff --git a/frontend/hooks/useQuizGuards.ts b/frontend/hooks/useQuizGuards.ts
index 70203bd0..aa54e404 100644
--- a/frontend/hooks/useQuizGuards.ts
+++ b/frontend/hooks/useQuizGuards.ts
@@ -1,4 +1,5 @@
 import { useEffect, useRef } from 'react';
+
 import { clearQuizSession } from '@/lib/quiz/quiz-session';
 import { getQuizReloadKey } from '@/lib/quiz/quiz-storage-keys';
 
@@ -9,14 +10,19 @@ type UseQuizGuardsParams = {
   resetViolations: () => void;
 };
 
-export function useQuizGuards({ quizId, status, onExit, resetViolations }: UseQuizGuardsParams): { markQuitting: () => void } {
+export function useQuizGuards({
+  quizId,
+  status,
+  onExit,
+  resetViolations,
+}: UseQuizGuardsParams): { markQuitting: () => void } {
   const isReloadingRef = useRef(false);
   const statusRef = useRef(status);
   const reloadKey = getQuizReloadKey(quizId);
   const isQuittingRef = useRef(false);
   const markQuitting = () => {
-  isQuittingRef.current = true;
-};
+    isQuittingRef.current = true;
+  };
 
   useEffect(() => {
     statusRef.current = status;
@@ -73,7 +79,11 @@ export function useQuizGuards({ quizId, status, onExit, resetViolations }: UseQu
       const link = target.closest('a');
       if (!link?.href) return;
 
-      if (link.href.includes(window.location.pathname.replace(/^\/(uk|en|pl)/, ''))) {
+      if (
+        link.href.includes(
+          window.location.pathname.replace(/^\/(uk|en|pl)/, '')
+        )
+      ) {
         return;
       }
 
diff --git a/frontend/hooks/useQuizSession.ts b/frontend/hooks/useQuizSession.ts
index ac7a3042..aa417699 100644
--- a/frontend/hooks/useQuizSession.ts
+++ b/frontend/hooks/useQuizSession.ts
@@ -1,11 +1,15 @@
 import { useEffect } from 'react';
+
 import {
-  saveQuizSession,
-  loadQuizSession,
   clearQuizSession,
+  loadQuizSession,
   type QuizSessionData,
+  saveQuizSession,
 } from '@/lib/quiz/quiz-session';
-import { QUIZ_ALLOW_RESTORE_KEY, getQuizReloadKey } from '@/lib/quiz/quiz-storage-keys';
+import {
+  getQuizReloadKey,
+  QUIZ_ALLOW_RESTORE_KEY,
+} from '@/lib/quiz/quiz-storage-keys';
 
 type Answer = {
   questionId: string;
@@ -29,7 +33,11 @@ type UseQuizSessionParams = {
   onRestore: (data: QuizSessionData) => void;
 };
 
-export function useQuizSession({ quizId, state, onRestore }: UseQuizSessionParams): void {
+export function useQuizSession({
+  quizId,
+  state,
+  onRestore,
+}: UseQuizSessionParams): void {
   const reloadKey = getQuizReloadKey(quizId);
 
   useEffect(() => {
diff --git a/frontend/i18n/request.ts b/frontend/i18n/request.ts
index 282e4d99..41bc764b 100644
--- a/frontend/i18n/request.ts
+++ b/frontend/i18n/request.ts
@@ -1,5 +1,6 @@
 import { getRequestConfig } from 'next-intl/server';
-import { locales, defaultLocale } from './config';
+
+import { defaultLocale, locales } from './config';
 
 export default getRequestConfig(async ({ requestLocale }) => {
   let locale = await requestLocale;
diff --git a/frontend/i18n/routing.ts b/frontend/i18n/routing.ts
index ea82ca24..fc0b7dce 100644
--- a/frontend/i18n/routing.ts
+++ b/frontend/i18n/routing.ts
@@ -1,6 +1,7 @@
 import { createNavigation } from 'next-intl/navigation';
 import { defineRouting } from 'next-intl/routing';
-import { locales, defaultLocale } from './config';
+
+import { defaultLocale, locales } from './config';
 
 export const routing = defineRouting({
   locales,
diff --git a/frontend/lib/about/github-sponsors.ts b/frontend/lib/about/github-sponsors.ts
index be263e4c..9db2ece3 100644
--- a/frontend/lib/about/github-sponsors.ts
+++ b/frontend/lib/about/github-sponsors.ts
@@ -1,28 +1,31 @@
-import "server-only"
+import 'server-only';
 
 export interface Sponsor {
-  login: string
-  name: string
-  avatarUrl: string
-  tierName: string
-  tierColor: "gold" | "silver" | "bronze"
-  monthlyPrice: number
+  login: string;
+  name: string;
+  avatarUrl: string;
+  tierName: string;
+  tierColor: 'gold' | 'silver' | 'bronze';
+  monthlyPrice: number;
 }
 
-function getTierDetails(amount: number): { name: string; color: "gold" | "silver" | "bronze" } {
-  if (amount >= 100) return { name: "🏆 Core Supporter", color: "gold" }
-  if (amount >= 50) return { name: "🎓 Impact Support", color: "silver" }
-  if (amount >= 25) return { name: "🧠 Community Support", color: "silver" }
-  if (amount >= 10) return { name: "🚀 Early Support", color: "bronze" }
-  return { name: "☕ Coffee Support", color: "bronze" }
+function getTierDetails(amount: number): {
+  name: string;
+  color: 'gold' | 'silver' | 'bronze';
+} {
+  if (amount >= 100) return { name: '🏆 Core Supporter', color: 'gold' };
+  if (amount >= 50) return { name: '🎓 Impact Support', color: 'silver' };
+  if (amount >= 25) return { name: '🧠 Community Support', color: 'silver' };
+  if (amount >= 10) return { name: '🚀 Early Support', color: 'bronze' };
+  return { name: '☕ Coffee Support', color: 'bronze' };
 }
 
 export async function getSponsors(): Promise<Sponsor[]> {
-  const token = process.env.GITHUB_SPONSORS_TOKEN
+  const token = process.env.GITHUB_SPONSORS_TOKEN;
 
   if (!token) {
-    console.warn("⚠️ GITHUB_SPONSORS_TOKEN is missing.")
-    return []
+    console.warn('⚠️ GITHUB_SPONSORS_TOKEN is missing.');
+    return [];
   }
 
   const query = `
@@ -39,50 +42,54 @@ export async function getSponsors(): Promise<Sponsor[]> {
         }
       }
     }
-  `
+  `;
 
   try {
-    const res = await fetch("https://api.github.com/graphql", {
-      method: "POST",
+    const res = await fetch('https://api.github.com/graphql', {
+      method: 'POST',
       headers: {
         Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({ query }),
-      cache: "no-store" // Завжди свіжі дані
-    })
+      cache: 'no-store', // Завжди свіжі дані
+    });
 
-    const json = await res.json()
+    const json = await res.json();
 
     if (json.errors) {
-      console.error("❌ GitHub API Error:", json.errors[0].message)
-      return []
+      console.error('❌ GitHub API Error:', json.errors[0].message);
+      return [];
     }
 
-    const rawNodes = json.data?.organization?.sponsorshipsAsMaintainer?.nodes || []
-    
-    console.log(`✅ GitHub: Found ${rawNodes.length} sponsors for Organization`)
+    const rawNodes =
+      json.data?.organization?.sponsorshipsAsMaintainer?.nodes || [];
 
-    const sponsors: Sponsor[] = rawNodes.map((node: any) => {
-      const price = node.tier?.monthlyPriceInDollars || 0
-      const { name, color } = getTierDetails(price)
+    console.log(
+      `✅ GitHub: Found ${rawNodes.length} sponsors for Organization`
+    );
 
-      if (!node.sponsorEntity) return null
+    const sponsors: Sponsor[] = rawNodes
+      .map((node: any) => {
+        const price = node.tier?.monthlyPriceInDollars || 0;
+        const { name, color } = getTierDetails(price);
 
-      return {
-        login: node.sponsorEntity.login,
-        name: node.sponsorEntity.name || node.sponsorEntity.login,
-        avatarUrl: node.sponsorEntity.avatarUrl,
-        monthlyPrice: price,
-        tierName: name,
-        tierColor: color,
-      }
-    }).filter(Boolean) as Sponsor[]
+        if (!node.sponsorEntity) return null;
 
-    return sponsors
+        return {
+          login: node.sponsorEntity.login,
+          name: node.sponsorEntity.name || node.sponsorEntity.login,
+          avatarUrl: node.sponsorEntity.avatarUrl,
+          monthlyPrice: price,
+          tierName: name,
+          tierColor: color,
+        };
+      })
+      .filter(Boolean) as Sponsor[];
 
+    return sponsors;
   } catch (error) {
-    console.error("❌ Failed to fetch sponsors:", error)
-    return []
+    console.error('❌ Failed to fetch sponsors:', error);
+    return [];
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/lib/about/stats.ts b/frontend/lib/about/stats.ts
index 683ab6d4..3bf3a171 100644
--- a/frontend/lib/about/stats.ts
+++ b/frontend/lib/about/stats.ts
@@ -1,64 +1,71 @@
-import { db } from '@/db'
-import { users } from '@/db/schema/users'
-import { quizAttempts } from '@/db/schema/quiz'
-import { count } from 'drizzle-orm'
-import { unstable_cache } from 'next/cache'
+import { count } from 'drizzle-orm';
+import { unstable_cache } from 'next/cache';
+
+import { db } from '@/db';
+import { quizAttempts } from '@/db/schema/quiz';
+import { users } from '@/db/schema/users';
 
 export interface PlatformStats {
-  githubStars: string
-  linkedinFollowers: string
-  activeUsers: string
-  questionsSolved: string
+  githubStars: string;
+  linkedinFollowers: string;
+  activeUsers: string;
+  questionsSolved: string;
 }
 
 const formatMetric = (n: number) => {
-  if (n >= 1000) return (n / 1000).toFixed(1) + 'k+'
-  return n.toString()
-}
+  if (n >= 1000) return (n / 1000).toFixed(1) + 'k+';
+  return n.toString();
+};
 
 export const getPlatformStats = unstable_cache(
   async (): Promise<PlatformStats> => {
-    let stars = 125
+    let stars = 125;
     try {
-        const headers: HeadersInit = {}
-        if (process.env.GITHUB_TOKEN) headers.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`
-        
-        const res = await fetch('https://api.github.com/repos/DevLoversTeam/devlovers.net', { 
-            headers,
-            cache: 'no-store'
-        })
-        
-        if (res.ok) {
-            const data = await res.json()
-            stars = data.stargazers_count
+      const headers: HeadersInit = {};
+      if (process.env.GITHUB_TOKEN)
+        headers.Authorization = `Bearer ${process.env.GITHUB_TOKEN}`;
+
+      const res = await fetch(
+        'https://api.github.com/repos/DevLoversTeam/devlovers.net',
+        {
+          headers,
+          cache: 'no-store',
         }
-    } catch (e) { 
-        console.error("GitHub Fetch Error:", e) 
+      );
+
+      if (res.ok) {
+        const data = await res.json();
+        stars = data.stargazers_count;
+      }
+    } catch (e) {
+      console.error('GitHub Fetch Error:', e);
     }
 
-    const linkedinCount = process.env.LINKEDIN_FOLLOWER_COUNT ? parseInt(process.env.LINKEDIN_FOLLOWER_COUNT) : 1342
+    const linkedinCount = process.env.LINKEDIN_FOLLOWER_COUNT
+      ? parseInt(process.env.LINKEDIN_FOLLOWER_COUNT)
+      : 1342;
 
-    let totalUsers = 243
-    let solvedTests = 1890
+    let totalUsers = 243;
+    let solvedTests = 1890;
     try {
       const [[u], [q]] = await Promise.all([
         db.select({ value: count() }).from(users),
-        db.select({ value: count() }).from(quizAttempts)
-      ])
-      
-      if (u) totalUsers = u.value
-      if (q) solvedTests = q.value
-    } catch (e) { 
-        console.error("DB Fetch Error:", e) 
+        db.select({ value: count() }).from(quizAttempts),
+      ]);
+
+      if (u) totalUsers = u.value;
+      if (q) solvedTests = q.value;
+    } catch (e) {
+      console.error('DB Fetch Error:', e);
     }
 
     return {
       githubStars: formatMetric(stars),
       linkedinFollowers: formatMetric(linkedinCount),
       activeUsers: formatMetric(totalUsers),
-      questionsSolved: formatMetric(solvedTests)
-    }
+      questionsSolved: formatMetric(solvedTests),
+    };
   },
   ['platform-stats'],
   { revalidate: 3600 }
-)
\ No newline at end of file
+);
diff --git a/frontend/lib/admin/parseAdminProductForm.ts b/frontend/lib/admin/parseAdminProductForm.ts
index 735a43a9..4aa6604d 100644
--- a/frontend/lib/admin/parseAdminProductForm.ts
+++ b/frontend/lib/admin/parseAdminProductForm.ts
@@ -1,10 +1,11 @@
 import { z } from 'zod';
+
+import { type CurrencyCode, currencyValues } from '@/lib/shop/currency';
+import { toCents } from '@/lib/shop/money';
 import {
   productAdminSchema,
   productAdminUpdateSchema,
 } from '@/lib/validation/shop';
-import { currencyValues, type CurrencyCode } from '@/lib/shop/currency';
-import { toCents } from '@/lib/shop/money';
 
 type ParsedResult<T> =
   | { ok: true; data: T }
@@ -83,8 +84,8 @@ function parseMajorToMinor(
     typeof value === 'string'
       ? value.trim()
       : typeof value === 'number'
-      ? String(value)
-      : '';
+        ? String(value)
+        : '';
 
   if (!raw) return null;
 
@@ -104,12 +105,6 @@ function parseLegacyPriceMinorField(
   return toCents(v);
 }
 
-/**
- * Legacy optional field semantics:
- * - if field missing => undefined (PATCH omit)
- * - if present but empty => null (explicit clear)
- * - if present and value => cents int
- */
 function parseLegacyOptionalOriginalMinorField(
   formData: FormData,
   name: string
@@ -135,8 +130,8 @@ function parseMinorInt(
     typeof value === 'number'
       ? value
       : typeof value === 'string'
-      ? Number(value.trim())
-      : NaN;
+        ? Number(value.trim())
+        : NaN;
 
   if (!Number.isFinite(raw) || !Number.isInteger(raw) || raw < 0) {
     throw zodPricesJsonError(`Invalid ${opts.field} for ${opts.currency}`);
@@ -149,7 +144,6 @@ function requirePositivePriceMinor(
   priceMinor: number | null,
   currency: string
 ) {
-  // DB check: priceMinor > 0
   if (priceMinor == null || priceMinor <= 0) {
     throw zodPricesJsonError(`Missing price for ${currency}`);
   }
@@ -206,13 +200,11 @@ function parsePricesJsonField(formData: FormData, mode: ParseMode) {
         throw zodPricesJsonError('Invalid currency in prices payload');
       }
 
-      // Prefer canonical minor payload
       let priceMinor = parseMinorInt(row?.priceMinor, {
         field: 'priceMinor',
         currency: currency as string,
       });
 
-      // Legacy major fallback
       if (priceMinor == null) {
         priceMinor = parseMajorToMinor(row?.price, {
           field: 'price',
@@ -240,10 +232,8 @@ function parsePricesJsonField(formData: FormData, mode: ParseMode) {
         });
       }
 
-      // Normalize: empty -> null
       if (originalPriceMinor == null) originalPriceMinor = null;
 
-      // DB invariant: originalPriceMinor is null OR > priceMinor
       if (originalPriceMinor !== null && priceMinor != null) {
         if (originalPriceMinor <= priceMinor) {
           throw zodPricesJsonError(
@@ -285,13 +275,11 @@ export function parseAdminProductForm(
 > {
   const mode: ParseMode = options.mode ?? 'create';
 
-  // 1) Prefer canonical "prices" JSON payload if present
   const pricesJson = parsePricesJsonField(formData, mode);
   if (pricesJson && 'ok' in pricesJson && pricesJson.ok === false) {
     return { ok: false, error: pricesJson.error };
   }
 
-  // 2) Legacy fallback (priceUsd/priceUah) -> MINOR units
   const priceUsdMinor = parseLegacyPriceMinorField(formData, 'priceUsd');
   const originalPriceUsdMinor = parseLegacyOptionalOriginalMinorField(
     formData,
@@ -325,13 +313,12 @@ export function parseAdminProductForm(
       : []),
   ];
 
-  // Resolve final prices with PATCH semantics
   const prices =
     pricesJson && 'value' in pricesJson
       ? pricesJson.value
       : mode === 'update' && legacyRawPrices.length === 0
-      ? undefined
-      : legacyRawPrices;
+        ? undefined
+        : legacyRawPrices;
 
   const payload = {
     title: getStringField(formData, 'title'),
diff --git a/frontend/lib/ai/prompts.ts b/frontend/lib/ai/prompts.ts
index 1010a736..b408f63f 100644
--- a/frontend/lib/ai/prompts.ts
+++ b/frontend/lib/ai/prompts.ts
@@ -118,7 +118,6 @@ CRITICAL JSON RULES:
 `;
 }
 
-
 export interface ExplanationResponse {
   uk: string;
   en: string;
diff --git a/frontend/lib/auth.ts b/frontend/lib/auth.ts
index c73230bf..c413d181 100644
--- a/frontend/lib/auth.ts
+++ b/frontend/lib/auth.ts
@@ -1,8 +1,8 @@
 import 'server-only';
 
-import { cookies } from 'next/headers';
-import jwt from 'jsonwebtoken';
 import { eq } from 'drizzle-orm';
+import jwt from 'jsonwebtoken';
+import { cookies } from 'next/headers';
 
 import { db } from '@/db';
 import { users } from '@/db/schema/users';
diff --git a/frontend/lib/auth/admin.ts b/frontend/lib/auth/admin.ts
index 4a4b356b..b5682545 100644
--- a/frontend/lib/auth/admin.ts
+++ b/frontend/lib/auth/admin.ts
@@ -1,70 +1,60 @@
-import "server-only"
+import 'server-only';
 
-import type { NextRequest } from "next/server"
+import type { NextRequest } from 'next/server';
 
-import { getCurrentUser } from "@/lib/auth"
+import { getCurrentUser } from '@/lib/auth';
 
 export class AdminApiDisabledError extends Error {
-  code = "ADMIN_API_DISABLED" as const
-  constructor(message = "Admin API is disabled by configuration") {
-    super(message)
-    this.name = "AdminApiDisabledError"
+  code = 'ADMIN_API_DISABLED' as const;
+  constructor(message = 'Admin API is disabled by configuration') {
+    super(message);
+    this.name = 'AdminApiDisabledError';
   }
 }
 
 export class AdminUnauthorizedError extends Error {
-  code = "UNAUTHORIZED" as const
-  constructor(message = "Authentication required") {
-    super(message)
-    this.name = "AdminUnauthorizedError"
+  code = 'UNAUTHORIZED' as const;
+  constructor(message = 'Authentication required') {
+    super(message);
+    this.name = 'AdminUnauthorizedError';
   }
 }
 
 export class AdminForbiddenError extends Error {
-  code = "FORBIDDEN" as const
-  constructor(message = "Admin role required") {
-    super(message)
-    this.name = "AdminForbiddenError"
+  code = 'FORBIDDEN' as const;
+  constructor(message = 'Admin role required') {
+    super(message);
+    this.name = 'AdminForbiddenError';
   }
 }
 
-/**
- * Kill-switch for production.
- * Keeps MVP safety: you can hard-disable admin mutating endpoints in prod instantly.
- */
 export function assertAdminApiEnabled(): void {
-  if (process.env.NODE_ENV === "production" && process.env.ENABLE_ADMIN_API !== "true") {
-    throw new AdminApiDisabledError()
+  if (
+    process.env.NODE_ENV === 'production' &&
+    process.env.ENABLE_ADMIN_API !== 'true'
+  ) {
+    throw new AdminApiDisabledError();
   }
 }
 
-/**
- * API guard: must be enabled in prod + must be authenticated admin.
- * Return value is useful if later you want audit logs (adminId, email).
- */
 export async function requireAdminApi(_request?: NextRequest) {
-  void _request
-  assertAdminApiEnabled()
+  void _request;
+  assertAdminApiEnabled();
 
-  const user = await getCurrentUser()
-  if (!user) throw new AdminUnauthorizedError()
+  const user = await getCurrentUser();
+  if (!user) throw new AdminUnauthorizedError();
 
-  // Harden against unexpected role strings from DB
-  if (user.role !== "admin") throw new AdminForbiddenError()
+  if (user.role !== 'admin') throw new AdminForbiddenError();
 
-  return user
+  return user;
 }
 
-/**
- * Page guard: same logic as API guard.
- * Use from Server Components (layouts/pages) to protect /shop/admin/**.
- */
 export async function requireAdminPage() {
-  assertAdminApiEnabled()
+  assertAdminApiEnabled();
 
-  const user = await getCurrentUser()
-  if (!user) throw new AdminUnauthorizedError()
-  if (user.role !== "admin") throw new AdminForbiddenError()
+  const user = await getCurrentUser();
+  if (!user) throw new AdminUnauthorizedError();
+  if (user.role !== 'admin') throw new AdminForbiddenError();
 
-  return user
+  return user;
 }
diff --git a/frontend/lib/auth/email-verification.ts b/frontend/lib/auth/email-verification.ts
index d1abc84d..1adb411c 100644
--- a/frontend/lib/auth/email-verification.ts
+++ b/frontend/lib/auth/email-verification.ts
@@ -1,21 +1,22 @@
 import crypto from 'crypto';
+
 import { db } from '@/db';
 import { emailVerificationTokens } from '@/db/schema/emailVerificationTokens';
 
 export function addHours(date: Date, hours: number): Date {
-    const result = new Date(date.getTime());
-    result.setHours(result.getHours() + hours);
-    return result;
+  const result = new Date(date.getTime());
+  result.setHours(result.getHours() + hours);
+  return result;
 }
 
 export async function createEmailVerificationToken(userId: string) {
-    const token = crypto.randomUUID();
+  const token = crypto.randomUUID();
 
-    await db.insert(emailVerificationTokens).values({
-        token,
-        userId,
-        expiresAt: addHours(new Date(), 24),
-    });
+  await db.insert(emailVerificationTokens).values({
+    token,
+    userId,
+    expiresAt: addHours(new Date(), 24),
+  });
 
-    return token;
+  return token;
 }
diff --git a/frontend/lib/auth/guard-shop-admin-page.ts b/frontend/lib/auth/guard-shop-admin-page.ts
index 05d426b3..7d6a7473 100644
--- a/frontend/lib/auth/guard-shop-admin-page.ts
+++ b/frontend/lib/auth/guard-shop-admin-page.ts
@@ -1,4 +1,5 @@
 import { notFound, redirect } from 'next/navigation';
+
 import {
   AdminApiDisabledError,
   AdminForbiddenError,
diff --git a/frontend/lib/auth/internal-janitor.ts b/frontend/lib/auth/internal-janitor.ts
index 5c7ad629..d118dea8 100644
--- a/frontend/lib/auth/internal-janitor.ts
+++ b/frontend/lib/auth/internal-janitor.ts
@@ -1,13 +1,9 @@
-// lib/auth/internal-janitor.ts
-import { NextRequest, NextResponse } from 'next/server';
 import crypto from 'crypto';
+import { NextRequest, NextResponse } from 'next/server';
 
 function timingSafeEqual(a: string, b: string) {
   const aBuf = Buffer.from(a, 'utf8');
   const bBuf = Buffer.from(b, 'utf8');
-
-  // Pad both buffers to the same length to avoid length-based early return timing leak.
-  // Ensure min length 1 because timingSafeEqual requires non-zero length buffers.
   const maxLen = Math.max(aBuf.length, bBuf.length, 1);
 
   const aPadded = Buffer.alloc(maxLen);
@@ -18,7 +14,6 @@ function timingSafeEqual(a: string, b: string) {
 
   const equalPadded = crypto.timingSafeEqual(aPadded, bPadded);
 
-  // Length check AFTER timingSafeEqual; no early return.
   const lengthEqual = aBuf.length === bBuf.length;
 
   return equalPadded && lengthEqual;
diff --git a/frontend/lib/auth/oauth-state.ts b/frontend/lib/auth/oauth-state.ts
index e0e75da2..fec7bf5d 100644
--- a/frontend/lib/auth/oauth-state.ts
+++ b/frontend/lib/auth/oauth-state.ts
@@ -1,34 +1,33 @@
-import { cookies } from "next/headers";
-import crypto from "crypto";
+import crypto from 'crypto';
+import { cookies } from 'next/headers';
 
-const STATE_COOKIE = "oauth_state";
+const STATE_COOKIE = 'oauth_state';
 const STATE_TTL_SECONDS = 10 * 60;
 
 export function generateOAuthState(): string {
-    return crypto.randomBytes(32).toString("hex");
+  return crypto.randomBytes(32).toString('hex');
 }
 
 export async function setOAuthStateCookie(state: string) {
-    const store = await cookies();
-    store.set(STATE_COOKIE, state, {
-        httpOnly: true,
-        sameSite: "lax",
-        secure: process.env.NODE_ENV === "production",
-        path: "/",
-        maxAge: STATE_TTL_SECONDS,
-    });
+  const store = await cookies();
+  store.set(STATE_COOKIE, state, {
+    httpOnly: true,
+    sameSite: 'lax',
+    secure: process.env.NODE_ENV === 'production',
+    path: '/',
+    maxAge: STATE_TTL_SECONDS,
+  });
 }
 
-export async function consumeOAuthState(expected: string | null): Promise<boolean> {
-    const store = await cookies();
-    const actual = store.get(STATE_COOKIE)?.value;
+export async function consumeOAuthState(
+  expected: string | null
+): Promise<boolean> {
+  const store = await cookies();
+  const actual = store.get(STATE_COOKIE)?.value;
 
-    store.delete(STATE_COOKIE);
+  store.delete(STATE_COOKIE);
 
-    if (!expected || !actual) return false;
-    if (actual.length !== expected.length) return false;
-    return crypto.timingSafeEqual(
-        Buffer.from(actual),
-        Buffer.from(expected)
-    );
-}
\ No newline at end of file
+  if (!expected || !actual) return false;
+  if (actual.length !== expected.length) return false;
+  return crypto.timingSafeEqual(Buffer.from(actual), Buffer.from(expected));
+}
diff --git a/frontend/lib/auth/password-reset.ts b/frontend/lib/auth/password-reset.ts
index cb5bc87e..e4415682 100644
--- a/frontend/lib/auth/password-reset.ts
+++ b/frontend/lib/auth/password-reset.ts
@@ -1,23 +1,22 @@
-import crypto from "crypto";
-import { db } from "@/db";
-import { passwordResetTokens } from "@/db/schema/passwordResetTokens";
+import crypto from 'crypto';
+
+import { db } from '@/db';
+import { passwordResetTokens } from '@/db/schema/passwordResetTokens';
 
 export function addHours(date: Date, hours: number): Date {
-    const result = new Date(date.getTime());
-    result.setHours(result.getHours() + hours);
-    return result;
+  const result = new Date(date.getTime());
+  result.setHours(result.getHours() + hours);
+  return result;
 }
 
-export async function createPasswordResetToken(
-    userId: string
-) {
-    const token = crypto.randomUUID();
+export async function createPasswordResetToken(userId: string) {
+  const token = crypto.randomUUID();
 
-    await db.insert(passwordResetTokens).values({
-        token,
-        userId,
-        expiresAt: addHours(new Date(), 1),
-    });
+  await db.insert(passwordResetTokens).values({
+    token,
+    userId,
+    expiresAt: addHours(new Date(), 1),
+  });
 
-    return token;
-}
\ No newline at end of file
+  return token;
+}
diff --git a/frontend/lib/auth/safe-redirect.ts b/frontend/lib/auth/safe-redirect.ts
index e23a8b11..10b170b7 100644
--- a/frontend/lib/auth/safe-redirect.ts
+++ b/frontend/lib/auth/safe-redirect.ts
@@ -1,13 +1,11 @@
-export function getSafeRedirect(
-    raw: string | null | undefined
-): string {
-    if (!raw) return "";
+export function getSafeRedirect(raw: string | null | undefined): string {
+  if (!raw) return '';
 
-    if (raw.includes("\\")) return "";
+  if (raw.includes('\\')) return '';
 
-    if (!raw.startsWith("/")) return "";
-    if (raw.startsWith("//")) return "";
-    if (raw.includes("://")) return "";
+  if (!raw.startsWith('/')) return '';
+  if (raw.startsWith('//')) return '';
+  if (raw.includes('://')) return '';
 
-    return raw;
-}
\ No newline at end of file
+  return raw;
+}
diff --git a/frontend/lib/cache/qa.ts b/frontend/lib/cache/qa.ts
index 9b8b1a30..8607dc3d 100644
--- a/frontend/lib/cache/qa.ts
+++ b/frontend/lib/cache/qa.ts
@@ -1,7 +1,5 @@
 import { getRedisClient } from '@/lib/redis';
 
-const QA_CACHE_TTL_SECONDS = 60 * 60 * 12;
-
 type QaCacheKeyInput = {
   category: string;
   locale: string;
@@ -48,7 +46,7 @@ export async function setQaCache<T>(key: string, value: T) {
   const redis = getRedisClient();
   if (!redis) return;
 
-  await redis.set(key, value, { ex: QA_CACHE_TTL_SECONDS });
+  await redis.set(key, value);
 }
 
 export async function invalidateQaCacheByCategory(category: string) {
@@ -97,7 +95,3 @@ export async function invalidateAllQaCache() {
 
   return deleted;
 }
-
-export const qaCacheConfig = {
-  ttlSeconds: QA_CACHE_TTL_SECONDS,
-};
diff --git a/frontend/lib/cart.ts b/frontend/lib/cart.ts
index 14d8ff2c..f275d320 100644
--- a/frontend/lib/cart.ts
+++ b/frontend/lib/cart.ts
@@ -1,17 +1,17 @@
 import { z } from 'zod';
 
+import { logWarn } from '@/lib/logging';
+import { createCartItemKey } from '@/lib/shop/cart-item-key';
+import { fromCents } from '@/lib/shop/money';
 import {
-  cartClientItemSchema,
-  cartRehydrateResultSchema,
-  MAX_QUANTITY_PER_LINE,
   type CartClientItem as ValidationCartClientItem,
+  cartClientItemSchema,
   type CartRehydrateItem,
   type CartRehydrateResult,
+  cartRehydrateResultSchema,
   type CartRemovedItem,
+  MAX_QUANTITY_PER_LINE,
 } from '@/lib/validation/shop';
-import { fromCents } from '@/lib/shop/money';
-import { createCartItemKey } from '@/lib/shop/cart-item-key';
-import { logWarn } from '@/lib/logging';
 
 const CART_KEY = 'devlovers-cart';
 
@@ -106,7 +106,9 @@ export function persistCartItems(items: CartClientItem[]): void {
   }
 }
 
-function normalizeItemsForStorage(items: CartRehydrateItem[]): CartClientItem[] {
+function normalizeItemsForStorage(
+  items: CartRehydrateItem[]
+): CartClientItem[] {
   return items.map(item => ({
     productId: item.productId,
     quantity: item.quantity,
@@ -115,11 +117,9 @@ function normalizeItemsForStorage(items: CartRehydrateItem[]): CartClientItem[]
   }));
 }
 
-/**
- * IMPORTANT:
- * Cart money fields are MINOR UNITS (integers).
- */
-export function computeSummaryFromItems(items: CartRehydrateItem[]): CartSummary {
+export function computeSummaryFromItems(
+  items: CartRehydrateItem[]
+): CartSummary {
   if (!items.length) {
     return {
       totalAmountMinor: 0,
@@ -135,7 +135,6 @@ export function computeSummaryFromItems(items: CartRehydrateItem[]): CartSummary
   let itemCount = 0;
 
   for (const item of items) {
-    // Production-safety: cart must not mix currencies (usually indicates locale switch + stale cart)
     if (item.currency !== currency) {
       throw new Error(
         `Cart contains mixed currencies (${currency} and ${item.currency}). Clear cart and try again.`
@@ -163,12 +162,9 @@ function extractApiError(data: unknown): {
   message: string;
   details?: unknown;
 } {
-  // legacy: { error: "..." }
   if (isRecord(data) && typeof data.error === 'string') {
     return { code: 'UNKNOWN_ERROR', message: data.error };
   }
-
-  // preferred: { error: { code, message, details } }
   if (isRecord(data) && isRecord(data.error)) {
     const errObj = data.error;
     const code =
@@ -181,8 +177,6 @@ function extractApiError(data: unknown): {
         : 'Request failed';
     return { code, message, details: errObj.details };
   }
-
-  // fallback: { code, message, details }
   if (isRecord(data)) {
     const code =
       typeof data.code === 'string' && data.code.trim().length > 0
@@ -245,7 +239,8 @@ export async function rehydrateCart(items: CartClientItem[]): Promise<Cart> {
     const apiErr = extractApiError(data);
     throw new CartRehydrateError({
       code: apiErr.code,
-      message: apiErr.message || `Unable to rehydrate cart (HTTP ${response.status})`,
+      message:
+        apiErr.message || `Unable to rehydrate cart (HTTP ${response.status})`,
       status: response.status,
       details: apiErr.details,
     });
diff --git a/frontend/lib/config/catalog.ts b/frontend/lib/config/catalog.ts
index e15b0eb1..a979c810 100644
--- a/frontend/lib/config/catalog.ts
+++ b/frontend/lib/config/catalog.ts
@@ -1,48 +1,57 @@
 export const CATEGORIES = [
-  { slug: "all", label: "All Products" },
-  { slug: "new-arrivals", label: "New Arrivals" },
-  { slug: "best-sellers", label: "Best Sellers" },
-  { slug: "apparel", label: "Apparel" },
-  { slug: "lifestyle", label: "Lifestyle" },
-  { slug: "collectibles", label: "Collectibles" },
-  { slug: "sale", label: "Sale" },
-] as const
+  { slug: 'all', label: 'All Products' },
+  { slug: 'new-arrivals', label: 'New Arrivals' },
+  { slug: 'best-sellers', label: 'Best Sellers' },
+  { slug: 'apparel', label: 'Apparel' },
+  { slug: 'lifestyle', label: 'Lifestyle' },
+  { slug: 'collectibles', label: 'Collectibles' },
+  { slug: 'sale', label: 'Sale' },
+] as const;
 
 export const PRODUCT_TYPES = [
-  { slug: "accessories", label: "Accessories" },
-  { slug: "shirts", label: "Shirts" },
-  { slug: "drinkware", label: "Drinkware" },
-  { slug: "technology", label: "Technology" },
-] as const
+  { slug: 'accessories', label: 'Accessories' },
+  { slug: 'shirts', label: 'Shirts' },
+  { slug: 'drinkware', label: 'Drinkware' },
+  { slug: 'technology', label: 'Technology' },
+] as const;
 
 export const COLORS = [
-  { slug: "black", label: "Black", hex: "#000000" },
-  { slug: "white", label: "White", hex: "#ffffff" },
-  { slug: "grey", label: "Grey", hex: "#6b7280" },
-  { slug: "navy", label: "Navy", hex: "#1e3a5f" },
+  { slug: 'black', label: 'Black', hex: '#000000' },
+  { slug: 'white', label: 'White', hex: '#ffffff' },
+  { slug: 'grey', label: 'Grey', hex: '#6b7280' },
+  { slug: 'navy', label: 'Navy', hex: '#1e3a5f' },
   {
-    slug: "multicolor",
-    label: "Multicolor",
-    hex: "linear-gradient(135deg, #ff0000, #ff7f00, #ffff00, #00ff00, #0000ff, #8b00ff)",
+    slug: 'multicolor',
+    label: 'Multicolor',
+    hex: 'linear-gradient(135deg, #ff0000, #ff7f00, #ffff00, #00ff00, #0000ff, #8b00ff)',
   },
-] as const
+] as const;
 
-export const SIZES = ["XS", "S", "M", "L", "XL", "XXL"] as const
+export const SIZES = ['XS', 'S', 'M', 'L', 'XL', 'XXL'] as const;
 
 export const SORT_OPTIONS = [
-  { value: "featured", label: "Featured" },
-  { value: "price-asc", label: "Price: Low to High" },
-  { value: "price-desc", label: "Price: High to Low" },
-  { value: "newest", label: "Newest" },
-] as const
+  { value: 'featured', label: 'Featured' },
+  { value: 'price-asc', label: 'Price: Low to High' },
+  { value: 'price-desc', label: 'Price: High to Low' },
+  { value: 'newest', label: 'Newest' },
+] as const;
 
-export const CATALOG_PAGE_SIZE = 12
+export const CATALOG_PAGE_SIZE = 12;
 
 export const CATEGORY_TILES = [
-  { id: "apparel", name: "Apparel", slug: "apparel", image: "/apparel.jpg" },
-  { id: "collectibles", name: "Collectibles", slug: "collectibles", image: "/collectibles.jpg" },
-  { id: "lifestyle", name: "Lifestyle", slug: "lifestyle", image: "/lifestyle.jpg" },
-] as const
-
+  { id: 'apparel', name: 'Apparel', slug: 'apparel', image: '/apparel.jpg' },
+  {
+    id: 'collectibles',
+    name: 'Collectibles',
+    slug: 'collectibles',
+    image: '/collectibles.jpg',
+  },
+  {
+    id: 'lifestyle',
+    name: 'Lifestyle',
+    slug: 'lifestyle',
+    image: '/lifestyle.jpg',
+  },
+] as const;
 
-export type CatalogSort = (typeof SORT_OPTIONS)[number]["value"]
+export type CatalogSort = (typeof SORT_OPTIONS)[number]['value'];
diff --git a/frontend/lib/email/sendPasswordResetEmail.ts b/frontend/lib/email/sendPasswordResetEmail.ts
index c9a99860..36138b71 100644
--- a/frontend/lib/email/sendPasswordResetEmail.ts
+++ b/frontend/lib/email/sendPasswordResetEmail.ts
@@ -1,26 +1,23 @@
-import { mailer } from "./transporter";
-import { resetPasswordTemplate } from "./templates/reset-password";
+import { resetPasswordTemplate } from './templates/reset-password';
+import { mailer } from './transporter';
 
 type Params = {
-    to: string;
-    resetUrl: string;
-}
+  to: string;
+  resetUrl: string;
+};
 
-export async function sendPasswordResetEmail({
-    to,
-    resetUrl,
-}: Params) {
-    const from = process.env.EMAIL_FROM;
+export async function sendPasswordResetEmail({ to, resetUrl }: Params) {
+  const from = process.env.EMAIL_FROM;
 
-    if (!from) {
-        throw new Error("EMAIL_FROM is not configured")
-    }
+  if (!from) {
+    throw new Error('EMAIL_FROM is not configured');
+  }
 
-    await mailer.sendMail({
-        from,
-        to,
-        subject: "DevLovers - Reset your password",
-        text: `Reset your password: ${resetUrl}`,
-        html: resetPasswordTemplate(resetUrl),
-    })
-}
\ No newline at end of file
+  await mailer.sendMail({
+    from,
+    to,
+    subject: 'DevLovers - Reset your password',
+    text: `Reset your password: ${resetUrl}`,
+    html: resetPasswordTemplate(resetUrl),
+  });
+}
diff --git a/frontend/lib/email/sendVerificationEmail.ts b/frontend/lib/email/sendVerificationEmail.ts
index 085a9023..f867ee81 100644
--- a/frontend/lib/email/sendVerificationEmail.ts
+++ b/frontend/lib/email/sendVerificationEmail.ts
@@ -1,25 +1,23 @@
-import { mailer } from "./transporter";
-import { verifyEmailTemplate } from "./templates/verify-email";
+import { verifyEmailTemplate } from './templates/verify-email';
+import { mailer } from './transporter';
 
 type Params = {
   to: string;
   verifyUrl: string;
-}
+};
 
-export async function sendVerificationEmail({
-  to,
-  verifyUrl, }: Params) {
+export async function sendVerificationEmail({ to, verifyUrl }: Params) {
   const from = process.env.EMAIL_FROM;
 
   if (!from) {
-    throw new Error("EMAIL_FROM is not configured")
+    throw new Error('EMAIL_FROM is not configured');
   }
 
   await mailer.sendMail({
     from,
     to,
-    subject: "DevLovers - Verify your email address",
+    subject: 'DevLovers - Verify your email address',
     text: `Verify your email address: ${verifyUrl}`,
     html: verifyEmailTemplate(verifyUrl),
-  })
-}
\ No newline at end of file
+  });
+}
diff --git a/frontend/lib/email/templates/base-layout.ts b/frontend/lib/email/templates/base-layout.ts
index 1d5e5c22..5ec6f624 100644
--- a/frontend/lib/email/templates/base-layout.ts
+++ b/frontend/lib/email/templates/base-layout.ts
@@ -1,13 +1,10 @@
 type BaseEmailLayoutParams = {
-    title: string;
-    content: string;
+  title: string;
+  content: string;
 };
 
-export function baseEmailLayout({
-    title,
-    content,
-}: BaseEmailLayoutParams) {
-    return `
+export function baseEmailLayout({ title, content }: BaseEmailLayoutParams) {
+  return `
 <!DOCTYPE html>
 <html>
   <head>
@@ -100,4 +97,4 @@ export function baseEmailLayout({
   </body>
 </html>
 `;
-}
\ No newline at end of file
+}
diff --git a/frontend/lib/email/templates/reset-password.ts b/frontend/lib/email/templates/reset-password.ts
index fe21b342..86612756 100644
--- a/frontend/lib/email/templates/reset-password.ts
+++ b/frontend/lib/email/templates/reset-password.ts
@@ -1,9 +1,9 @@
-import { baseEmailLayout } from "./base-layout";
+import { baseEmailLayout } from './base-layout';
 
 export function resetPasswordTemplate(resetUrl: string) {
-    return baseEmailLayout({
-        title: "Reset your password",
-        content: `
+  return baseEmailLayout({
+    title: 'Reset your password',
+    content: `
 <p class="text-secondary" style="margin:0 0 16px; font-size:14px; color:#374151; line-height:1.5;">
   We received a request to reset your password.
 </p>
@@ -43,5 +43,5 @@ export function resetPasswordTemplate(resetUrl: string) {
   If you didn’t request this, you can safely ignore this email.
 </p>
 `,
-    });
-}
\ No newline at end of file
+  });
+}
diff --git a/frontend/lib/email/templates/verify-email.ts b/frontend/lib/email/templates/verify-email.ts
index 25bc472c..b0efcdf8 100644
--- a/frontend/lib/email/templates/verify-email.ts
+++ b/frontend/lib/email/templates/verify-email.ts
@@ -1,9 +1,9 @@
-import { baseEmailLayout } from "./base-layout";
+import { baseEmailLayout } from './base-layout';
 
 export function verifyEmailTemplate(verifyUrl: string) {
-    return baseEmailLayout({
-        title: "Verify your email",
-        content: `
+  return baseEmailLayout({
+    title: 'Verify your email',
+    content: `
 <p class="text-secondary" style="margin:0 0 16px; font-size:14px; color:#374151; line-height:1.5;">
   Welcome to <strong>DevLovers</strong> 👋
 </p>
@@ -43,5 +43,5 @@ export function verifyEmailTemplate(verifyUrl: string) {
   If you didn’t create an account, you can safely ignore this email.
 </p>
 `,
-    });
-}
\ No newline at end of file
+  });
+}
diff --git a/frontend/lib/email/transporter.ts b/frontend/lib/email/transporter.ts
index de252dcf..2de3c0e1 100644
--- a/frontend/lib/email/transporter.ts
+++ b/frontend/lib/email/transporter.ts
@@ -1,16 +1,16 @@
-import nodemailer from "nodemailer";
+import nodemailer from 'nodemailer';
 
 const user = process.env.GMAIL_USER;
 const pass = process.env.GMAIL_APP_PASSWORD;
 
 if (!user || !pass) {
-    throw new Error("Missing Gmail SMTP credentials");
+  throw new Error('Missing Gmail SMTP credentials');
 }
 
 export const mailer = nodemailer.createTransport({
-    service: "gmail",
-    auth: {
-        user,
-        pass,
-    },
-});
\ No newline at end of file
+  service: 'gmail',
+  auth: {
+    user,
+    pass,
+  },
+});
diff --git a/frontend/lib/env/auth.ts b/frontend/lib/env/auth.ts
index 59eb8f1a..f20d2c39 100644
--- a/frontend/lib/env/auth.ts
+++ b/frontend/lib/env/auth.ts
@@ -1,56 +1,58 @@
-type AppEnv = "local" | "develop" | "production";
+type AppEnv = 'local' | 'develop' | 'production';
 
-const validAppEnvs = ["local", "develop", "production"]
-const rawAppEnv = process.env.APP_ENV
+const validAppEnvs = ['local', 'develop', 'production'];
+const rawAppEnv = process.env.APP_ENV;
 
 if (!rawAppEnv) {
-    throw new Error("APP_ENV is not defined");
+  throw new Error('APP_ENV is not defined');
 }
 
 if (!validAppEnvs.includes(rawAppEnv as AppEnv)) {
-    throw new Error(`Invalid APP_ENV: ${rawAppEnv}. Must be one of: ${validAppEnvs.join(", ")}`);
+  throw new Error(
+    `Invalid APP_ENV: ${rawAppEnv}. Must be one of: ${validAppEnvs.join(', ')}`
+  );
 }
 
-const APP_ENV = rawAppEnv as AppEnv
+const APP_ENV = rawAppEnv as AppEnv;
 
 function requireEnv(name: string): string {
-    const value = process.env[name];
-    if (!value) {
-        throw new Error(`Missing env var: ${name}`);
-    }
-    return value;
+  const value = process.env[name];
+  if (!value) {
+    throw new Error(`Missing env var: ${name}`);
+  }
+  return value;
 }
 
 export const authEnv = {
-    appEnv: APP_ENV,
-
-    google: {
-        clientId: requireEnv("GOOGLE_CLIENT_ID"),
-        clientSecret: requireEnv("GOOGLE_CLIENT_SECRET"),
-        redirectUri:
-            APP_ENV === "local"
-                ? requireEnv("GOOGLE_CLIENT_REDIRECT_URI_LOCAL")
-                : APP_ENV === "develop"
-                    ? requireEnv("GOOGLE_CLIENT_REDIRECT_URI_DEVELOP")
-                    : requireEnv("GOOGLE_CLIENT_REDIRECT_URI_PROD"),
-    },
-
-    github:
-        APP_ENV === "local"
-            ? {
-                clientId: requireEnv("GITHUB_CLIENT_ID_LOCAL"),
-                clientSecret: requireEnv("GITHUB_CLIENT_SECRET_LOCAL"),
-                redirectUri: requireEnv("GITHUB_CLIENT_REDIRECT_URI_LOCAL"),
-            }
-            : APP_ENV === "develop"
-                ? {
-                    clientId: requireEnv("GITHUB_CLIENT_ID_DEVELOP"),
-                    clientSecret: requireEnv("GITHUB_CLIENT_SECRET_DEVELOP"),
-                    redirectUri: requireEnv("GITHUB_CLIENT_REDIRECT_URI_DEVELOP"),
-                }
-                : {
-                    clientId: requireEnv("GITHUB_CLIENT_ID_PROD"),
-                    clientSecret: requireEnv("GITHUB_CLIENT_SECRET_PROD"),
-                    redirectUri: requireEnv("GITHUB_CLIENT_REDIRECT_URI_PROD"),
-                },
-};
\ No newline at end of file
+  appEnv: APP_ENV,
+
+  google: {
+    clientId: requireEnv('GOOGLE_CLIENT_ID'),
+    clientSecret: requireEnv('GOOGLE_CLIENT_SECRET'),
+    redirectUri:
+      APP_ENV === 'local'
+        ? requireEnv('GOOGLE_CLIENT_REDIRECT_URI_LOCAL')
+        : APP_ENV === 'develop'
+          ? requireEnv('GOOGLE_CLIENT_REDIRECT_URI_DEVELOP')
+          : requireEnv('GOOGLE_CLIENT_REDIRECT_URI_PROD'),
+  },
+
+  github:
+    APP_ENV === 'local'
+      ? {
+          clientId: requireEnv('GITHUB_CLIENT_ID_LOCAL'),
+          clientSecret: requireEnv('GITHUB_CLIENT_SECRET_LOCAL'),
+          redirectUri: requireEnv('GITHUB_CLIENT_REDIRECT_URI_LOCAL'),
+        }
+      : APP_ENV === 'develop'
+        ? {
+            clientId: requireEnv('GITHUB_CLIENT_ID_DEVELOP'),
+            clientSecret: requireEnv('GITHUB_CLIENT_SECRET_DEVELOP'),
+            redirectUri: requireEnv('GITHUB_CLIENT_REDIRECT_URI_DEVELOP'),
+          }
+        : {
+            clientId: requireEnv('GITHUB_CLIENT_ID_PROD'),
+            clientSecret: requireEnv('GITHUB_CLIENT_SECRET_PROD'),
+            redirectUri: requireEnv('GITHUB_CLIENT_REDIRECT_URI_PROD'),
+          },
+};
diff --git a/frontend/lib/env/cloudinary.ts b/frontend/lib/env/cloudinary.ts
index 6576599c..80e42bba 100644
--- a/frontend/lib/env/cloudinary.ts
+++ b/frontend/lib/env/cloudinary.ts
@@ -23,10 +23,6 @@ export type CloudinaryEnv = {
   uploadFolder: string;
 };
 
-/**
- * Returns null if Cloudinary is not configured.
- * Never throws — safe to call anywhere (including during build).
- */
 export function getCloudinaryEnvOptional(): CloudinaryEnv | null {
   const cloudName = process.env.CLOUDINARY_CLOUD_NAME;
   const apiKey = process.env.CLOUDINARY_API_KEY;
@@ -46,10 +42,6 @@ export function getCloudinaryEnvOptional(): CloudinaryEnv | null {
   };
 }
 
-/**
- * Throws a typed error if Cloudinary is not configured.
- * Use this ONLY in code paths that actually upload/delete images.
- */
 export function getCloudinaryEnvRequired(): CloudinaryEnv {
   const missing: string[] = [];
   if (!process.env.CLOUDINARY_CLOUD_NAME) missing.push('CLOUDINARY_CLOUD_NAME');
diff --git a/frontend/lib/env/stripe.ts b/frontend/lib/env/stripe.ts
index 6c9238f4..2c9390c9 100644
--- a/frontend/lib/env/stripe.ts
+++ b/frontend/lib/env/stripe.ts
@@ -1,33 +1,36 @@
-import { getClientEnv, getRuntimeEnv } from "@/lib/env"
+import { getClientEnv, getRuntimeEnv } from '@/lib/env';
 
 export type StripeEnv = {
-  secretKey: string | null
-  webhookSecret: string | null
-  publishableKey: string | null
-  paymentsEnabled: boolean
-  mode: "test" | "live"
-}
+  secretKey: string | null;
+  webhookSecret: string | null;
+  publishableKey: string | null;
+  paymentsEnabled: boolean;
+  mode: 'test' | 'live';
+};
 
 function nonEmpty(v: string | undefined): string | null {
-  if (!v) return null
-  const t = v.trim()
-  return t.length > 0 ? t : null
+  if (!v) return null;
+  const t = v.trim();
+  return t.length > 0 ? t : null;
 }
 
 export function getStripeEnv(): StripeEnv {
-  const runtimeEnv = getRuntimeEnv()
-  const clientEnv = getClientEnv()
+  const runtimeEnv = getRuntimeEnv();
+  const clientEnv = getClientEnv();
 
-  const paymentsFlag = process.env.PAYMENTS_ENABLED ?? "false"
-  const secretKey = nonEmpty(process.env.STRIPE_SECRET_KEY)
-  const webhookSecret = nonEmpty(process.env.STRIPE_WEBHOOK_SECRET)
-  const publishableKey = nonEmpty(clientEnv.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY ?? undefined)
+  const paymentsFlag = process.env.PAYMENTS_ENABLED ?? 'false';
+  const secretKey = nonEmpty(process.env.STRIPE_SECRET_KEY);
+  const webhookSecret = nonEmpty(process.env.STRIPE_WEBHOOK_SECRET);
+  const publishableKey = nonEmpty(
+    clientEnv.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY ?? undefined
+  );
 
   const mode =
-    (nonEmpty(process.env.STRIPE_MODE) as "test" | "live" | null) ??
-    (runtimeEnv.NODE_ENV === "production" ? "live" : "test")
+    (nonEmpty(process.env.STRIPE_MODE) as 'test' | 'live' | null) ??
+    (runtimeEnv.NODE_ENV === 'production' ? 'live' : 'test');
 
-  const paymentsEnabled = paymentsFlag === "true" && !!secretKey && !!webhookSecret
+  const paymentsEnabled =
+    paymentsFlag === 'true' && !!secretKey && !!webhookSecret;
 
   if (!paymentsEnabled) {
     return {
@@ -36,7 +39,7 @@ export function getStripeEnv(): StripeEnv {
       publishableKey: null,
       paymentsEnabled: false,
       mode,
-    }
+    };
   }
 
   return {
@@ -45,9 +48,9 @@ export function getStripeEnv(): StripeEnv {
     publishableKey,
     paymentsEnabled: true,
     mode,
-  }
+  };
 }
 
 export function isPaymentsEnabled(): boolean {
-  return getStripeEnv().paymentsEnabled
+  return getStripeEnv().paymentsEnabled;
 }
diff --git a/frontend/lib/errors/products.ts b/frontend/lib/errors/products.ts
index 822e24d5..a652c59f 100644
--- a/frontend/lib/errors/products.ts
+++ b/frontend/lib/errors/products.ts
@@ -1,5 +1,3 @@
-// frontend/lib/errors/products.ts
-
 export class ProductNotFoundError extends Error {
   readonly code = 'PRODUCT_NOT_FOUND' as const;
 
diff --git a/frontend/lib/http/getBaseUrl.ts b/frontend/lib/http/getBaseUrl.ts
index 73306a00..13b89c38 100644
--- a/frontend/lib/http/getBaseUrl.ts
+++ b/frontend/lib/http/getBaseUrl.ts
@@ -1,15 +1,15 @@
 export function resolveBaseUrl(options: {
-    origin?: string | null;
-    host?: string | null;
+  origin?: string | null;
+  host?: string | null;
 }): string {
-    const base =
-        options.origin ||
-        process.env.NEXT_PUBLIC_SITE_URL ||
-        (options.host ? `https://${options.host}` : null);
+  const base =
+    options.origin ||
+    process.env.NEXT_PUBLIC_SITE_URL ||
+    (options.host ? `https://${options.host}` : null);
 
-    if (!base) {
-        throw new Error("Unable to determine base URL");
-    }
+  if (!base) {
+    throw new Error('Unable to determine base URL');
+  }
 
-    return base.replace(/\/$/, "");
-}
\ No newline at end of file
+  return base.replace(/\/$/, '');
+}
diff --git a/frontend/lib/logging.ts b/frontend/lib/logging.ts
index 5fb57ae9..b0af111e 100644
--- a/frontend/lib/logging.ts
+++ b/frontend/lib/logging.ts
@@ -45,7 +45,6 @@ function toErrorShape(
   }
 }
 
-// Simple redaction: prevents accidental leaking of secrets in logs.
 function redactJsonStringify(value: unknown): string {
   const SENSITIVE_KEY_RE =
     /(secret|token|password|authorization|cookie|api[_-]?key)/i;
@@ -75,15 +74,11 @@ function emit(
 
   const line = redactJsonStringify(payload);
 
-  // stderr for warn/error, stdout for debug/info
   if (level === 'error') console.error(line);
   else if (level === 'warn') console.warn(line);
   else console.log(line);
 }
 
-/**
- * Backward-compatible API (keep existing call sites working).
- */
 export function logError(
   context: string,
   error: unknown,
diff --git a/frontend/lib/logout.ts b/frontend/lib/logout.ts
index 061de614..50373e2a 100644
--- a/frontend/lib/logout.ts
+++ b/frontend/lib/logout.ts
@@ -1,9 +1,8 @@
-"use client";
+'use client';
 
 export async function logout() {
-  await fetch("/api/auth/logout", {
-    method: "POST",
-    credentials: "same-origin",
+  await fetch('/api/auth/logout', {
+    method: 'POST',
+    credentials: 'same-origin',
   });
-
-}  
\ No newline at end of file
+}
diff --git a/frontend/lib/pagination.ts b/frontend/lib/pagination.ts
index 2d07673b..864e8fbc 100644
--- a/frontend/lib/pagination.ts
+++ b/frontend/lib/pagination.ts
@@ -1,4 +1,3 @@
-// frontend/lib/pagination.ts
 export function parsePage(input?: string): number {
   const n = Number.parseInt(input ?? '1', 10);
   return Number.isFinite(n) && n > 0 ? n : 1;
diff --git a/frontend/lib/psp/stripe.ts b/frontend/lib/psp/stripe.ts
index 72e8185d..f471286d 100644
--- a/frontend/lib/psp/stripe.ts
+++ b/frontend/lib/psp/stripe.ts
@@ -1,4 +1,5 @@
 import Stripe from 'stripe';
+
 import { getStripeEnv } from '@/lib/env/stripe';
 import { logError } from '@/lib/logging';
 
@@ -13,7 +14,7 @@ type CreateRefundInput = {
   orderId: string;
   paymentIntentId?: string | null;
   chargeId?: string | null;
-  amountMinor?: number; // full refund: pass totalAmountMinor (recommended)
+  amountMinor?: number;
   idempotencyKey?: string;
 };
 
@@ -113,7 +114,6 @@ export async function createPaymentIntent({
     throw new Error('STRIPE_DISABLED');
   }
 
-  // Stripe amount must be an integer in minor units. Fail-closed on floats/NaN/huge values.
   if (!Number.isSafeInteger(amount) || amount <= 0) {
     throw new Error('STRIPE_INVALID_AMOUNT');
   }
diff --git a/frontend/lib/quiz/guest-quiz.ts b/frontend/lib/quiz/guest-quiz.ts
index 148fd52b..27612856 100644
--- a/frontend/lib/quiz/guest-quiz.ts
+++ b/frontend/lib/quiz/guest-quiz.ts
@@ -28,19 +28,19 @@ export function getPendingQuizResult(): PendingQuizResult | null {
   if (typeof window === 'undefined') {
     return null;
   }
-  
+
   const stored = localStorage.getItem(STORAGE_KEY);
   if (!stored) return null;
-  
+
   try {
     const result: PendingQuizResult = JSON.parse(stored);
     const expiryTime = result.savedAt + EXPIRY_HOURS * 60 * 60 * 1000;
-    
+
     if (Date.now() > expiryTime) {
       clearPendingQuizResult();
       return null;
     }
-    
+
     return result;
   } catch {
     clearPendingQuizResult();
@@ -51,4 +51,4 @@ export function getPendingQuizResult(): PendingQuizResult | null {
 export function clearPendingQuizResult(): void {
   if (typeof window === 'undefined') return;
   localStorage.removeItem(STORAGE_KEY);
-}
\ No newline at end of file
+}
diff --git a/frontend/lib/quiz/quiz-answers-redis.ts b/frontend/lib/quiz/quiz-answers-redis.ts
new file mode 100644
index 00000000..bcb4daec
--- /dev/null
+++ b/frontend/lib/quiz/quiz-answers-redis.ts
@@ -0,0 +1,91 @@
+import { and, eq } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { quizAnswers, quizQuestions } from '@/db/schema/quiz';
+import { getRedisClient } from '@/lib/redis';
+
+interface QuizAnswersCache {
+  quizId: string;
+  answers: Record<string, string>;
+  cachedAt: number;
+}
+
+function getCacheKey(quizId: string): string {
+  return `quiz:answers:${quizId}`;
+}
+
+export async function getOrCreateQuizAnswersCache(
+  quizId: string
+): Promise<boolean> {
+  const redis = getRedisClient();
+  if (!redis) {
+    console.warn('Redis not configured, skipping cache');
+    return true;
+  }
+
+  const key = getCacheKey(quizId);
+
+  const existing = await redis.get<QuizAnswersCache>(key);
+  if (existing) {
+    return true;
+  }
+
+  const correctAnswers = await db
+    .select({
+      questionId: quizQuestions.id,
+      answerId: quizAnswers.id,
+    })
+    .from(quizAnswers)
+    .innerJoin(quizQuestions, eq(quizAnswers.quizQuestionId, quizQuestions.id))
+    .where(
+      and(eq(quizQuestions.quizId, quizId), eq(quizAnswers.isCorrect, true))
+    );
+
+  if (correctAnswers.length === 0) {
+    return false;
+  }
+
+  const answersMap: Record<string, string> = {};
+  for (const row of correctAnswers) {
+    answersMap[row.questionId] = row.answerId;
+  }
+
+  const cacheData: QuizAnswersCache = {
+    quizId,
+    answers: answersMap,
+    cachedAt: Date.now(),
+  };
+
+  await redis.set(key, cacheData);
+  return true;
+}
+
+export async function getCorrectAnswer(
+  quizId: string,
+  questionId: string
+): Promise<string | null> {
+  const redis = getRedisClient();
+
+  if (redis) {
+    const key = getCacheKey(quizId);
+    const cache = await redis.get<QuizAnswersCache>(key);
+    if (cache) {
+      return cache.answers[questionId] ?? null;
+    }
+  }
+
+  const result = await db
+    .select({ answerId: quizAnswers.id })
+    .from(quizAnswers)
+    .innerJoin(quizQuestions, eq(quizAnswers.quizQuestionId, quizQuestions.id))
+    .where(
+      and(
+        eq(quizQuestions.quizId, quizId),
+        eq(quizQuestions.id, questionId),
+        eq(quizAnswers.isCorrect, true)
+      )
+    )
+    .limit(1);
+
+  return result[0]?.answerId ?? null;
+}
diff --git a/frontend/lib/quiz/quiz-crypto.ts b/frontend/lib/quiz/quiz-crypto.ts
deleted file mode 100644
index d6b3c283..00000000
--- a/frontend/lib/quiz/quiz-crypto.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { createCipheriv, createDecipheriv, randomBytes } from 'crypto';
-
-const ALGORITHM = 'aes-256-gcm';
-const IV_LENGTH = 16;
-const AUTH_TAG_LENGTH = 16;
-
-function getEncryptionKey(): Buffer {
-  const key = process.env.QUIZ_ENCRYPTION_KEY;
-  if (!key) {
-    throw new Error('QUIZ_ENCRYPTION_KEY environment variable is not set');
-  }
-  return Buffer.from(key, 'hex');
-}
-
-export interface CorrectAnswersMap {
-  [questionId: string]: string;
-}
-
-/**
- * Encrypts answers map. Returns base64 string: IV (16b) + AuthTag (16b) + CipherText
- */
-export function encryptAnswers(answers: CorrectAnswersMap): string {
-  const key = getEncryptionKey();
-  const iv = randomBytes(IV_LENGTH);
-  const cipher = createCipheriv(ALGORITHM, key, iv);
-
-  const plaintext = JSON.stringify(answers);
-  const encrypted = Buffer.concat([
-    cipher.update(plaintext, 'utf8'),
-    cipher.final(),
-  ]);
-
-  const authTag = cipher.getAuthTag();
-
-  const result = Buffer.concat([iv, authTag, encrypted]);
-  return result.toString('base64');
-}
-
-/**
- * Decrypts blob. Returns null if tampered or wrong key.
- */
-export function decryptAnswers(encryptedBlob: string): CorrectAnswersMap | null {
-  try {
-    const key = getEncryptionKey();
-    const data = Buffer.from(encryptedBlob, 'base64');
-
-    const iv = data.subarray(0, IV_LENGTH);
-    const authTag = data.subarray(IV_LENGTH, IV_LENGTH + AUTH_TAG_LENGTH);
-    const ciphertext = data.subarray(IV_LENGTH + AUTH_TAG_LENGTH);
-
-    const decipher = createDecipheriv(ALGORITHM, key, iv);
-    decipher.setAuthTag(authTag);
-
-    const decrypted = Buffer.concat([
-      decipher.update(ciphertext),
-      decipher.final(),
-    ]);
-
-    return JSON.parse(decrypted.toString('utf8'));
-  } catch {
-    // Decryption failed - tampered data or wrong key
-    return null;
-  }
-}
-
-/**
- * Creates encrypted blob from quiz questions
- */
-export function createEncryptedAnswersBlob(
-  questions: Array<{ id: string; answers: Array<{ id: string; isCorrect: boolean }> }>
-): string {
-  const answersMap: CorrectAnswersMap = {};
-
-  for (const question of questions) {
-    const correctAnswer = question.answers.find(a => a.isCorrect);
-    if (correctAnswer) {
-      answersMap[question.id] = correctAnswer.id;
-    }
-  }
-
-  return encryptAnswers(answersMap);
-}
diff --git a/frontend/lib/quiz/quiz-session.ts b/frontend/lib/quiz/quiz-session.ts
index 04f30f9b..a615e7ee 100644
--- a/frontend/lib/quiz/quiz-session.ts
+++ b/frontend/lib/quiz/quiz-session.ts
@@ -1,5 +1,5 @@
 const STORAGE_KEY_PREFIX = 'quiz_session_';
-const SESSION_TTL_MS = 30 * 60 * 1000; // 30 minutes
+const SESSION_TTL_MS = 30 * 60 * 1000;
 
 export interface QuizSessionData {
   status: 'rules' | 'in_progress' | 'completed';
@@ -21,7 +21,10 @@ export function saveQuizSession(quizId: string, state: QuizSessionData): void {
 
   try {
     const data = { ...state, savedAt: Date.now() };
-    localStorage.setItem(`${STORAGE_KEY_PREFIX}${quizId}`, JSON.stringify(data));
+    localStorage.setItem(
+      `${STORAGE_KEY_PREFIX}${quizId}`,
+      JSON.stringify(data)
+    );
   } catch (e) {
     console.error('Failed to save quiz session:', e);
   }
@@ -36,14 +39,12 @@ export function loadQuizSession(quizId: string): QuizSessionData | null {
 
     const data: QuizSessionData = JSON.parse(raw);
 
-    // Discard sessions older than 30 minutes
     if (Date.now() - data.savedAt > SESSION_TTL_MS) {
       clearQuizSession(quizId);
       return null;
     }
 
-    // Only restore in_progress sessions
-    if (data.status !== 'in_progress') {
+    if (data.status === 'rules') {
       clearQuizSession(quizId);
       return null;
     }
diff --git a/frontend/lib/redis.ts b/frontend/lib/redis.ts
index d25b651c..960298b1 100644
--- a/frontend/lib/redis.ts
+++ b/frontend/lib/redis.ts
@@ -1,4 +1,5 @@
 import { Redis } from '@upstash/redis';
+
 import { getServerEnv } from '@/lib/env';
 
 let cachedRedis: Redis | null = null;
diff --git a/frontend/lib/security/admin-csrf.ts b/frontend/lib/security/admin-csrf.ts
index bc445d16..e40c87c1 100644
--- a/frontend/lib/security/admin-csrf.ts
+++ b/frontend/lib/security/admin-csrf.ts
@@ -20,16 +20,6 @@ function readTokenFromHeader(request: unknown): string | null {
   return typeof raw === 'string' ? raw.trim() : null;
 }
 
-/**
- * Admin CSRF gate for cookie-based auth.
- * Token source:
- * - multipart/form-data: field CSRF_FORM_FIELD
- * - otherwise: header x-csrf-token
- *
- * Fail-closed:
- * - missing/invalid token => 403
- * - CSRF secret misconfigured => 503 (not 500)
- */
 export function requireAdminCsrf(
   request: NextRequest,
   purpose: string,
@@ -48,7 +38,6 @@ export function requireAdminCsrf(
     }
     return null;
   } catch (err) {
-    // e.g. CSRF_SECRET missing -> csrf.ts throws
     logError('CSRF verification failed (misconfigured)', err);
     return NextResponse.json({ code: 'CSRF_DISABLED' }, { status: 503 });
   }
diff --git a/frontend/lib/security/client-ip.ts b/frontend/lib/security/client-ip.ts
index 3505d759..a3bc09bb 100644
--- a/frontend/lib/security/client-ip.ts
+++ b/frontend/lib/security/client-ip.ts
@@ -1,8 +1,9 @@
 import 'server-only';
 
-import type { NextRequest } from 'next/server';
 import { isIP } from 'node:net';
 
+import type { NextRequest } from 'next/server';
+
 function envBool(name: string, fallback: boolean): boolean {
   const raw = (process.env[name] ?? '').trim().toLowerCase();
   if (!raw) return fallback;
diff --git a/frontend/lib/security/csrf.ts b/frontend/lib/security/csrf.ts
index a1f7589d..cfb6e481 100644
--- a/frontend/lib/security/csrf.ts
+++ b/frontend/lib/security/csrf.ts
@@ -1,12 +1,12 @@
 import 'server-only';
 
 import crypto from 'node:crypto';
+
 import type { NextRequest } from 'next/server';
 
 export const CSRF_FORM_FIELD = 'csrfToken' as const;
 
-const DEFAULT_TTL_SECONDS = 60 * 60; // 1h
-
+const DEFAULT_TTL_SECONDS = 60 * 60;
 function getSecret(): string {
   const secret = process.env.CSRF_SECRET;
   if (!secret) throw new Error('Missing env var: CSRF_SECRET');
@@ -35,10 +35,6 @@ function b64urlDecodeUtf8(input: string): string {
   return Buffer.from(input, 'base64url').toString('utf8');
 }
 
-/**
- * Stateless CSRF token: payload(JSON)->base64url + HMAC signature.
- * TTL enforced via exp (unix seconds).
- */
 export function issueCsrfToken(
   purpose: string,
   ttlSeconds = DEFAULT_TTL_SECONDS
@@ -80,17 +76,12 @@ export function verifyCsrfToken(token: string, purpose: string): boolean {
   if (typeof iat !== 'number' || !Number.isFinite(iat)) return false;
   if (typeof exp !== 'number' || !Number.isFinite(exp)) return false;
 
-  // TTL + basic sanity: exp must be >= now and not before iat
   if (exp < now) return false;
   if (exp < iat) return false;
 
   return true;
 }
 
-/**
- * Secondary defense: same-origin check.
- * Use Origin when present, otherwise fall back to Referer.
- */
 export function isSameOrigin(req: NextRequest): boolean {
   const expected = req.nextUrl.origin;
 
diff --git a/frontend/lib/security/origin.ts b/frontend/lib/security/origin.ts
index 00f66581..9fecea22 100644
--- a/frontend/lib/security/origin.ts
+++ b/frontend/lib/security/origin.ts
@@ -13,7 +13,6 @@ function buildErrorResponse(code: string, message: string) {
     { status: 403 }
   );
 
-  // Ensure security errors are never cached by intermediaries.
   res.headers.set('Cache-Control', 'no-store');
 
   return res;
@@ -23,10 +22,8 @@ export function normalizeOrigin(input: string): string {
   const trimmed = input.trim().replace(/\/+$/, '');
 
   try {
-    // If the input is a valid URL (incl. scheme), normalize to canonical origin.
     return new URL(trimmed).origin;
   } catch {
-    // Backward-compatible fallback for values like "example.com" (no scheme).
     return trimmed;
   }
 }
diff --git a/frontend/lib/security/rate-limit.ts b/frontend/lib/security/rate-limit.ts
index cc5e5ab2..7c60f0b3 100644
--- a/frontend/lib/security/rate-limit.ts
+++ b/frontend/lib/security/rate-limit.ts
@@ -1,10 +1,11 @@
 import 'server-only';
 
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
-import { isIP } from 'node:net';
 import { createHash } from 'node:crypto';
+import { isIP } from 'node:net';
+
 import { sql } from 'drizzle-orm';
+import type { NextRequest } from 'next/server';
+import { NextResponse } from 'next/server';
 
 import { db } from '@/db';
 
@@ -114,14 +115,11 @@ export function getClientIpFromHeaders(headers: Headers): string | null {
   );
   const trustCf = envBool('TRUST_CF_CONNECTING_IP', false);
 
-  // Allow Cloudflare canonical header (highest priority) only when explicitly trusted.
   if (trustCf) {
     const cf = (headers.get('cf-connecting-ip') ?? '').trim();
     if (cf && isIP(cf)) return cf;
   }
 
-  // Trusted boundary: if we don't trust forwarded headers,
-  // do NOT fall back to spoofable headers.
   if (!trustForwarded) return null;
 
   const xr = (headers.get('x-real-ip') ?? '').trim();
@@ -144,7 +142,6 @@ export function getClientIp(request: NextRequest): string | null {
 
 export function getRateLimitSubject(request: NextRequest): string {
   const ip = getClientIp(request);
-  // Keep subject clean/stable for IPv6 (no ":"), consistent with key normalization.
   if (ip) return normalizeRateLimitSubject(ip);
 
   const ua = (request.headers.get('user-agent') ?? '').trim();
@@ -158,11 +155,6 @@ export type RateLimitOk = { ok: true; remaining: number };
 export type RateLimitNo = { ok: false; retryAfterSeconds: number };
 export type RateLimitDecision = RateLimitOk | RateLimitNo;
 
-/**
- * DB-backed fixed-window limiter (cross-instance).
- * - Atomic insert/update with conditional WHERE to avoid going above limit.
- * - If limited: computes Retry-After from stored window_started_at.
- */
 export async function enforceRateLimit(params: {
   key: string;
   limit: number;
@@ -173,7 +165,6 @@ export async function enforceRateLimit(params: {
   const { legacyKey, normalizedKey } = normalizeRateLimitKey(params.key);
   const key = normalizedKey;
 
-  // Allow disabling via env (for emergency): RATE_LIMIT_DISABLED=1
   if (envInt('RATE_LIMIT_DISABLED', 0) === 1) {
     return { ok: true, remaining: Number.MAX_SAFE_INTEGER };
   }
@@ -192,8 +183,12 @@ export async function enforceRateLimit(params: {
             SELECT 1 FROM api_rate_limits WHERE key = ${normalizedKey}
           )
       `);
-    } catch {
-      // Ignore conflicts; fall through to use normalizedKey for enforcement.
+    } catch (err) {
+      console.warn(
+        '[rate-limit] Failed to migrate legacy key:',
+        legacyKey,
+        err
+      );
     }
   }
 
diff --git a/frontend/lib/security/stripe-webhook-rate-limit.ts b/frontend/lib/security/stripe-webhook-rate-limit.ts
index 38dbbac2..22875b43 100644
--- a/frontend/lib/security/stripe-webhook-rate-limit.ts
+++ b/frontend/lib/security/stripe-webhook-rate-limit.ts
@@ -5,7 +5,6 @@ type StripeWebhookRateLimitConfig = {
   windowSeconds: number;
 };
 
-// Must match previous inline defaults in the webhook route.
 const DEFAULT_STRIPE_WEBHOOK_RL_MAX = 30;
 const DEFAULT_STRIPE_WEBHOOK_RL_WINDOW_SECONDS = 60;
 
@@ -15,7 +14,6 @@ function parsePositiveIntStrict(raw: string | undefined): number | null {
   const trimmed = raw.trim();
   if (!trimmed) return null;
 
-  // Strict: digits only (no "+", "-", decimals, exponent, or "10abc").
   if (!/^\d+$/.test(trimmed)) return null;
 
   const parsed = Number.parseInt(trimmed, 10);
@@ -44,7 +42,7 @@ export function resolveStripeWebhookRateLimit(
         [
           process.env.STRIPE_WEBHOOK_MISSING_SIG_RL_MAX,
           process.env.STRIPE_WEBHOOK_RL_MAX,
-          // legacy fallback to preserve current behavior:
+
           process.env.STRIPE_WEBHOOK_INVALID_SIG_RL_MAX,
         ],
         DEFAULT_STRIPE_WEBHOOK_RL_MAX
@@ -53,7 +51,7 @@ export function resolveStripeWebhookRateLimit(
         [
           process.env.STRIPE_WEBHOOK_MISSING_SIG_RL_WINDOW_SECONDS,
           process.env.STRIPE_WEBHOOK_RL_WINDOW_SECONDS,
-          // legacy fallback to preserve current behavior:
+
           process.env.STRIPE_WEBHOOK_INVALID_SIG_RL_WINDOW_SECONDS,
         ],
         DEFAULT_STRIPE_WEBHOOK_RL_WINDOW_SECONDS
diff --git a/frontend/lib/services/errors.ts b/frontend/lib/services/errors.ts
index 529eca16..42be4771 100644
--- a/frontend/lib/services/errors.ts
+++ b/frontend/lib/services/errors.ts
@@ -1,7 +1,3 @@
-// export class InvalidPayloadError extends Error {
-//   code = "INVALID_PAYLOAD" as const
-// }
-
 export class IdempotencyConflictError extends Error {
   code = 'IDEMPOTENCY_CONFLICT' as const;
   details?: Record<string, unknown>;
@@ -31,9 +27,6 @@ export class OrderNotFoundError extends Error {
   }
 }
 
-// export class SlugConflictError extends Error {
-//   code = "SLUG_CONFLICT" as const
-// }
 export class InvalidPayloadError extends Error {
   code: string;
 
diff --git a/frontend/lib/services/inventory.ts b/frontend/lib/services/inventory.ts
index 9d34b8c4..fae284d2 100644
--- a/frontend/lib/services/inventory.ts
+++ b/frontend/lib/services/inventory.ts
@@ -1,4 +1,5 @@
 import { sql } from 'drizzle-orm';
+
 import { db } from '@/db';
 
 type ReserveResult =
@@ -12,26 +13,19 @@ function releaseKey(orderId: string, productId: string) {
   return `release:${orderId}:${productId}`;
 }
 
-// Robust status extractor for Drizzle/Neon variations.
-// We do NOT treat "unknown shape" as "insufficient" because that breaks invariants.
 function readStatus(res: unknown): string {
   const r: any = res as any;
 
-  // Common shapes:
-  // 1) { rows: [ { status: '...' } ] }
-  // 2) [ { status: '...' } ]
-  // 3) { rowCount, rows } but keys can be uppercase depending on driver
   const rows = Array.isArray(r)
     ? r
     : Array.isArray(r?.rows)
-    ? r.rows
-    : undefined;
+      ? r.rows
+      : undefined;
   const row = rows?.[0];
 
   const status = row?.status ?? row?.STATUS;
   if (typeof status === 'string' && status.length > 0) return status;
 
-  // Fail hard: better than silently turning into OUT_OF_STOCK and doing release.
   throw new Error(
     `inventory: unexpected db.execute result shape (missing status). ` +
       `Got: ${JSON.stringify(
diff --git a/frontend/lib/services/orders.ts b/frontend/lib/services/orders.ts
index 348b6a31..d774d915 100644
--- a/frontend/lib/services/orders.ts
+++ b/frontend/lib/services/orders.ts
@@ -1,12 +1,10 @@
 export { createOrderWithItems } from './orders/checkout';
-export { getOrderById, getOrderSummary } from './orders/summary';
 export { setOrderPaymentIntent } from './orders/payment-intent';
-
-export { restockOrder, restockOrder as restock } from './orders/restock';
+export { refundOrder } from './orders/refund';
+export { restockOrder as restock, restockOrder } from './orders/restock';
+export { getOrderById, getOrderSummary } from './orders/summary';
 export {
+  restockStaleNoPaymentOrders,
   restockStalePendingOrders,
   restockStuckReservingOrders,
-  restockStaleNoPaymentOrders,
 } from './orders/sweeps';
-
-export { refundOrder } from './orders/refund';
diff --git a/frontend/lib/services/orders/_shared.ts b/frontend/lib/services/orders/_shared.ts
index b1495f94..cfe5add1 100644
--- a/frontend/lib/services/orders/_shared.ts
+++ b/frontend/lib/services/orders/_shared.ts
@@ -1,12 +1,15 @@
 import crypto from 'crypto';
 
+import { db } from '@/db';
+import { orders } from '@/db/schema/shop';
 import { createCartItemKey } from '@/lib/shop/cart-item-key';
-import { type PaymentProvider } from '@/lib/shop/payments';
 import { type CurrencyCode } from '@/lib/shop/currency';
+import { type PaymentProvider } from '@/lib/shop/payments';
+import {
+  type CheckoutItem,
+  type OrderSummaryWithMinor,
+} from '@/lib/types/shop';
 import { MAX_QUANTITY_PER_LINE } from '@/lib/validation/shop';
-import { type CheckoutItem, type OrderSummaryWithMinor } from '@/lib/types/shop';
-import { orders } from '@/db/schema/shop';
-import { db } from '@/db';
 
 import { InvalidPayloadError, OrderStateInvalidError } from '../errors';
 
@@ -33,11 +36,9 @@ export function resolvePaymentProvider(
 
   if (provider === 'stripe' || provider === 'none') return provider;
 
-  // legacy / corrupted data fallback:
   if (order.paymentIntentId) return 'stripe';
   if (order.paymentStatus === 'paid') return 'none';
 
-  // safest default: treat as stripe to avoid skipping payment flows
   return 'stripe';
 }
 
@@ -92,7 +93,6 @@ export function hashIdempotencyRequest(params: {
   currency: string;
   userId: string | null;
 }) {
-  // Stable canonical form:
   const normalized = [...params.items]
     .map(i => ({
       productId: i.productId,
diff --git a/frontend/lib/services/orders/checkout.ts b/frontend/lib/services/orders/checkout.ts
index a767b7e8..adcafc03 100644
--- a/frontend/lib/services/orders/checkout.ts
+++ b/frontend/lib/services/orders/checkout.ts
@@ -1,10 +1,10 @@
 import { and, eq, inArray, ne, sql } from 'drizzle-orm';
 
-import { applyReserveMove } from '../inventory';
-import { logError, logWarn } from '@/lib/logging';
-import { isPaymentsEnabled } from '@/lib/env/stripe';
 import { db } from '@/db';
+import { coercePriceFromDb } from '@/db/queries/shop/orders';
 import { orderItems, orders, productPrices, products } from '@/db/schema/shop';
+import { isPaymentsEnabled } from '@/lib/env/stripe';
+import { logError, logWarn } from '@/lib/logging';
 import { resolveCurrencyFromLocale } from '@/lib/shop/currency';
 import {
   calculateLineTotal,
@@ -12,28 +12,27 @@ import {
   sumLineTotals,
   toDbMoney,
 } from '@/lib/shop/money';
+import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
 import {
   type CheckoutItem,
   type CheckoutResult,
   type OrderSummaryWithMinor,
 } from '@/lib/types/shop';
-import { coercePriceFromDb } from '@/db/queries/shop/orders';
-import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
 
 import {
-  InsufficientStockError,
   IdempotencyConflictError,
+  InsufficientStockError,
   InvalidPayloadError,
   InvalidVariantError,
   OrderNotFoundError,
-  PriceConfigError,
   OrderStateInvalidError,
+  PriceConfigError,
 } from '../errors';
-
+import { applyReserveMove } from '../inventory';
 import {
-  type Currency,
-  type CheckoutItemWithVariant,
   aggregateReserveByProductId,
+  type CheckoutItemWithVariant,
+  type Currency,
   hashIdempotencyRequest,
   isStrictNonNegativeInt,
   mergeCheckoutItems,
@@ -41,13 +40,9 @@ import {
   requireTotalCents,
   resolvePaymentProvider,
 } from './_shared';
-
-import { getOrderById, getOrderByIdempotencyKey } from './summary';
-import { restockOrder } from './restock';
 import { guardedPaymentStatusUpdate } from './payment-state';
-
-// NOTE: PaymentStatus semantics for Stripe:
-// pending (no PI yet) -> requires_payment (PI attached) -> paid/failed/refunded via provider events.
+import { restockOrder } from './restock';
+import { getOrderById, getOrderByIdempotencyKey } from './summary';
 
 async function reconcileNoPaymentOrder(
   orderId: string
@@ -76,7 +71,6 @@ async function reconcileNoPaymentOrder(
     paymentStatus: row.paymentStatus as PaymentStatus,
   });
 
-  // Only reconcile "no payments" workflow.
   if (provider !== 'none') return getOrderById(orderId);
 
   if (row.paymentIntentId) {
@@ -86,16 +80,11 @@ async function reconcileNoPaymentOrder(
     );
   }
 
-  // IMPORTANT:
-  // With DB CHECK, provider='none' cannot use pending/requires_payment.
-  // Therefore paymentStatus is not a reliable "finality" signal here.
-  // Finality is inventory-driven: if inventory is reserved, the order is complete.
   if (row.inventoryStatus === 'reserved') {
     return getOrderById(orderId);
   }
 
   if (row.inventoryStatus === 'release_pending') {
-    // Do not attempt to reserve again while release is pending.
     try {
       await restockOrder(orderId, {
         reason: 'failed',
@@ -112,8 +101,6 @@ async function reconcileNoPaymentOrder(
       row.failureMessage ?? 'Order cannot be completed (release pending).'
     );
   }
-
-  // If it was already released/restocked - treat as failed.
   if (
     row.inventoryStatus === 'released' ||
     row.stockRestored ||
@@ -192,8 +179,6 @@ async function reconcileNoPaymentOrder(
     return getOrderById(orderId);
   } catch (e) {
     const failAt = new Date();
-
-    // Mark as "release pending" only. Finalization must happen via restockOrder().
     const isOos = e instanceof InsufficientStockError;
 
     await db
@@ -205,7 +190,6 @@ async function reconcileNoPaymentOrder(
         failureMessage: isOos
           ? e.message
           : 'Checkout failed after reservation attempt.',
-        // IMPORTANT: do NOT set stockRestored/restockedAt here.
         updatedAt: failAt,
       })
       .where(eq(orders.id, orderId));
@@ -216,7 +200,6 @@ async function reconcileNoPaymentOrder(
         workerId: 'reconcileNoPaymentOrder',
       });
     } catch (restockErr) {
-      // If release fails, we must not lie in order state; leave it for sweeps/janitor.
       logError(
         `[reconcileNoPaymentOrder] restock failed orderId=${orderId}`,
         restockErr
@@ -241,14 +224,11 @@ async function getProductsForCheckout(
       stock: products.stock,
       sku: products.sku,
 
-      // variant option sets (text/CSV/JSON)
       colors: products.colors,
       sizes: products.sizes,
 
-      // canonical price (minor)
       priceMinor: productPrices.priceMinor,
 
-      // legacy fallback (keep for safety during rollout)
       price: productPrices.price,
 
       originalPrice: productPrices.originalPrice,
@@ -274,21 +254,18 @@ type CheckoutProductRow = Awaited<
 function parseVariantList(raw: unknown): string[] {
   if (raw == null) return [];
 
-  // If DB returns array (e.g. text[] / jsonb)
   if (Array.isArray(raw)) {
     const out = raw.map(x => normVariant(String(x))).filter(x => x.length > 0);
     return Array.from(new Set(out));
   }
 
   if (typeof raw !== 'string') {
-    // Unknown shape -> treat as "no configured variants"
     return [];
   }
 
   const v0 = raw.trim();
   if (!v0) return [];
 
-  // JSON array: '["S","M"]'
   if (v0.startsWith('[')) {
     try {
       const parsed = JSON.parse(v0);
@@ -299,17 +276,15 @@ function parseVariantList(raw: unknown): string[] {
         return Array.from(new Set(out));
       }
     } catch {
-      // fallthrough to CSV parsing
+      // Intentionally empty: fall through to delimiter-based parsing
     }
   }
 
-  // Postgres array literal string: '{S,M}'
   const v =
     v0.startsWith('{') && v0.endsWith('}')
       ? v0.slice(1, -1).replace(/"/g, '')
       : v0;
 
-  // CSV / ';' / newline
   const out = v
     .split(/[,;\n\r]+/g)
     .map(x => normVariant(x))
@@ -329,8 +304,6 @@ function priceItems(
     if (!product) {
       throw new InvalidPayloadError('Some products are unavailable.');
     }
-    //Price must exist for requested currency.
-    // With leftJoin, missing row => priceCurrency null and both price fields null.
     if (
       !product.priceCurrency ||
       (product.priceMinor == null && product.price == null)
@@ -341,7 +314,6 @@ function priceItems(
       });
     }
 
-    // canonical: int minor
     let unitPriceCents: number | null = null;
     if (product.priceMinor !== null && product.priceMinor !== undefined) {
       if (
@@ -352,8 +324,6 @@ function priceItems(
       }
       unitPriceCents = product.priceMinor;
     }
-
-    // safety fallback (should become dead code after migration + dual-write stabilizes)
     if (unitPriceCents == null) {
       const unitPrice = coercePriceFromDb(product.price, {
         field: 'price',
@@ -405,10 +375,6 @@ export async function createOrderWithItems({
   const paymentsEnabled = isPaymentsEnabled();
   const paymentProvider: PaymentProvider = paymentsEnabled ? 'stripe' : 'none';
 
-  // paymentStatus is initialized here only; ALL transitions must go via guardedPaymentStatusUpdate.
-  // IMPORTANT: DB CHECK requires provider='none' => payment_status in ('paid','failed')
-  // Avoid the cycle: requires_payment -> pending -> requires_payment.
-  // For Stripe, start at pending and switch to requires_payment only after PI is attached.
   const initialPaymentStatus: PaymentStatus =
     paymentProvider === 'none' ? 'paid' : 'pending';
 
@@ -438,7 +404,6 @@ export async function createOrderWithItems({
 
     if (!row) throw new OrderNotFoundError('Order not found');
 
-    // currency mismatch => hard conflict
     if (row.currency !== currency) {
       throw new IdempotencyConflictError(
         'Idempotency key already used with different currency.',
@@ -446,7 +411,6 @@ export async function createOrderWithItems({
       );
     }
 
-    // If DB hash is missing (legacy), derive from persisted state (order_items + order currency + userId)
     const derivedExistingHash =
       row.idempotencyRequestHash ??
       hashIdempotencyRequest({
@@ -461,7 +425,6 @@ export async function createOrderWithItems({
       });
 
     if (!row.idempotencyRequestHash) {
-      // best-effort: backfill for future strict checks
       try {
         await db
           .update(orders)
@@ -489,7 +452,6 @@ export async function createOrderWithItems({
     }
 
     if (row.paymentStatus === 'failed') {
-      // Best-effort cleanup if inventory was left reserved due to crash.
       try {
         await restockOrder(existing.id, { reason: 'failed' });
       } catch (restockErr) {
@@ -505,12 +467,9 @@ export async function createOrderWithItems({
     }
   }
 
-  // 1) idempotency read
   const existing = await getOrderByIdempotencyKey(db, idempotencyKey);
   if (existing) {
     await assertIdempotencyCompatible(existing);
-    // If payments are disabled, we must guarantee a final consistent state
-    // (previous run could have crashed after order insert).
     if (!paymentsEnabled) {
       const reconciled = await reconcileNoPaymentOrder(existing.id);
       return {
@@ -525,8 +484,6 @@ export async function createOrderWithItems({
       totalCents: requireTotalCents(existing),
     };
   }
-
-  // 3) pricing (read-only)
   const uniqueProductIds = Array.from(
     new Set(normalizedItems.map(i => i.productId))
   );
@@ -537,7 +494,6 @@ export async function createOrderWithItems({
   }
 
   const productMap = new Map(dbProducts.map(p => [p.id, p]));
-  // 3.1) Variant validation (fail-fast; no side effects)
   const variantMap = new Map(
     dbProducts.map(p => [
       p.id,
@@ -550,7 +506,11 @@ export async function createOrderWithItems({
 
   for (const item of normalizedItems) {
     const cfg = variantMap.get(item.productId);
-    if (!cfg) continue; // product existence handled elsewhere
+    if (!cfg) {
+      throw new InvalidPayloadError(
+        `Invariant violation: missing variant config for product ${item.productId} (normalizedItems=${normalizedItems.length}, uniqueProductIds=${uniqueProductIds.length}, dbProducts=${dbProducts.length}).`
+      );
+    }
 
     const selectedSize = normVariant(item.selectedSize ?? '');
     const selectedColor = normVariant(item.selectedColor ?? '');
@@ -587,7 +547,6 @@ export async function createOrderWithItems({
   const pricedItems = priceItems(normalizedItems, productMap, currency);
   const orderTotalCents = sumLineTotals(pricedItems.map(i => i.lineTotalCents));
 
-  // 4) create order skeleton (CREATED/none)
   let orderId: string;
   try {
     const [created] = await db
@@ -601,16 +560,13 @@ export async function createOrderWithItems({
         paymentProvider,
         paymentIntentId: null,
 
-        // new workflow fields:
         status: 'CREATED',
-        // IMPORTANT (no-payments): payment_status must be 'paid' due to DB CHECK,
-        // so we must track in-progress via inventory_status.
+
         inventoryStatus: paymentsEnabled ? 'none' : 'reserving',
         failureCode: null,
         failureMessage: null,
         idempotencyRequestHash: requestHash,
 
-        // legacy/idempotency:
         stockRestored: false,
         restockedAt: null,
         idempotencyKey,
@@ -624,7 +580,6 @@ export async function createOrderWithItems({
     if ((error as { code?: string }).code === '23505') {
       const existingOrder = await getOrderByIdempotencyKey(db, idempotencyKey);
       if (existingOrder) {
-        // IMPORTANT: in race conditions, we MUST still enforce hash/currency compatibility
         await assertIdempotencyCompatible(existingOrder);
         if (!paymentsEnabled) {
           const reconciled = await reconcileNoPaymentOrder(existingOrder.id);
@@ -644,7 +599,6 @@ export async function createOrderWithItems({
     throw error;
   }
 
-  // 5) upsert order_items (requires UNIQUE(order_id, product_id, selected_size, selected_color))
   if (pricedItems.length) {
     await db
       .insert(orderItems)
@@ -693,13 +647,11 @@ export async function createOrderWithItems({
     .set({ inventoryStatus: 'reserving', updatedAt: now })
     .where(eq(orders.id, orderId));
 
-  // stock is per-product => reserve aggregated by productId across variants
   const itemsToReserve = aggregateReserveByProductId(
     pricedItems.map(i => ({ productId: i.productId, quantity: i.quantity }))
   );
 
   try {
-    // 7) reserve inventory (idempotent + atomic in inventory.ts)
     for (const item of itemsToReserve) {
       const res = await applyReserveMove(
         orderId,
@@ -713,7 +665,6 @@ export async function createOrderWithItems({
       }
     }
 
-    // 8) success
     await db
       .update(orders)
       .set({
@@ -768,7 +719,6 @@ export async function createOrderWithItems({
         failureMessage: isOos
           ? e.message
           : 'Checkout failed after reservation attempt.',
-        // IMPORTANT: do NOT set stockRestored/restockedAt here.
         updatedAt: failAt,
       })
       .where(eq(orders.id, orderId));
diff --git a/frontend/lib/services/orders/payment-attempts.ts b/frontend/lib/services/orders/payment-attempts.ts
index 8bcbfa83..a6ab6f69 100644
--- a/frontend/lib/services/orders/payment-attempts.ts
+++ b/frontend/lib/services/orders/payment-attempts.ts
@@ -4,11 +4,11 @@ import { and, eq, sql } from 'drizzle-orm';
 
 import { db } from '@/db';
 import { paymentAttempts } from '@/db/schema';
-import { readStripePaymentIntentParams } from '@/lib/services/orders/payment-intent';
-import { createPaymentIntent, retrievePaymentIntent } from '@/lib/psp/stripe';
-import { setOrderPaymentIntent } from '@/lib/services/orders';
 import { logError } from '@/lib/logging';
+import { createPaymentIntent, retrievePaymentIntent } from '@/lib/psp/stripe';
 import { OrderStateInvalidError } from '@/lib/services/errors';
+import { setOrderPaymentIntent } from '@/lib/services/orders';
+import { readStripePaymentIntentParams } from '@/lib/services/orders/payment-intent';
 
 export type PaymentProvider = 'stripe';
 export type PaymentAttemptStatus =
@@ -99,7 +99,6 @@ async function createActiveAttempt(
     if (!row) throw new Error('Failed to insert payment_attempts row');
     return row;
   } catch (e) {
-    // race: another request may have created active attempt, return it
     const existing = await getActiveAttempt(orderId, provider);
     if (existing) return existing;
     throw e;
@@ -114,7 +113,6 @@ async function upsertBackfillAttemptForExistingPI(args: {
 }): Promise<PaymentAttemptRow> {
   const { orderId, provider, paymentIntentId, maxAttempts } = args;
 
-  // If an attempt already references this PI, reuse it.
   const found = await db
     .select()
     .from(paymentAttempts)
@@ -128,11 +126,8 @@ async function upsertBackfillAttemptForExistingPI(args: {
 
   const existingAttempt = found[0] ?? null;
   if (existingAttempt) {
-    // Guard: never reuse attempt that belongs to a different order (cross-order PI reuse).
     if (existingAttempt.orderId === orderId) return existingAttempt;
 
-    // Fail-closed: PI is already linked to another order. Do NOT create a new attempt
-    // that would bind this PI to a second order.
     throw new OrderStateInvalidError(
       'PaymentIntent is already associated with a different order.',
       {
@@ -173,21 +168,12 @@ async function upsertBackfillAttemptForExistingPI(args: {
 
     return inserted[0]!;
   } catch (e) {
-    // On conflict (active unique), return active attempt.
     const active = await getActiveAttempt(orderId, provider);
     if (active) return active;
     throw e;
   }
 }
 
-/**
- * P0.7 entrypoint:
- * - no infinite PaymentIntents per order (durable attempt)
- * - controlled init (one active attempt)
- * - audit trail (payment_attempts)
- *
- * Returns clientSecret to initialize Stripe Elements.
- */
 export async function ensureStripePaymentIntentForOrder(args: {
   orderId: string;
   existingPaymentIntentId?: string | null;
@@ -202,10 +188,8 @@ export async function ensureStripePaymentIntentForOrder(args: {
   const provider: PaymentProvider = 'stripe';
   const maxAttempts = args.maxAttempts ?? DEFAULT_MAX_ATTEMPTS;
 
-  // 1) If we already have an active attempt, prefer it.
   let attempt = await getActiveAttempt(orderId, provider);
 
-  // 2) If order already has a PI, ensure there is an attempt row for it (audit/backfill).
   if (!attempt && existingPaymentIntentId && existingPaymentIntentId.trim()) {
     attempt = await upsertBackfillAttemptForExistingPI({
       orderId,
@@ -214,12 +198,10 @@ export async function ensureStripePaymentIntentForOrder(args: {
       maxAttempts,
     });
   }
-  // 3) If still none — create new attempt (with limit).
   if (!attempt) {
     attempt = await createActiveAttempt(orderId, provider, maxAttempts);
   }
 
-  // 4) If attempt already has PI — retrieve (and handle canceled).
   if (
     attempt.providerPaymentIntentId &&
     attempt.providerPaymentIntentId.trim()
@@ -228,7 +210,6 @@ export async function ensureStripePaymentIntentForOrder(args: {
       attempt.providerPaymentIntentId.trim()
     );
 
-    // If PI was canceled, mark attempt canceled and create a new attempt (bounded by maxAttempts).
     if (pi.status === 'canceled') {
       await db
         .update(paymentAttempts)
@@ -284,7 +265,6 @@ export async function ensureStripePaymentIntentForOrder(args: {
     };
   }
 
-  // 5) No PI yet -> create PI using DB readback (P0.6 invariant), idempotent by attempt.
   try {
     const snapshot = await readStripePaymentIntentParams(orderId);
 
@@ -336,10 +316,6 @@ export async function ensureStripePaymentIntentForOrder(args: {
   }
 }
 
-/**
- * Webhook helper: mark attempt final by Stripe PI id.
- * Call this from stripe webhook route for succeeded/failed/canceled.
- */
 export async function markStripeAttemptFinal(args: {
   paymentIntentId: string;
   status: 'succeeded' | 'failed' | 'canceled';
@@ -353,8 +329,8 @@ export async function markStripeAttemptFinal(args: {
       status === 'succeeded'
         ? 'succeeded'
         : status === 'canceled'
-        ? 'canceled'
-        : 'failed';
+          ? 'canceled'
+          : 'failed';
 
     await db
       .update(paymentAttempts)
@@ -368,7 +344,6 @@ export async function markStripeAttemptFinal(args: {
       })
       .where(eq(paymentAttempts.providerPaymentIntentId, paymentIntentId));
   } catch (error) {
-    // IMPORTANT: fail-open — не ламаємо webhook через audit layer
     logError('payment_attempt_finalize_failed', error, {
       paymentIntentId: args.paymentIntentId,
       status: args.status,
diff --git a/frontend/lib/services/orders/payment-intent.ts b/frontend/lib/services/orders/payment-intent.ts
index 45019e5d..5ab0113e 100644
--- a/frontend/lib/services/orders/payment-intent.ts
+++ b/frontend/lib/services/orders/payment-intent.ts
@@ -4,14 +4,15 @@ import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
 import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
 import { type OrderSummaryWithMinor } from '@/lib/types/shop';
+
 import {
   InvalidPayloadError,
   OrderNotFoundError,
   OrderStateInvalidError,
 } from '../errors';
 import { resolvePaymentProvider } from './_shared';
-import { getOrderItems, parseOrderSummary } from './summary';
 import { guardedPaymentStatusUpdate } from './payment-state';
+import { getOrderItems, parseOrderSummary } from './summary';
 
 export async function setOrderPaymentIntent({
   orderId,
@@ -35,8 +36,6 @@ export async function setOrderPaymentIntent({
     );
   }
 
-  // New flow: pending -> requires_payment when attaching PI.
-  // Keep requires_payment only for backward-compat (old orders created before this change).
   const allowed: PaymentStatus[] = ['pending', 'requires_payment'];
   if (!allowed.includes(existing.paymentStatus as PaymentStatus)) {
     throw new InvalidPayloadError(
@@ -71,8 +70,6 @@ export async function setOrderPaymentIntent({
   });
 
   if (!res.applied) {
-    // Keep error semantics consistent with previous validation rules.
-    // This also guarantees we won't ever do failed/refunded -> requires_payment.
     throw new InvalidPayloadError(
       `Order payment intent update blocked (${res.reason}).`
     );
@@ -110,7 +107,6 @@ export async function readStripePaymentIntentParams(orderId: string): Promise<{
     );
   }
 
-  // Payable-state gate: fail-closed for paid/failed/refunded/canceled/etc.
   const allowed: PaymentStatus[] = ['pending', 'requires_payment'];
   if (!allowed.includes(existing.paymentStatus as PaymentStatus)) {
     throw new OrderStateInvalidError(
@@ -130,7 +126,6 @@ export async function readStripePaymentIntentParams(orderId: string): Promise<{
 
   const amountMinor = existing.totalAmountMinor;
 
-  // Canonical money source = DB minor units. Fail-closed on invalid totals.
   if (!Number.isSafeInteger(amountMinor) || amountMinor <= 0) {
     throw new OrderStateInvalidError(
       'Invalid order total for Stripe payment intent creation.',
diff --git a/frontend/lib/services/orders/payment-state.ts b/frontend/lib/services/orders/payment-state.ts
index a2838d8c..4f6edcca 100644
--- a/frontend/lib/services/orders/payment-state.ts
+++ b/frontend/lib/services/orders/payment-state.ts
@@ -1,4 +1,5 @@
 import { and, eq, inArray, type SQL } from 'drizzle-orm';
+
 import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
 import { logWarn } from '@/lib/logging';
@@ -12,19 +13,14 @@ export type PaymentTransitionSource =
   | 'janitor'
   | 'system';
 
-// Stripe flow transitions
 const ALLOWED_FROM_STRIPE: Record<PaymentStatus, readonly PaymentStatus[]> = {
   pending: ['requires_payment'],
   requires_payment: ['pending'],
   paid: ['pending', 'requires_payment'],
   failed: ['pending', 'requires_payment'],
-  // allow refunds even if we missed/never persisted "paid" (webhook ordering / retries)
   refunded: ['paid', 'pending', 'requires_payment'],
 };
 
-// payment_provider='none' (no-payments) rules:
-// DB CHECK already enforces only ('paid','failed'), and in this workflow 'paid' is not finality.
-// We allow paid -> failed (e.g. inventory failed / stale orphan), but NOT failed -> paid.
 const ALLOWED_FROM_NONE: Record<PaymentStatus, readonly PaymentStatus[]> = {
   pending: [],
   requires_payment: [],
@@ -57,29 +53,14 @@ function hasSetFields(set: unknown): boolean {
 export type GuardedPaymentUpdateArgs = {
   orderId: string;
 
-  /**
-   * IMPORTANT: caller must pass the provider policy explicitly.
-   * This prevents accidental use of Stripe rules for no-payments (and vice versa).
-   */
   paymentProvider: PaymentProvider;
 
   to: PaymentStatus;
 
-  /**
-   * Extra fields updated together with paymentStatus (psp fields, status, timestamps, etc).
-   * paymentStatus MUST NOT be provided here.
-   */
   set?: Partial<Omit<typeof orders.$inferInsert, 'paymentStatus' | 'id'>>;
 
-  /**
-   * Extra WHERE conditions (stock/inventory safety gates, repair gates, etc)
-   */
   extraWhere?: SQL;
 
-  /**
-   * Allow "same-state update" to apply set (needed for repair updates).
-   * Default: true if set has any fields.
-   */
   allowSameStateUpdate?: boolean;
 
   source: PaymentTransitionSource;
@@ -101,9 +82,7 @@ export type GuardedPaymentUpdateResult =
       currentProvider?: PaymentProvider;
     };
 
-async function getCurrentState(
-  orderId: string
-): Promise<{
+async function getCurrentState(orderId: string): Promise<{
   paymentStatus: PaymentStatus;
   paymentProvider: PaymentProvider;
 } | null> {
@@ -124,7 +103,6 @@ export async function guardedPaymentStatusUpdate(
 ): Promise<GuardedPaymentUpdateResult> {
   const { orderId, paymentProvider, to, source, eventId, note } = args;
 
-  // Hard reject invalid targets for no-payments before we even touch DB.
   if (
     paymentProvider === 'none' &&
     (to === 'pending' || to === 'requires_payment' || to === 'refunded')
@@ -158,7 +136,6 @@ export async function guardedPaymentStatusUpdate(
     ? Array.from(new Set([...baseAllowed, to]))
     : baseAllowed;
 
-  // If nothing is eligible (e.g. provider none + pending), block early
   if (!eligibleFrom.length) {
     const current = await getCurrentState(orderId);
     if (!current) return { applied: false, reason: 'NOT_FOUND' };
@@ -201,7 +178,6 @@ export async function guardedPaymentStatusUpdate(
 
   if (updated.length > 0) return { applied: true };
 
-  // Diagnose why not applied
   const current = await getCurrentState(orderId);
   if (!current) return { applied: false, reason: 'NOT_FOUND' };
 
@@ -253,7 +229,6 @@ export async function guardedPaymentStatusUpdate(
     };
   }
 
-  // Transition is allowed by matrix, but blocked by extraWhere (stockRestored/inventoryStatus gates etc)
   return {
     applied: false,
     reason: 'BLOCKED',
@@ -262,5 +237,4 @@ export async function guardedPaymentStatusUpdate(
   };
 }
 
-// Export for unit testing (transition matrix)
 export const __paymentTransitions = { isAllowed, allowedFrom };
diff --git a/frontend/lib/services/orders/psp-metadata/refunds.ts b/frontend/lib/services/orders/psp-metadata/refunds.ts
index 80e85d5a..14d3089e 100644
--- a/frontend/lib/services/orders/psp-metadata/refunds.ts
+++ b/frontend/lib/services/orders/psp-metadata/refunds.ts
@@ -23,7 +23,6 @@ function toNonEmptyString(v: unknown): string | null {
 function toCurrency(v: unknown, fallback: string): string {
   const s = toNonEmptyString(v);
   if (!s) return fallback;
-  // keep tolerant but normalize common cases (usd -> USD)
   return s.toUpperCase();
 }
 
@@ -32,12 +31,11 @@ function toAmountMinor(v: unknown): number | null {
     typeof v === 'number'
       ? v
       : typeof v === 'string' && v.trim().length
-      ? Number(v)
-      : NaN;
+        ? Number(v)
+        : NaN;
 
   if (!Number.isFinite(n)) return null;
 
-  // money minor must be integer >= 0
   const i = Math.trunc(n);
   if (i < 0) return null;
   if (!Number.isSafeInteger(i)) return null;
@@ -58,8 +56,8 @@ function normalizeRefundRecord(
     (typeof (r as any).refundId === 'number'
       ? String((r as any).refundId)
       : typeof (r as any).id === 'number'
-      ? String((r as any).id)
-      : null);
+        ? String((r as any).id)
+        : null);
 
   if (!refundId) return null;
 
@@ -98,7 +96,6 @@ export function normalizeRefundsFromMeta(
   const m = ensureMetaObject(meta) as any;
 
   if (Array.isArray(m.refunds)) {
-    // hardening: only return validated records
     return (m.refunds as unknown[])
       .map(r => normalizeRefundRecord(r, fallback))
       .filter((r): r is RefundMetaRecord => r !== null);
diff --git a/frontend/lib/services/orders/refund.ts b/frontend/lib/services/orders/refund.ts
index 6cfc37af..f83f43d7 100644
--- a/frontend/lib/services/orders/refund.ts
+++ b/frontend/lib/services/orders/refund.ts
@@ -3,12 +3,13 @@ import { eq } from 'drizzle-orm';
 import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
 import { createRefund } from '@/lib/psp/stripe';
+
 import { InvalidPayloadError, OrderNotFoundError } from '../errors';
-import { getOrderById } from './summary';
 import {
   appendRefundToMeta,
   normalizeRefundsFromMeta,
 } from './psp-metadata/refunds';
+import { getOrderById } from './summary';
 
 function invalid(code: string, message: string): InvalidPayloadError {
   return new InvalidPayloadError(message, { code });
@@ -36,7 +37,6 @@ export async function refundOrder(
 
   if (!order) throw new OrderNotFoundError(orderId);
 
-  // Preconditions (fail-closed)
   if (order.paymentProvider !== 'stripe') {
     throw invalid(
       'REFUND_PROVIDER_NOT_STRIPE',
@@ -79,7 +79,6 @@ export async function refundOrder(
     currency
   );
 
-  // Domain idempotency: if already recorded in metadata — return summary
   const existingRefunds = normalizeRefundsFromMeta(order.pspMetadata, {
     currency,
     createdAt: order.createdAt.toISOString(),
@@ -92,7 +91,6 @@ export async function refundOrder(
     return await getOrderById(orderId);
   }
 
-  // Real Stripe call (Stripe-idempotent)
   const { refundId, status } = await createRefund({
     orderId,
     paymentIntentId,
@@ -117,7 +115,6 @@ export async function refundOrder(
     },
   });
 
-  // Persist ONLY metadata. payment_status not touched (source of truth = webhook)
   await db
     .update(orders)
     .set({
diff --git a/frontend/lib/services/orders/restock.ts b/frontend/lib/services/orders/restock.ts
index b842c071..1a37c3cd 100644
--- a/frontend/lib/services/orders/restock.ts
+++ b/frontend/lib/services/orders/restock.ts
@@ -1,23 +1,24 @@
 import crypto from 'node:crypto';
+
 import { and, eq, isNull, lt, ne, or } from 'drizzle-orm';
 
-import { applyReleaseMove } from '../inventory';
 import { db } from '@/db';
 import { inventoryMoves, orders } from '@/db/schema/shop';
+import { logWarn } from '@/lib/logging';
 import { type PaymentStatus } from '@/lib/shop/payments';
-import { guardedPaymentStatusUpdate } from './payment-state';
+
 import { OrderNotFoundError, OrderStateInvalidError } from '../errors';
+import { applyReleaseMove } from '../inventory';
 import { resolvePaymentProvider } from './_shared';
-import { logWarn } from '@/lib/logging';
+import { guardedPaymentStatusUpdate } from './payment-state';
+
+const PAYMENT_STATUS_KEY = 'paymentStatus' as const;
 
 export type RestockReason = 'failed' | 'refunded' | 'canceled' | 'stale';
 export type RestockOptions = {
   reason?: RestockReason;
-  /** If caller already claimed the order (e.g. sweep), skip local claim. */
   alreadyClaimed?: boolean;
-  /** Lease TTL for restock claim */
   claimTtlMinutes?: number;
-  /** Who is claiming (trace/debug) */
   workerId?: string;
 };
 
@@ -42,7 +43,6 @@ async function tryClaimRestockLease(params: {
       and(
         eq(orders.id, params.orderId),
         eq(orders.stockRestored, false),
-        // claim gate: only unclaimed or expired claims can be claimed
         or(
           isNull(orders.sweepClaimExpiresAt),
           lt(orders.sweepClaimExpiresAt, now)
@@ -64,7 +64,7 @@ export async function restockOrder(
     .select({
       id: orders.id,
       paymentProvider: orders.paymentProvider,
-      paymentStatus: orders.paymentStatus,
+      [PAYMENT_STATUS_KEY]: orders.paymentStatus,
       paymentIntentId: orders.paymentIntentId,
       inventoryStatus: orders.inventoryStatus,
       stockRestored: orders.stockRestored,
@@ -82,7 +82,6 @@ export async function restockOrder(
   const provider = resolvePaymentProvider(order);
   const transitionSource = options?.alreadyClaimed ? 'janitor' : 'system';
 
-  // already released / legacy idempotency
   if (
     order.inventoryStatus === 'released' ||
     order.stockRestored ||
@@ -90,7 +89,6 @@ export async function restockOrder(
   )
     return;
 
-  // If state says "none" we still may have reserve moves (crash between reserve and status update).
   const reservedMoves = await db
     .select({
       productId: inventoryMoves.productId,
@@ -105,7 +103,6 @@ export async function restockOrder(
     );
 
   if (reservedMoves.length === 0) {
-    // safety: paid can only be terminalized via refund
     if (
       !isNoPayment &&
       order.paymentStatus === 'paid' &&
@@ -113,11 +110,13 @@ export async function restockOrder(
     ) {
       throw new OrderStateInvalidError(
         `Cannot terminalize an orphan paid order without refund reason.`,
-        { orderId, details: { reason, paymentStatus: order.paymentStatus } }
+        {
+          orderId,
+          details: { reason, [PAYMENT_STATUS_KEY]: order.paymentStatus },
+        }
       );
     }
 
-    // No inventory was reserved. If caller gave no reason, do nothing (fail-closed).
     if (!reason) return;
 
     const now = new Date();
@@ -129,8 +128,8 @@ export async function restockOrder(
       (reason === 'failed'
         ? 'FAILED_ORPHAN'
         : reason === 'canceled'
-        ? 'CANCELED_ORPHAN'
-        : 'STALE_ORPHAN');
+          ? 'CANCELED_ORPHAN'
+          : 'STALE_ORPHAN');
 
     const [touched] = await db
       .update(orders)
@@ -166,7 +165,6 @@ export async function restockOrder(
         paymentProvider: provider,
         to: normalizedStatus,
         source: transitionSource,
-        // bind to this exact finalize marker (prevents races)
         extraWhere: eq(orders.restockedAt, now),
       });
     }
@@ -174,18 +172,15 @@ export async function restockOrder(
     return;
   }
 
-  // safety: paid can only be released via refund
-  // IMPORTANT: for payment_provider='none', payment_status='paid' is not a finality signal
-  // (forced by DB CHECK). Finality is inventory_status='reserved'.
   if (!isNoPayment && order.paymentStatus === 'paid' && reason !== 'refunded') {
     throw new OrderStateInvalidError(
       `Cannot restock a paid order without refund reason.`,
-      { orderId, details: { reason, paymentStatus: order.paymentStatus } }
+      {
+        orderId,
+        details: { reason, [PAYMENT_STATUS_KEY]: order.paymentStatus },
+      }
     );
   }
-  // If we have reserved moves, we must claim a lease to avoid concurrent double-processing.
-  // (Actual stock safety is guaranteed by inventory_moves move_key, but lease prevents wasted work
-  // and prevents "restocked_at" churn under concurrency.)
   const claimTtlMinutes = options?.claimTtlMinutes ?? 5;
   const workerId = options?.workerId ?? 'restock';
   if (!options?.alreadyClaimed) {
@@ -194,7 +189,7 @@ export async function restockOrder(
       workerId,
       claimTtlMinutes,
     });
-    if (!claimed) return; // someone else is processing
+    if (!claimed) return;
   }
   const now = new Date();
 
@@ -203,9 +198,6 @@ export async function restockOrder(
     .set({ inventoryStatus: 'release_pending', updatedAt: now })
     .where(and(eq(orders.id, orderId), ne(orders.inventoryStatus, 'released')));
 
-  // Apply release moves. IMPORTANT invariant:
-  // do NOT mark released/stockRestored/restockedAt unless all releases are CONFIRMED ok.
-
   const releaseFailures: Array<{ productId: string; reason: string }> = [];
 
   for (const item of reservedMoves) {
@@ -220,8 +212,8 @@ export async function restockOrder(
         typeof res === 'boolean'
           ? res === false
           : res && typeof res === 'object' && 'applied' in (res as any)
-          ? (res as any).applied === false
-          : false;
+            ? (res as any).applied === false
+            : false;
 
       if (appliedFalse) {
         const detail =
@@ -258,8 +250,6 @@ export async function restockOrder(
       details +
       (releaseFailures.length > 3 ? ', ...' : '');
 
-    // FAIL-SAFE: leave order in a state janitor can safely retry.
-    // Do NOT set: inventoryStatus='released' OR stockRestored=true OR restockedAt!=null.
     const shouldSetFailureCode = reason === 'failed' || reason === 'stale';
     await db
       .update(orders)
@@ -279,8 +269,7 @@ export async function restockOrder(
 
     return;
   }
-  // FINALIZE ONCE: only one caller may flip stock_restored/restocked_at
-  // If RETURNING is empty => already finalized by another worker (or previous attempt).
+
   const finalizedAt = new Date();
   const [finalized] = await db
     .update(orders)
@@ -317,7 +306,7 @@ export async function restockOrder(
       paymentProvider: provider,
       to: normalizedStatus,
       source: transitionSource,
-      // bind to finalize-once marker
+
       extraWhere: eq(orders.restockedAt, finalizedAt),
     });
   }
diff --git a/frontend/lib/services/orders/summary.ts b/frontend/lib/services/orders/summary.ts
index 58803ff6..246115e4 100644
--- a/frontend/lib/services/orders/summary.ts
+++ b/frontend/lib/services/orders/summary.ts
@@ -5,11 +5,7 @@ import { orderItems, orders, products } from '@/db/schema/shop';
 import { fromCents, fromDbMoney } from '@/lib/shop/money';
 import { type OrderDetail, type OrderSummaryWithMinor } from '@/lib/types/shop';
 
-import {
-  OrderNotFoundError,
-  OrderStateInvalidError,
-} from '../errors';
-
+import { OrderNotFoundError, OrderStateInvalidError } from '../errors';
 import {
   type DbClient,
   type OrderRow,
@@ -97,12 +93,8 @@ export function parseOrderSummary(
       selectedSize: item.selectedSize ?? '',
       selectedColor: item.selectedColor ?? '',
       quantity: item.quantity,
-
-      // canonical:
       unitPriceMinor,
       lineTotalMinor,
-
-      // display/legacy:
       unitPrice: fromCents(unitPriceMinor),
       lineTotal: fromCents(lineTotalMinor),
     };
@@ -130,9 +122,7 @@ export function parseOrderSummary(
 
   return {
     id: order.id,
-    // canonical:
     totalAmountMinor,
-    // display/legacy:
     totalAmount: fromCents(totalAmountMinor),
     currency: order.currency,
     paymentStatus: order.paymentStatus,
@@ -169,7 +159,6 @@ export async function getOrderSummary(
   return getOrderById(id);
 }
 
-// Internal helper (used by checkout idempotency)
 export async function getOrderByIdempotencyKey(
   dbClient: DbClient,
   key: string
diff --git a/frontend/lib/services/orders/sweeps.ts b/frontend/lib/services/orders/sweeps.ts
index f2e82a91..0d4732f2 100644
--- a/frontend/lib/services/orders/sweeps.ts
+++ b/frontend/lib/services/orders/sweeps.ts
@@ -1,5 +1,5 @@
 import crypto from 'crypto';
-import { and, eq, inArray, isNull, lt, or, sql, ne } from 'drizzle-orm';
+import { and, eq, inArray, isNull, lt, ne, or, sql } from 'drizzle-orm';
 
 import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
@@ -11,9 +11,9 @@ export async function restockStalePendingOrders(options?: {
   olderThanMinutes?: number;
   batchSize?: number;
   orderIds?: string[];
-  claimTtlMinutes?: number; // claim TTL window
-  workerId?: string; // identify who claimed
-  timeBudgetMs?: number; // max runtime budget for this sweep
+  claimTtlMinutes?: number;
+  workerId?: string;
+  timeBudgetMs?: number;
 }): Promise<number> {
   const MIN_OLDER_MIN = 10;
   const MAX_OLDER_MIN = 60 * 24 * 7;
@@ -57,7 +57,6 @@ export async function restockStalePendingOrders(options?: {
   );
   const deadlineMs = Date.now() + timeBudgetMs;
 
-  // If explicitly provided empty list => nothing to do (test helper).
   if (options?.orderIds && options.orderIds.length === 0) return 0;
 
   const hasExplicitIds = Boolean(options?.orderIds?.length);
@@ -81,14 +80,11 @@ export async function restockStalePendingOrders(options?: {
       eq(orders.stockRestored, false),
       isNull(orders.restockedAt),
       ne(orders.inventoryStatus, 'released'),
-      // claim gate: only unclaimed or expired claims are eligible
       or(
         isNull(orders.sweepClaimExpiresAt),
         lt(orders.sweepClaimExpiresAt, now)
       ),
     ];
-
-    // If not targeting specific orders, apply age cutoff.
     if (!hasExplicitIds) {
       baseConditions.push(lt(orders.createdAt, cutoff));
     }
@@ -140,7 +136,6 @@ export async function restockStalePendingOrders(options?: {
 
   return processed;
 }
-// Cleanup for orders stuck in "reserving" phase (inventory reservation started but never completed).
 export async function restockStuckReservingOrders(options?: {
   olderThanMinutes?: number;
   batchSize?: number;
@@ -199,29 +194,23 @@ export async function restockStuckReservingOrders(options?: {
     const claimExpiresAt = new Date(Date.now() + claimTtlMinutes * 60 * 1000);
 
     const baseConditions = [
-      // Only Stripe flow here; no-payments has its own sweep.
       eq(orders.paymentProvider, 'stripe'),
 
-      // "still in progress" payment states
       inArray(orders.paymentStatus, [
         'pending',
         'requires_payment',
       ] as PaymentStatus[]),
 
-      // stuck in reserving/releasing phase (not final)
       inArray(orders.inventoryStatus, [
         'reserving',
         'release_pending',
       ] as const),
 
-      // not already restocked/finalized
       eq(orders.stockRestored, false),
       isNull(orders.restockedAt),
 
-      // age cutoff
       lt(orders.createdAt, cutoff),
 
-      // claim gate
       or(
         isNull(orders.sweepClaimExpiresAt),
         lt(orders.sweepClaimExpiresAt, now)
@@ -242,7 +231,6 @@ export async function restockStuckReservingOrders(options?: {
         sweepClaimExpiresAt: claimExpiresAt,
         sweepRunId: runId,
         sweepClaimedBy: workerId,
-        // set failure details only if absent (keeps real error if it already exists)
         failureCode: sql`coalesce(${orders.failureCode}, 'STUCK_RESERVING_TIMEOUT')`,
         failureMessage: sql`coalesce(${orders.failureMessage}, 'Order timed out while reserving inventory.')`,
         updatedAt: now,
@@ -263,7 +251,6 @@ export async function restockStuckReservingOrders(options?: {
     for (const { id } of claimed) {
       if (Date.now() >= deadlineMs) break;
 
-      // IMPORTANT: reuse hardened exactly-once restock
       await restockOrder(id, {
         reason: 'stale',
         alreadyClaimed: true,
@@ -277,7 +264,6 @@ export async function restockStuckReservingOrders(options?: {
   return processed;
 }
 
-// Cleanup for payment_provider='none' flow where payment_status may be 'paid' before inventory reservation completes.
 export async function restockStaleNoPaymentOrders(options?: {
   olderThanMinutes?: number;
   batchSize?: number;
@@ -347,7 +333,6 @@ export async function restockStaleNoPaymentOrders(options?: {
         'release_pending',
       ] as const),
 
-      // claim gate
       or(
         isNull(orders.sweepClaimExpiresAt),
         lt(orders.sweepClaimExpiresAt, now)
@@ -387,7 +372,7 @@ export async function restockStaleNoPaymentOrders(options?: {
       if (Date.now() >= deadlineMs) break;
 
       await restockOrder(id, {
-        reason: 'stale', // reuse existing terminalization semantics
+        reason: 'stale',
         alreadyClaimed: true,
         workerId,
       });
@@ -398,4 +383,3 @@ export async function restockStaleNoPaymentOrders(options?: {
 
   return processed;
 }
-
diff --git a/frontend/lib/services/products.ts b/frontend/lib/services/products.ts
index 17fa2c8d..422ed4e6 100644
--- a/frontend/lib/services/products.ts
+++ b/frontend/lib/services/products.ts
@@ -1,20 +1,14 @@
-// frontend/lib/services/products.ts
-// Facade: keep legacy import path stable (no index.ts required)
-
-export { createProduct } from './products/mutations/create';
-export { updateProduct } from './products/mutations/update';
-export { deleteProduct } from './products/mutations/delete';
-export { toggleProductStatus } from './products/mutations/toggle';
-
 export {
   getAdminProductById,
-  getAdminProductPrices,
   getAdminProductByIdWithPrices,
+  getAdminProductPrices,
   getAdminProductsList,
 } from './products/admin/queries';
-
 export { rehydrateCartItems } from './products/cart/rehydrate';
-
+export { createProduct } from './products/mutations/create';
+export { deleteProduct } from './products/mutations/delete';
+export { toggleProductStatus } from './products/mutations/toggle';
+export { updateProduct } from './products/mutations/update';
 export type {
   AdminProductPriceRow,
   AdminProductsFilter,
diff --git a/frontend/lib/services/products/admin/queries.ts b/frontend/lib/services/products/admin/queries.ts
index a16d4ed7..eae146bd 100644
--- a/frontend/lib/services/products/admin/queries.ts
+++ b/frontend/lib/services/products/admin/queries.ts
@@ -1,13 +1,13 @@
 import { and, eq, type SQL } from 'drizzle-orm';
 
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
+import { productPrices, products } from '@/db/schema';
+import { ProductNotFoundError } from '@/lib/errors/products';
 import type { CurrencyCode } from '@/lib/shop/currency';
 import type { DbProduct } from '@/lib/types/shop';
-import { ProductNotFoundError } from '@/lib/errors/products';
 
-import { assertMoneyMinorInt } from '../prices';
 import { mapRowToProduct } from '../mapping';
+import { assertMoneyMinorInt } from '../prices';
 import type { AdminProductPriceRow, AdminProductsFilter } from '../types';
 
 export async function getAdminProductById(id: string): Promise<DbProduct> {
@@ -24,26 +24,25 @@ export async function getAdminProductById(id: string): Promise<DbProduct> {
   return mapRowToProduct(row);
 }
 
-
 export async function getAdminProductPrices(
   productId: string
 ): Promise<AdminProductPriceRow[]> {
   const rows = await db
     .select({
       currency: productPrices.currency,
-      // canonical:
+
       priceMinor: productPrices.priceMinor,
       originalPriceMinor: productPrices.originalPriceMinor,
-      // legacy (keep during rollout):
+
       price: productPrices.price,
       originalPrice: productPrices.originalPrice,
     })
     .from(productPrices)
     .where(eq(productPrices.productId, productId));
 
-  // Guard: drizzle int columns should come as number, but never trust the driver implicitly.
   return rows.map(r => ({
     currency: r.currency as CurrencyCode,
+    // Defensive: some DB drivers return NUMERIC/DECIMAL as string/unknown at runtime; enforce safe integer minor-units here.
     priceMinor: assertMoneyMinorInt(
       r.priceMinor,
       `${String(r.currency)} priceMinor`
diff --git a/frontend/lib/services/products/cart/rehydrate.ts b/frontend/lib/services/products/cart/rehydrate.ts
index f0646ea0..e36e861b 100644
--- a/frontend/lib/services/products/cart/rehydrate.ts
+++ b/frontend/lib/services/products/cart/rehydrate.ts
@@ -1,37 +1,33 @@
 import { and, eq, inArray } from 'drizzle-orm';
 
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
 import { coercePriceFromDb } from '@/db/queries/shop/orders';
+import { productPrices, products } from '@/db/schema';
+import { logWarn } from '@/lib/logging';
+import { createCartItemKey } from '@/lib/shop/cart-item-key';
+import { type CurrencyCode, isTwoDecimalCurrency } from '@/lib/shop/currency';
 import { calculateLineTotal, fromCents, toCents } from '@/lib/shop/money';
-import {
-  MAX_QUANTITY_PER_LINE,
-  cartRehydrateResultSchema,
-} from '@/lib/validation/shop';
 import type {
   CartClientItem,
   CartRehydrateItem,
   CartRehydrateResult,
   CartRemovedItem,
 } from '@/lib/validation/shop';
-import { isTwoDecimalCurrency, type CurrencyCode } from '@/lib/shop/currency';
-import { createCartItemKey } from '@/lib/shop/cart-item-key';
-import { logWarn } from '@/lib/logging';
+import {
+  cartRehydrateResultSchema,
+  MAX_QUANTITY_PER_LINE,
+} from '@/lib/validation/shop';
 
 import { PriceConfigError } from '../../errors';
 
 const fromMinorUnits = fromCents;
-// 2-decimal currencies (money helpers fromCents/toCents assume exponent=2)
 
 function assertTwoDecimalCurrency(currency: CurrencyCode): void {
-  // fromCents/toCents assume exponent=2.
-  // Guard against 0-decimal (JPY) / 3-decimal (BHD) and any future non-2-decimal currency.
   if (isTwoDecimalCurrency(currency)) return;
 
   throw new PriceConfigError(
     'Unsupported currency minor units exponent in cart rehydrate (expected 2-decimal currency).',
     {
-      // Keep productId to avoid breaking error-contract shape if it's required.
       productId: '__cart__',
       currency,
     }
@@ -140,8 +136,6 @@ export async function rehydrateCartItems(
 
   const productMap = new Map(rows.map(r => [r.id, r]));
   const removed: CartRemovedItem[] = [];
-
-  // Merge by canonical key AFTER sanitization (prevents duplicate lines).
   const merged = new Map<
     string,
     Omit<
diff --git a/frontend/lib/services/products/mapping.ts b/frontend/lib/services/products/mapping.ts
index a7a8257c..fb461c6a 100644
--- a/frontend/lib/services/products/mapping.ts
+++ b/frontend/lib/services/products/mapping.ts
@@ -1,5 +1,6 @@
 import { fromCents, fromDbMoney } from '@/lib/shop/money';
 import type { DbProduct } from '@/lib/types/shop';
+
 import type { ProductRow } from './types';
 
 export function mapRowToProduct(row: ProductRow): DbProduct {
diff --git a/frontend/lib/services/products/mutations/create.ts b/frontend/lib/services/products/mutations/create.ts
index c2b7d0da..a25be302 100644
--- a/frontend/lib/services/products/mutations/create.ts
+++ b/frontend/lib/services/products/mutations/create.ts
@@ -1,16 +1,13 @@
 import { eq } from 'drizzle-orm';
 
-import {
-  uploadProductImageFromFile,
-} from '@/lib/cloudinary';
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
+import { productPrices, products } from '@/db/schema';
+import { uploadProductImageFromFile } from '@/lib/cloudinary';
 import { logError } from '@/lib/logging';
 import { toDbMoney } from '@/lib/shop/money';
 import type { DbProduct, ProductInput } from '@/lib/types/shop';
 
-import { SlugConflictError, InvalidPayloadError } from '../../errors';
-import { normalizeSlug } from '../slug';
+import { InvalidPayloadError, SlugConflictError } from '../../errors';
 import { mapRowToProduct } from '../mapping';
 import {
   enforceSaleBadgeRequiresOriginal,
@@ -18,6 +15,7 @@ import {
   requireUsd,
   validatePriceRows,
 } from '../prices';
+import { normalizeSlug } from '../slug';
 
 export async function createProduct(input: ProductInput): Promise<DbProduct> {
   const slug = await normalizeSlug(
@@ -36,7 +34,6 @@ export async function createProduct(input: ProductInput): Promise<DbProduct> {
 
   const prices = normalizePricesFromInput(input);
   if (!prices.length) {
-    // Hard fail: admin flow must provide prices
     throw new InvalidPayloadError('Product pricing is required.');
   }
 
@@ -58,8 +55,6 @@ export async function createProduct(input: ProductInput): Promise<DbProduct> {
         description: (input as any).description ?? null,
         imageUrl: uploaded?.secureUrl ?? '',
         imagePublicId: uploaded?.publicId,
-
-        // legacy mirror (USD) — required by products.price NOT NULL
         price: toDbMoney(usd.priceMinor),
         originalPrice:
           usd.originalPriceMinor == null
@@ -94,12 +89,8 @@ export async function createProduct(input: ProductInput): Promise<DbProduct> {
         return {
           productId: row.id,
           currency: p.currency,
-
-          // canonical
           priceMinor,
           originalPriceMinor: originalMinor,
-
-          // legacy mirror
           price: toDbMoney(priceMinor),
           originalPrice:
             originalMinor == null ? null : toDbMoney(originalMinor),
diff --git a/frontend/lib/services/products/mutations/delete.ts b/frontend/lib/services/products/mutations/delete.ts
index 928fe85a..c265d47e 100644
--- a/frontend/lib/services/products/mutations/delete.ts
+++ b/frontend/lib/services/products/mutations/delete.ts
@@ -1,14 +1,12 @@
 import { sql } from 'drizzle-orm';
 
-import { destroyProductImage } from '@/lib/cloudinary';
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
-import { logError } from '@/lib/logging';
+import { productPrices, products } from '@/db/schema';
+import { destroyProductImage } from '@/lib/cloudinary';
 import { ProductNotFoundError } from '@/lib/errors/products';
+import { logError } from '@/lib/logging';
 
 export async function deleteProduct(id: string): Promise<void> {
-  // Atomic delete: prices first, then product, all-or-nothing.
-  // Return imagePublicId from the deleted row to avoid stale pre-reads.
   const result = await db.execute(sql`
     WITH del_prices AS (
       DELETE FROM ${productPrices}
@@ -32,7 +30,6 @@ export async function deleteProduct(id: string): Promise<void> {
   const [deleted] = rows;
 
   if (!deleted) {
-    // not found or concurrent delete edge-case
     throw new ProductNotFoundError(id);
   }
 
diff --git a/frontend/lib/services/products/mutations/toggle.ts b/frontend/lib/services/products/mutations/toggle.ts
index 84bc3a7b..8bde76d1 100644
--- a/frontend/lib/services/products/mutations/toggle.ts
+++ b/frontend/lib/services/products/mutations/toggle.ts
@@ -1,12 +1,11 @@
-// frontend/lib/services/products/mutations/toggle.ts
 import { eq } from 'drizzle-orm';
 
 import { db } from '@/db';
 import { products } from '@/db/schema';
+import { ProductNotFoundError } from '@/lib/errors/products';
 import type { DbProduct } from '@/lib/types/shop';
 
 import { mapRowToProduct } from '../mapping';
-import { ProductNotFoundError } from '@/lib/errors/products';
 
 export async function toggleProductStatus(id: string): Promise<DbProduct> {
   const [current] = await db
@@ -26,7 +25,6 @@ export async function toggleProductStatus(id: string): Promise<DbProduct> {
     .returning();
 
   if (!updated) {
-    // concurrent delete between SELECT and UPDATE
     throw new ProductNotFoundError(id);
   }
 
diff --git a/frontend/lib/services/products/mutations/update.ts b/frontend/lib/services/products/mutations/update.ts
index b3c16e99..9c841563 100644
--- a/frontend/lib/services/products/mutations/update.ts
+++ b/frontend/lib/services/products/mutations/update.ts
@@ -1,26 +1,27 @@
 import { eq, sql } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { productPrices, products } from '@/db/schema';
 import {
   destroyProductImage,
   uploadProductImageFromFile,
 } from '@/lib/cloudinary';
-import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
+import { ProductNotFoundError } from '@/lib/errors/products';
 import { logError } from '@/lib/logging';
-import { toDbMoney } from '@/lib/shop/money';
 import type { CurrencyCode } from '@/lib/shop/currency';
+import { toDbMoney } from '@/lib/shop/money';
 import type { DbProduct, ProductUpdateInput } from '@/lib/types/shop';
+
 import { SlugConflictError } from '../../errors';
-import { ProductNotFoundError } from '@/lib/errors/products';
 import { mapRowToProduct } from '../mapping';
-
-import { normalizeSlug } from '../slug';
 import {
-  assertMoneyMinorInt,
   assertMergedPricesPolicy,
+  assertMoneyMinorInt,
   enforceSaleBadgeRequiresOriginal,
   normalizePricesFromInput,
   validatePriceRows,
 } from '../prices';
+import { normalizeSlug } from '../slug';
 import type { NormalizedPriceRow, ProductsTable } from '../types';
 
 export async function updateProduct(
@@ -59,10 +60,6 @@ export async function updateProduct(
 
   const finalBadge = (input as any).badge ?? existing.badge;
 
-  // Enforce merged-state invariants (DB rows + incoming upserts)
-  // - If prices are patched, validate merged currency policy (e.g. USD must exist)
-  // - If final badge is SALE, enforce originalPrice for ALL currencies in merged state
-
   if (prices.length || finalBadge === 'SALE') {
     const existingPriceRows = await db
       .select({
@@ -98,19 +95,15 @@ export async function updateProduct(
 
     const mergedRows = Array.from(merged.values());
 
-    // Currency-set policy should be enforced on merged state ONLY when prices are patched.
-    // This keeps PATCH semantics: partial prices payload is allowed, and policy is checked post-merge.
     if (prices.length) {
       assertMergedPricesPolicy(mergedRows, { productId: id, requireUsd: true });
     }
 
-    // SALE invariant must be enforced on merged state when badge is SALE (even if prices are not patched).
     if (finalBadge === 'SALE') {
       enforceSaleBadgeRequiresOriginal('SALE', mergedRows);
     }
   }
 
-  // Base fields update
   const updateData: Partial<ProductsTable['$inferInsert']> = {
     slug,
     title: (input as any).title ?? existing.title,
@@ -133,13 +126,11 @@ export async function updateProduct(
           : null
         : existing.sku,
 
-    // legacy invariants: keep stable as USD mirror
     currency: 'USD',
     price: existing.price,
     originalPrice: existing.originalPrice,
   };
 
-  // If USD provided in prices, update legacy mirror
   if (prices.length) {
     const usd = prices.find(p => p.currency === 'USD');
     if (usd?.priceMinor) {
@@ -153,7 +144,6 @@ export async function updateProduct(
   }
 
   try {
-    // 1) upsert prices
     if (prices.length) {
       const upsertRows = prices.map(p => {
         const priceMinor = p.priceMinor;
@@ -185,7 +175,6 @@ export async function updateProduct(
         });
     }
 
-    // 2) update products
     const [row] = await db
       .update(products)
       .set(updateData)
@@ -206,7 +195,6 @@ export async function updateProduct(
 
     return mapRowToProduct(row);
   } catch (error) {
-    // IMPORTANT: cleanup new image on failure (price upsert or product update)
     if (uploaded?.publicId) {
       try {
         await destroyProductImage(uploaded.publicId);
diff --git a/frontend/lib/services/products/prices.ts b/frontend/lib/services/products/prices.ts
index 242301a4..ad0aefc4 100644
--- a/frontend/lib/services/products/prices.ts
+++ b/frontend/lib/services/products/prices.ts
@@ -1,6 +1,7 @@
-import { toCents } from '@/lib/shop/money';
-import { currencyValues } from '@/lib/shop/currency';
 import type { CurrencyCode } from '@/lib/shop/currency';
+import { currencyValues } from '@/lib/shop/currency';
+import { toCents } from '@/lib/shop/money';
+
 import { InvalidPayloadError, PriceConfigError } from '../errors';
 import type { NormalizedPriceRow } from './types';
 
@@ -21,7 +22,6 @@ export function assertMoneyMinorInt(value: unknown, field: string): number {
     throw new InvalidPayloadError(`${field} must be a number.`);
   }
 
-  // Critical: reject fractional minor units (no truncation)
   if (!Number.isInteger(n)) {
     throw new InvalidPayloadError(`${field} must be an integer (minor units).`);
   }
@@ -92,10 +92,6 @@ function toMoneyMinorNullable(
 }
 
 export function normalizePricesFromInput(input: unknown): NormalizedPriceRow[] {
-  // Transitional-safe:
-  // - NEW: input.prices[] uses MINOR units: { currency, priceMinor, originalPriceMinor }
-  // - LEGACY: input.prices[] uses MAJOR strings: { currency, price, originalPrice }
-  // - VERY LEGACY: top-level price/originalPrice/currency
   const anyInput = input as any;
 
   const prices = anyInput?.prices;
@@ -108,7 +104,6 @@ export function normalizePricesFromInput(input: unknown): NormalizedPriceRow[] {
         );
       }
 
-      // NEW path: minor units
       if (p?.priceMinor != null) {
         const priceMinor = assertMoneyMinorInt(
           p.priceMinor,
@@ -133,7 +128,6 @@ export function normalizePricesFromInput(input: unknown): NormalizedPriceRow[] {
         return { currency, priceMinor, originalPriceMinor };
       }
 
-      // LEGACY path: major strings
       const price = String(p?.price ?? '').trim();
       const originalPrice =
         p?.originalPrice == null ? null : String(p.originalPrice).trim();
@@ -152,7 +146,6 @@ export function normalizePricesFromInput(input: unknown): NormalizedPriceRow[] {
     });
   }
 
-  // Legacy fallback (only if present)
   if (anyInput?.price != null) {
     const currency = (anyInput?.currency as CurrencyCode) ?? 'USD';
     if (!currencyValues.includes(currency as any)) {
@@ -188,7 +181,6 @@ export function requireUsd(prices: NormalizedPriceRow[]): NormalizedPriceRow {
 }
 
 export function validatePriceRows(prices: NormalizedPriceRow[]) {
-  // Safety: no duplicates even if upstream schema is bypassed
   const seen = new Set<CurrencyCode>();
   for (const p of prices) {
     if (seen.has(p.currency)) {
@@ -196,19 +188,16 @@ export function validatePriceRows(prices: NormalizedPriceRow[]) {
     }
     seen.add(p.currency);
 
-    // Runtime guard (transitional input can bypass TS/Zod)
     if (!currencyValues.includes(p.currency as any)) {
       throw new InvalidPayloadError(
         `Unsupported currency: ${String(p.currency)}.`
       );
     }
 
-    // priceMinor must be positive integer (minor units)
     if (!Number.isSafeInteger(p.priceMinor) || p.priceMinor < 1) {
       throw new InvalidPayloadError(`${p.currency}: price is required.`);
     }
 
-    // originalPriceMinor must be > priceMinor when present
     if (p.originalPriceMinor != null) {
       if (!Number.isSafeInteger(p.originalPriceMinor)) {
         throw new InvalidPayloadError(
diff --git a/frontend/lib/services/products/slug.ts b/frontend/lib/services/products/slug.ts
index efad626f..a7d90253 100644
--- a/frontend/lib/services/products/slug.ts
+++ b/frontend/lib/services/products/slug.ts
@@ -2,6 +2,7 @@ import { and, eq, ne } from 'drizzle-orm';
 
 import { products } from '@/db/schema';
 import { slugify } from '@/lib/shop/slug';
+
 import { SlugConflictError } from '../errors';
 import type { DbClient } from './types';
 
diff --git a/frontend/lib/services/products/types.ts b/frontend/lib/services/products/types.ts
index 9a90cb86..c9193f06 100644
--- a/frontend/lib/services/products/types.ts
+++ b/frontend/lib/services/products/types.ts
@@ -2,10 +2,10 @@ import type { CurrencyCode } from '@/lib/shop/currency';
 
 export type AdminProductPriceRow = {
   currency: CurrencyCode;
-  // canonical (minor units)
+
   priceMinor: number;
   originalPriceMinor: number | null;
-  // legacy mirror (keep during rollout)
+
   price: string;
   originalPrice: string | null;
 };
@@ -16,7 +16,6 @@ export type AdminProductsFilter = {
   type?: string;
 };
 
-// Internal typing helpers (used across products/* modules)
 export type ProductsTable = typeof import('@/db/schema').products;
 export type ProductRow = ProductsTable['$inferSelect'];
 export type DbClient = typeof import('@/db').db;
diff --git a/frontend/lib/shop/currency.ts b/frontend/lib/shop/currency.ts
index deba4b1f..fe0a2a21 100644
--- a/frontend/lib/shop/currency.ts
+++ b/frontend/lib/shop/currency.ts
@@ -11,7 +11,12 @@ export function isTwoDecimalCurrency(currency: CurrencyCode): boolean {
 }
 
 function assertMinorUnitsStrict(minor: number): number {
-  if (!Number.isFinite(minor) || !Number.isInteger(minor) || minor < 0) {
+  if (
+    !Number.isFinite(minor) ||
+    !Number.isInteger(minor) ||
+    !Number.isSafeInteger(minor) ||
+    minor < 0
+  ) {
     throw new Error('Invalid money minor-units value');
   }
   return minor;
@@ -20,15 +25,9 @@ function assertMinorUnitsStrict(minor: number): number {
 function normalizeLocaleTag(locale: string | null | undefined): string {
   const raw = (locale ?? '').trim().toLowerCase();
   if (!raw) return '';
-  // "uk-UA" -> "uk", "uk_UA" -> "uk"
   return raw.split(/[-_]/)[0] ?? raw;
 }
 
-/**
- * D1 policy:
- * - uk -> UAH
- * - otherwise -> USD
- */
 export function resolveCurrencyFromLocale(
   locale: string | null | undefined
 ): CurrencyCode {
@@ -36,9 +35,6 @@ export function resolveCurrencyFromLocale(
   return primary === 'uk' ? 'UAH' : 'USD';
 }
 
-/**
- * "uk-UA,uk;q=0.9,en-US;q=0.8" -> "uk-UA"
- */
 export function parsePrimaryLocaleFromAcceptLanguage(
   acceptLanguage: string | null | undefined
 ): string | null {
@@ -51,10 +47,6 @@ export function parsePrimaryLocaleFromAcceptLanguage(
   return token && token.length ? token : null;
 }
 
-/**
- * Server-only resolution at API boundaries:
- * currency is derived ONLY from locale (Accept-Language).
- */
 export function resolveCurrencyFromHeaders(headers: Headers): CurrencyCode {
   const locale = parsePrimaryLocaleFromAcceptLanguage(
     headers.get('accept-language')
@@ -62,10 +54,6 @@ export function resolveCurrencyFromHeaders(headers: Headers): CurrencyCode {
   return resolveCurrencyFromLocale(locale);
 }
 
-/**
- * UI locale normalization.
- * Route param locale is usually "uk" | "en", but Intl wants a BCP-47 tag.
- */
 function normalizeLocaleForIntl(
   locale: string | null | undefined,
   currency: CurrencyCode
@@ -78,7 +66,6 @@ function normalizeLocaleForIntl(
 
   if (raw) return raw.replaceAll('_', '-');
 
-  // Safe fallback (still yields correct narrow symbol for currency)
   return currency === 'UAH' ? 'uk-UA' : 'en-US';
 }
 
@@ -91,7 +78,7 @@ function getFormatter(locale: string, currency: CurrencyCode) {
   const created = new Intl.NumberFormat(locale, {
     style: 'currency',
     currency,
-    currencyDisplay: 'narrowSymbol', // ₴ for UAH when available
+    currencyDisplay: 'narrowSymbol',
   });
 
   formatterCache.set(key, created);
@@ -99,10 +86,8 @@ function getFormatter(locale: string, currency: CurrencyCode) {
 }
 
 function getCurrencyFractionDigits(currency: CurrencyCode): number {
-  // Single source of truth: we only support 2-decimal currencies for now.
   if (isTwoDecimalCurrency(currency)) return 2;
 
-  // Future-proof: if CurrencyCode expands (e.g., JPY/BHD), fail closed.
   throw new Error(`Unsupported currency fraction digits: ${currency}`);
 }
 
@@ -112,10 +97,6 @@ function minorToMajor(amountMinor: number, currency: CurrencyCode): number {
   return assertMinorUnitsStrict(amountMinor) / factor;
 }
 
-/**
- * Canonical UI money formatter.
- * amountMinor is in minor units (cents/kopeks), integer.
- */
 export function formatMoney(
   amountMinor: number,
   currency: CurrencyCode,
@@ -131,10 +112,6 @@ export function formatMoney(
   }
 }
 
-/**
- * @deprecated Prefer formatMoney(minor, currency, locale).
- * Legacy formatter for MAJOR units (e.g. 10.50).
- */
 export function formatPrice(
   amountMajor: number,
   currencyOrOptions?:
diff --git a/frontend/lib/shop/data.ts b/frontend/lib/shop/data.ts
index 284307eb..120553ae 100644
--- a/frontend/lib/shop/data.ts
+++ b/frontend/lib/shop/data.ts
@@ -1,27 +1,28 @@
+import {
+  getActiveProductsPage,
+  getFeaturedProducts,
+  getPublicProductBySlug,
+} from '@/db/queries/shop/products';
+import { getPublicProductBaseBySlug } from '@/db/queries/shop/products';
 import {
   CATALOG_PAGE_SIZE,
-  CATEGORY_TILES,
   type CatalogSort,
+  CATEGORY_TILES,
 } from '@/lib/config/catalog';
+import { logError } from '@/lib/logging';
 import {
-  catalogFilterSchema,
-  dbProductSchema,
-  productBadgeValues,
-  shopProductSchema,
   type CatalogFilters,
+  catalogFilterSchema,
   type DbProduct,
+  dbProductSchema,
   type ProductBadge,
+  productBadgeValues,
   type ShopProduct as ValidationShopProduct,
+  shopProductSchema,
 } from '@/lib/validation/shop';
-import {
-  getActiveProductsPage,
-  getFeaturedProducts,
-  getPublicProductBySlug,
-} from '@/db/queries/shop/products';
-import { fromDbMoney } from './money';
+
 import { resolveCurrencyFromLocale } from './currency';
-import { getPublicProductBaseBySlug } from '@/db/queries/shop/products';
-import { logError } from '@/lib/logging';
+import { fromDbMoney } from './money';
 
 export type ShopProduct = ValidationShopProduct;
 
@@ -193,11 +194,6 @@ function mapToShopProduct(product: DbProduct): ShopProduct | null {
   return parsed.data;
 }
 
-/**
- * IMPORTANT:
- * Pass `locale` from the route segment when possible (app/[locale]/...),
- * because currency policy is locale-based: uk -> UAH, otherwise USD.
- */
 export async function getCatalogProducts(
   filters: unknown,
   locale: string = 'en'
@@ -250,14 +246,12 @@ export async function getHomepageContent(
 ): Promise<HomepageContent> {
   const currency = resolveCurrencyFromLocale(locale);
 
-  // 1) primary: featured (може бути < 4)
   const featured: DbProduct[] = await getFeaturedProducts(currency, 4);
 
   const featuredProducts = featured
     .map(mapToShopProduct)
     .filter((product): product is ShopProduct => product !== null);
 
-  // helper: докомплектувати до N без дублікатів
   const fillTo = (
     primary: ShopProduct[],
     fallback: ShopProduct[],
@@ -276,8 +270,6 @@ export async function getHomepageContent(
     return merged.slice(0, count);
   };
 
-  // 2) fallback source: newest active products (щоб завжди було чим добрати до 4)
-  // беремо більше ніж 4, щоб було що фільтрувати після дедупу
   const newestCatalog = await getCatalogProducts(
     {
       category: 'all',
diff --git a/frontend/lib/shop/idempotency.ts b/frontend/lib/shop/idempotency.ts
index 4a2a4c41..1d4a40e7 100644
--- a/frontend/lib/shop/idempotency.ts
+++ b/frontend/lib/shop/idempotency.ts
@@ -1,18 +1,23 @@
-const IDEMPOTENCY_MAX_LENGTH = 128
+const IDEMPOTENCY_MAX_LENGTH = 128;
 
 function fallbackKey(): string {
-  const random = Math.random().toString(36).slice(2)
-  const timestamp = Date.now().toString(36)
-  return `${timestamp}_${random}`.slice(0, IDEMPOTENCY_MAX_LENGTH)
+  const random = Math.random().toString(36).slice(2);
+  const timestamp = Date.now().toString(36);
+  return `${timestamp}_${random}`.slice(0, IDEMPOTENCY_MAX_LENGTH);
 }
 
 export function generateIdempotencyKey(): string {
   try {
-    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-      return crypto.randomUUID().replace(/[^A-Za-z0-9_-]/g, "").slice(0, IDEMPOTENCY_MAX_LENGTH)
+    if (
+      typeof crypto !== 'undefined' &&
+      typeof crypto.randomUUID === 'function'
+    ) {
+      return crypto
+        .randomUUID()
+        .replace(/[^A-Za-z0-9_-]/g, '')
+        .slice(0, IDEMPOTENCY_MAX_LENGTH);
     }
-  } catch {
-  }
+  } catch {}
 
-  return fallbackKey()
+  return fallbackKey();
 }
diff --git a/frontend/lib/shop/money.ts b/frontend/lib/shop/money.ts
index 20e23226..fd2bad9b 100644
--- a/frontend/lib/shop/money.ts
+++ b/frontend/lib/shop/money.ts
@@ -1,13 +1,6 @@
-export type Money = number;      // legacy/display only
-export type MoneyCents = number; // canonical minor units (safe int >= 0)
-
-/**
- * Strict invariant for canonical minor-units:
- * - finite
- * - integer (no trunc/round normalization here)
- * - >= 0
- * - safe integer
- */
+export type Money = number;
+export type MoneyCents = number;
+
 export function assertIntegerCentsStrict(cents: number): MoneyCents {
   if (!Number.isFinite(cents) || !Number.isInteger(cents) || cents < 0) {
     throw new Error('Invalid money cents value');
@@ -32,53 +25,36 @@ function isScientificNotation(s: string): boolean {
   return /e[+-]?\d+/i.test(s);
 }
 
-/**
- * Parse decimal "major units" string/number into minor units (cents) WITHOUT floats.
- * Rules:
- * - accepts: "12", "12.3", "12.34", ".5", "0.5"
- * - rejects: negatives, NaN/Infinity, scientific notation ("1e-3"), non-numeric
- * - rounds HALF_UP to 2 decimals if more than 2 fractional digits
- */
 function parseMajorToMinor(input: string | number): MoneyCents {
-  const raw =
-    typeof input === 'string'
-      ? input.trim()
-      : Number.isFinite(input)
-        ? String(input)
-        : String(input);
+  const raw = typeof input === 'string' ? input.trim() : String(input);
 
   if (!raw.length) throw new Error('Invalid money value');
 
   if (typeof input === 'number') {
-    if (!Number.isFinite(input) || input < 0) throw new Error('Invalid money value');
+    if (!Number.isFinite(input) || input < 0)
+      throw new Error('Invalid money value');
   }
-
   const s = raw;
 
   if (s.startsWith('-')) throw new Error('Invalid money value');
   if (isScientificNotation(s)) {
-    // JS numbers can stringify to "1e-7" – refuse to avoid ambiguous rounding
     throw new Error('Invalid money value');
   }
 
-  // Normalize leading-dot ".5" -> "0.5"
   const normalized = s.startsWith('.') ? `0${s}` : s;
 
-  // Accept only digits with optional single dot
   const m = normalized.match(/^(\d+)(?:\.(\d+))?$/);
   if (!m) throw new Error('Invalid money value');
 
   const intStr = m[1] ?? '0';
   const fracStrRaw = m[2] ?? '';
 
-  // int part safe range pre-check
   const maxIntPart = Math.floor(Number.MAX_SAFE_INTEGER / 100);
   const intPart = Number(intStr);
   if (!Number.isSafeInteger(intPart) || intPart < 0 || intPart > maxIntPart) {
     throw new Error('Invalid money value');
   }
 
-  // Fractional rounding to 2 digits, HALF_UP
   let frac2 = fracStrRaw.slice(0, 2);
   while (frac2.length < 2) frac2 += '0';
 
@@ -87,13 +63,11 @@ function parseMajorToMinor(input: string | number): MoneyCents {
     throw new Error('Invalid money value');
   }
 
-  // Round if there are extra digits beyond 2
   if (fracStrRaw.length > 2) {
-    const third = fracStrRaw.charCodeAt(2) - 48; // '0' => 0
+    const third = fracStrRaw.charCodeAt(2) - 48;
     if (third >= 5) {
       cents += 1;
       if (cents === 100) {
-        // carry
         cents = 0;
         if (intPart + 1 > maxIntPart) throw new Error('Invalid money value');
         const minor = (intPart + 1) * 100 + cents;
@@ -106,11 +80,6 @@ function parseMajorToMinor(input: string | number): MoneyCents {
   return assertIntegerCentsStrict(minor);
 }
 
-/**
- * Public API: major -> cents (minor).
- * NOTE: prefer passing strings from DB/inputs; numbers are accepted but may be rejected
- * if they stringify to scientific notation.
- */
 export function toCents(value: number | string): MoneyCents {
   if (typeof value !== 'string' && typeof value !== 'number') {
     throw new Error('Invalid money value');
@@ -118,22 +87,14 @@ export function toCents(value: number | string): MoneyCents {
   return parseMajorToMinor(value);
 }
 
-/**
- * Minor -> legacy major number (display only).
- * Still returns a JS number; do NOT use for money comparisons.
- */
 export function fromCents(cents: MoneyCents): Money {
   const v = assertIntegerCentsStrict(cents);
   const intPart = Math.floor(v / 100);
   const frac = v % 100;
-  // Controlled string -> number (display only)
+
   return Number(`${intPart}.${String(frac).padStart(2, '0')}`);
 }
 
-/**
- * Legacy DB numeric money (string/number like "12.34") -> canonical cents (int >= 0).
- * No floats.
- */
 export function fromDbMoney(value: unknown): MoneyCents {
   if (typeof value !== 'string' && typeof value !== 'number') {
     throw new Error('Invalid money value');
@@ -141,9 +102,6 @@ export function fromDbMoney(value: unknown): MoneyCents {
   return toCents(value);
 }
 
-/**
- * Canonical cents -> DB decimal string "12.34" WITHOUT floats/toFixed.
- */
 export function toDbMoney(cents: MoneyCents): string {
   const v = assertIntegerCentsStrict(cents);
   const intPart = Math.floor(v / 100);
diff --git a/frontend/lib/shop/payments.ts b/frontend/lib/shop/payments.ts
index f3734639..1f8fbe71 100644
--- a/frontend/lib/shop/payments.ts
+++ b/frontend/lib/shop/payments.ts
@@ -1,13 +1,13 @@
 export const paymentStatusValues = [
-  "pending",
-  "requires_payment",
-  "paid",
-  "failed",
-  "refunded",
+  'pending',
+  'requires_payment',
+  'paid',
+  'failed',
+  'refunded',
 ] as const;
 
 export type PaymentStatus = (typeof paymentStatusValues)[number];
 
-export const paymentProviderValues = ["stripe", "none"] as const;
+export const paymentProviderValues = ['stripe', 'none'] as const;
 
 export type PaymentProvider = (typeof paymentProviderValues)[number];
diff --git a/frontend/lib/shop/request-locale.ts b/frontend/lib/shop/request-locale.ts
index e761dc17..515b32ea 100644
--- a/frontend/lib/shop/request-locale.ts
+++ b/frontend/lib/shop/request-locale.ts
@@ -1,36 +1,30 @@
-import "server-only";
+import 'server-only';
 
-import type { NextRequest } from "next/server";
+import type { NextRequest } from 'next/server';
 
 import {
+  type CurrencyCode,
   parsePrimaryLocaleFromAcceptLanguage,
   resolveCurrencyFromLocale,
-  type CurrencyCode,
-} from "@/lib/shop/currency";
-
-/**
- * Canonical locale resolution at API boundaries:
- * 1) next-intl / custom headers (from middleware)
- * 2) locale cookies
- * 3) Accept-Language
- */
+} from '@/lib/shop/currency';
+
 export function resolveRequestLocale(request: NextRequest): string | null {
   const headerLocale =
-    request.headers.get("x-next-intl-locale") ??
-    request.headers.get("x-locale") ??
+    request.headers.get('x-next-intl-locale') ??
+    request.headers.get('x-locale') ??
     null;
 
   if (headerLocale && headerLocale.trim()) return headerLocale.trim();
 
   const cookieLocale =
-    request.cookies.get("NEXT_LOCALE")?.value ??
-    request.cookies.get("locale")?.value ??
+    request.cookies.get('NEXT_LOCALE')?.value ??
+    request.cookies.get('locale')?.value ??
     null;
 
   if (cookieLocale && cookieLocale.trim()) return cookieLocale.trim();
 
   return parsePrimaryLocaleFromAcceptLanguage(
-    request.headers.get("accept-language")
+    request.headers.get('accept-language')
   );
 }
 
diff --git a/frontend/lib/shop/slug.ts b/frontend/lib/shop/slug.ts
index 61bfa0c1..14e5a5dd 100644
--- a/frontend/lib/shop/slug.ts
+++ b/frontend/lib/shop/slug.ts
@@ -1,9 +1,9 @@
 export function slugify(input: string): string {
   return input
     .toLowerCase()
-    .normalize("NFKD")
-    .replace(/[\u0300-\u036f]/g, "")
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .replace(/-{2,}/g, "-")
+    .normalize('NFKD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .replace(/-{2,}/g, '-');
 }
diff --git a/frontend/lib/shop/ui-classes.ts b/frontend/lib/shop/ui-classes.ts
index 22c6c737..155e66b4 100644
--- a/frontend/lib/shop/ui-classes.ts
+++ b/frontend/lib/shop/ui-classes.ts
@@ -25,11 +25,9 @@ export const SHOP_CTA_INSET = `
   opacity-40 supports-[hover:hover]:group-hover:opacity-60 transition-opacity
 `;
 
-// Shared interaction for “chips” (swatches, size pills, +/- stepper)
 export const SHOP_CHIP_INTERACTIVE =
   'transition-[box-shadow,border-color,color,background-color,filter] duration-500 ease-out hover:brightness-110';
 
-// Optional “lift” (НЕ використовуй для size/+/- якщо хочеш без тремтіння)
 export const SHOP_CHIP_LIFT =
   'transition-transform duration-500 ease-out hover:-translate-y-0.5';
 
@@ -39,7 +37,6 @@ export const SHOP_CHIP_HOVER =
 export const SHOP_CHIP_SELECTED =
   'border-accent ring-2 ring-accent ring-offset-2 ring-offset-background shadow-[var(--shop-chip-shadow-selected)]';
 
-// Optional: base shapes (so you don’t repeat layout primitives)
 export const SHOP_SWATCH_BASE =
   'group relative h-9 w-9 rounded-full border border-border shadow-none';
 
@@ -49,16 +46,9 @@ export const SHOP_SIZE_CHIP_BASE =
 export const SHOP_STEPPER_BUTTON_BASE =
   'flex h-10 w-10 items-center justify-center rounded-md border border-border text-foreground bg-transparent';
 
-/**
- * Builds a horizontal gradient background from two CSS vars.
- * Example: shopCtaGradient('--shop-cta-bg', '--shop-cta-bg-hover')
- */
-
-// Text-link-ish filter items (category/type lists)
 export const SHOP_FILTER_ITEM_BASE =
   'inline-flex text-sm font-medium transition-[color,transform] duration-300 ease-out hover:-translate-y-[1px]';
 
-// If you want the “chip hover border” to be consistent (used in filters + size)
 export const SHOP_CHIP_BORDER_HOVER = 'hover:border-foreground/60';
 
 export const SHOP_DISABLED = 'disabled:pointer-events-none disabled:opacity-60';
@@ -66,10 +56,6 @@ export const SHOP_DISABLED = 'disabled:pointer-events-none disabled:opacity-60';
 export const SHOP_CHIP_SHADOW_HOVER =
   'hover:shadow-[var(--shop-chip-shadow-hover)]';
 
-/**
- * Reusable “text link” for product names / order links / “go to order”, etc.
- * Size додаєш окремо (text-xs, text-[15px], …).
- */
 export const SHOP_LINK_BASE =
   'inline-flex font-medium text-foreground underline underline-offset-4 decoration-2 decoration-foreground/30 ' +
   'transition-[color,transform,text-decoration-color] duration-300 ease-out ' +
@@ -78,14 +64,9 @@ export const SHOP_LINK_BASE =
 export const SHOP_LINK_MD = 'text-[15px]';
 export const SHOP_LINK_XS = 'text-xs';
 
-/**
- * CTA interaction (додатково до SHOP_CTA_BASE).
- * SHOP_CTA_BASE залишаємо як layout+typography+active.
- */
 export const SHOP_CTA_INTERACTIVE =
   'transition-[transform,filter,box-shadow] duration-700 ease-out';
 
-// Outline button (inverted to CTA; used in error pages, secondary actions)
 export const SHOP_OUTLINE_BTN_BASE =
   'inline-flex items-center justify-center rounded-xl border px-4 py-2 ' +
   'text-sm font-semibold uppercase tracking-[0.25em] ' +
@@ -96,14 +77,12 @@ export const SHOP_OUTLINE_BTN_INTERACTIVE =
   'hover:-translate-y-[1px] hover:shadow-[var(--shop-chip-shadow-hover)] hover:brightness-110 ' +
   'hover:border-[color:var(--accent-primary)] hover:text-[color:var(--accent-primary)]';
 
-// Nav/breadcrumb-ish links (e.g. "My orders", "Shop", "Back to ...")
 export const SHOP_NAV_LINK_BASE =
   'inline-flex font-medium underline underline-offset-4 decoration-2 ' +
   'text-muted-foreground decoration-foreground/30 ' +
   'transition-[color,transform,text-decoration-color] duration-300 ease-out ' +
   'hover:-translate-y-[1px] hover:text-accent hover:decoration-[color:var(--accent-primary)]';
 
-// Select / dropdown (e.g. sort)
 export const SHOP_SELECT_BASE =
   'peer h-10 w-full appearance-none rounded-xl border border-border bg-background pl-3 pr-11 text-sm font-medium';
 
diff --git a/frontend/lib/tests/__mocks__/server-only.ts b/frontend/lib/tests/__mocks__/server-only.ts
index e1445347..cb0ff5c3 100644
--- a/frontend/lib/tests/__mocks__/server-only.ts
+++ b/frontend/lib/tests/__mocks__/server-only.ts
@@ -1,3 +1 @@
-// Vitest/Node stub for Next.js "server-only" marker import.
-// Next handles it at build time, but unit tests need a real module.
 export {};
diff --git a/frontend/lib/tests/blog/blog-author-route.test.ts b/frontend/lib/tests/blog/blog-author-route.test.ts
index af84420e..c3e1262f 100644
--- a/frontend/lib/tests/blog/blog-author-route.test.ts
+++ b/frontend/lib/tests/blog/blog-author-route.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 const fetchMock = vi.fn();
 
@@ -29,7 +29,9 @@ describe('GET /api/blog-author', () => {
     fetchMock.mockResolvedValueOnce({ name: 'Анна' });
 
     const response = await GET(
-      new Request('http://localhost/api/blog-author?name=%D0%90%D0%BD%D0%BD%D0%B0&locale=uk')
+      new Request(
+        'http://localhost/api/blog-author?name=%D0%90%D0%BD%D0%BD%D0%B0&locale=uk'
+      )
     );
     const data = await response.json();
 
diff --git a/frontend/lib/tests/blog/blog-search-route.test.ts b/frontend/lib/tests/blog/blog-search-route.test.ts
index 06eda6a8..f53efb91 100644
--- a/frontend/lib/tests/blog/blog-search-route.test.ts
+++ b/frontend/lib/tests/blog/blog-search-route.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 const fetchMock = vi.fn();
 
@@ -27,7 +27,9 @@ describe('GET /api/blog-search', () => {
     );
     const data = await response.json();
 
-    expect(fetchMock).toHaveBeenCalledWith(expect.any(String), { locale: 'uk' });
+    expect(fetchMock).toHaveBeenCalledWith(expect.any(String), {
+      locale: 'uk',
+    });
     expect(data).toHaveLength(1);
     expect(data[0].title).toBe('Post');
   });
diff --git a/frontend/lib/tests/currency.test.ts b/frontend/lib/tests/currency.test.ts
deleted file mode 100644
index 848d1f71..00000000
--- a/frontend/lib/tests/currency.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  parsePrimaryLocaleFromAcceptLanguage,
-  resolveCurrencyFromHeaders,
-  resolveCurrencyFromLocale,
-} from "../shop/currency";
-
-describe("currency policy (CUR-0 / D1)", () => {
-  it("uk -> UAH", () => {
-    expect(resolveCurrencyFromLocale("uk")).toBe("UAH");
-    expect(resolveCurrencyFromLocale("uk-UA")).toBe("UAH");
-    expect(resolveCurrencyFromLocale("uk_UA")).toBe("UAH");
-    expect(resolveCurrencyFromLocale("UK-ua")).toBe("UAH");
-  });
-
-  it("non-uk -> USD", () => {
-    expect(resolveCurrencyFromLocale("en")).toBe("USD");
-    expect(resolveCurrencyFromLocale("pl-PL")).toBe("USD");
-    expect(resolveCurrencyFromLocale(null)).toBe("USD");
-    expect(resolveCurrencyFromLocale(undefined)).toBe("USD");
-    expect(resolveCurrencyFromLocale("")).toBe("USD");
-  });
-
-  it("parses primary locale from Accept-Language", () => {
-    expect(
-      parsePrimaryLocaleFromAcceptLanguage("uk-UA,uk;q=0.9,en-US;q=0.8")
-    ).toBe("uk-UA");
-    expect(parsePrimaryLocaleFromAcceptLanguage("en-US")).toBe("en-US");
-    expect(parsePrimaryLocaleFromAcceptLanguage("")).toBe(null);
-    expect(parsePrimaryLocaleFromAcceptLanguage(null)).toBe(null);
-  });
-
-  it("resolves from headers only (Accept-Language)", () => {
-    const h1 = new Headers({
-      "accept-language": "uk-UA,uk;q=0.9,en-US;q=0.8",
-    });
-    expect(resolveCurrencyFromHeaders(h1)).toBe("UAH");
-
-    const h2 = new Headers({ "accept-language": "en-US,en;q=0.9" });
-    expect(resolveCurrencyFromHeaders(h2)).toBe("USD");
-
-    const h3 = new Headers();
-    expect(resolveCurrencyFromHeaders(h3)).toBe("USD");
-  });
-});
diff --git a/frontend/lib/tests/factories/quiz/quiz.ts b/frontend/lib/tests/factories/quiz/quiz.ts
index d83d7e8b..82752552 100644
--- a/frontend/lib/tests/factories/quiz/quiz.ts
+++ b/frontend/lib/tests/factories/quiz/quiz.ts
@@ -32,7 +32,9 @@ let questionCounter = 0;
 /**
  * Creates a mock question with one correct answer
  */
-export function createMockQuestion(overrides?: Partial<MockQuestion>): MockQuestion {
+export function createMockQuestion(
+  overrides?: Partial<MockQuestion>
+): MockQuestion {
   questionCounter++;
   const qId = `q-${questionCounter}`;
 
diff --git a/frontend/lib/tests/format-money.test.ts b/frontend/lib/tests/format-money.test.ts
deleted file mode 100644
index f76bbc1f..00000000
--- a/frontend/lib/tests/format-money.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { formatMoney } from "@/lib/shop/currency";
-
-describe("formatMoney", () => {
-  it("formats USD with $ for en", () => {
-    const s = formatMoney(1999, "USD", "en");
-    expect(s).toContain("$");
-  });
-
-  it("formats UAH with ₴ for uk", () => {
-    const s = formatMoney(1999, "UAH", "uk");
-    expect(s).toContain("₴");
-  });
-});
diff --git a/frontend/lib/tests/helpers/ip.ts b/frontend/lib/tests/helpers/ip.ts
index e1781a57..e91ca2db 100644
--- a/frontend/lib/tests/helpers/ip.ts
+++ b/frontend/lib/tests/helpers/ip.ts
@@ -1,9 +1,3 @@
-/**
- * Derive a deterministic TEST IP from an idempotency key.
- * Used only in tests to make rate-limit keys stable per request.
- *
- * Produces a TEST-NET-3 IPv4 address: 203.0.113.1..250
- */
 export function deriveTestIpFromIdemKey(idemKey: string): string {
   const hex = idemKey.replace(/[^0-9a-f]/gi, '').slice(0, 2);
   const n = hex ? (parseInt(hex, 16) % 250) + 1 : 1;
diff --git a/frontend/lib/tests/helpers/makeCheckoutReq.ts b/frontend/lib/tests/helpers/makeCheckoutReq.ts
index 95de7b9e..76493b5c 100644
--- a/frontend/lib/tests/helpers/makeCheckoutReq.ts
+++ b/frontend/lib/tests/helpers/makeCheckoutReq.ts
@@ -1,4 +1,5 @@
 import { NextRequest } from 'next/server';
+
 import { deriveTestIpFromIdemKey } from '@/lib/tests/helpers/ip';
 
 export type CheckoutItemInput = {
@@ -10,7 +11,7 @@ export type CheckoutItemInput = {
 
 export function makeCheckoutReq(params: {
   idempotencyKey: string;
-  locale?: string; // mapped to Accept-Language
+  locale?: string;
   items?: CheckoutItemInput[];
   userId?: string;
   origin?: string | null;
@@ -24,7 +25,6 @@ export function makeCheckoutReq(params: {
     {
       productId: '11111111-1111-4111-8111-111111111111',
       quantity: 1,
-      // IMPORTANT: не форсимо selectedSize/selectedColor
     },
   ];
 
diff --git a/frontend/lib/tests/order-items-snapshot-immutable.test.ts b/frontend/lib/tests/order-items-snapshot-immutable.test.ts
deleted file mode 100644
index 744496dc..00000000
--- a/frontend/lib/tests/order-items-snapshot-immutable.test.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-// lib/tests/order-items-snapshot-immutable.test.ts
-import { randomUUID } from "node:crypto";
-
-import { and, eq } from "drizzle-orm";
-import { NextRequest } from "next/server";
-import { describe, expect, it, vi } from "vitest";
-
-import { db } from "@/db";
-import {
-	inventoryMoves,
-	orderItems,
-	orders,
-	productPrices,
-	products,
-} from "@/db/schema";
-
-// IMPORTANT: checkout route calls getCurrentUser(), which uses next/headers cookies()
-// In vitest there is no request scope, so we must mock it to avoid noisy error + flakiness.
-vi.mock("@/lib/auth", async () => {
-	const actual = await vi.importActual<Record<string, unknown>>("@/lib/auth");
-	return {
-		...actual,
-		getCurrentUser: vi.fn(async () => null),
-	};
-});
-
-// Force "no-payments" path so checkout never touches Stripe network.
-// This test is only about snapshot immutability.
-vi.mock("@/lib/env/stripe", async () => {
-	const actual =
-		await vi.importActual<Record<string, unknown>>("@/lib/env/stripe");
-	return {
-		...actual,
-		isPaymentsEnabled: () => false,
-	};
-});
-
-type CheckoutResponse = {
-	success: boolean;
-	orderId?: string;
-	order?: { id?: string };
-};
-
-function makeJsonRequest(
-	url: string,
-	body: unknown,
-	headers: Record<string, string>,
-) {
-	return new NextRequest(url, {
-		method: "POST",
-		headers,
-		body: JSON.stringify(body),
-	});
-}
-
-async function cleanupByIds(params: { orderId?: string; productId: string }) {
-	const { orderId, productId } = params;
-
-	if (orderId) {
-		// delete children first
-		await db.delete(inventoryMoves).where(eq(inventoryMoves.orderId, orderId));
-		await db.delete(orderItems).where(eq(orderItems.orderId, orderId));
-		await db.delete(orders).where(eq(orders.id, orderId));
-	}
-
-	await db.delete(productPrices).where(eq(productPrices.productId, productId));
-
-	await db.delete(products).where(eq(products.id, productId));
-}
-
-describe("P0-6 snapshots: order_items immutability", () => {
-	it("snapshot fields must not change after products/product_prices update", async () => {
-		const productId = randomUUID();
-		const priceId = randomUUID();
-
-		const titleV1 = "Snapshot Test Product";
-		const slugV1 = `snapshot-test-${productId.slice(0, 8)}`;
-		const skuV1 = `SKU-${productId.slice(0, 8)}`;
-
-		// Seed product (USD-only per your CHECK constraint)
-		await db.insert(products).values({
-			id: productId,
-			slug: slugV1,
-			title: titleV1,
-			description: "snapshot test",
-			imageUrl: "https://res.cloudinary.com/devlovers/image/upload/v1/test.png",
-			imagePublicId: null,
-			price: "9.00",
-			originalPrice: null,
-			currency: "USD",
-			category: null,
-			type: null,
-			colors: [],
-			sizes: [],
-			badge: "NONE",
-			isActive: true,
-			isFeatured: false,
-			stock: 10,
-			sku: skuV1,
-		});
-
-		// Seed product_prices (USD)
-		await db.insert(productPrices).values({
-			id: priceId,
-			productId,
-			currency: "USD",
-			priceMinor: 900,
-			originalPriceMinor: null,
-			price: "9.00",
-			originalPrice: null,
-		});
-
-		const idem = randomUUID();
-		const req = makeJsonRequest(
-			"http://localhost:3000/api/shop/checkout",
-			{ items: [{ productId, quantity: 1 }] },
-			{
-				"Accept-Language": "en-US,en;q=0.9",
-				"Content-Type": "application/json",
-				"Idempotency-Key": idem,
-				Origin: "http://localhost:3000",
-			},
-		);
-		const { POST: checkoutPOST } = await import(
-			"@/app/api/shop/checkout/route"
-		);
-
-		const res = await checkoutPOST(req);
-
-		// Your checkout returns 201 Created on success.
-		expect(res.status).toBeGreaterThanOrEqual(200);
-		expect(res.status).toBeLessThan(300);
-
-		const json = (await res.json()) as CheckoutResponse;
-		expect(json.success).toBe(true);
-
-		const orderId = json.orderId ?? json.order?.id;
-		expect(typeof orderId).toBe("string");
-		if (!orderId) throw new Error("Missing orderId from checkout response");
-
-		let primaryError: unknown = null;
-		let cleanupError: unknown = null;
-
-		try {
-			// Baseline snapshot
-			const before = await db
-				.select({
-					orderId: orderItems.orderId,
-					productId: orderItems.productId,
-					quantity: orderItems.quantity,
-					unitPriceMinor: orderItems.unitPriceMinor,
-					lineTotalMinor: orderItems.lineTotalMinor,
-					productTitle: orderItems.productTitle,
-					productSlug: orderItems.productSlug,
-					productSku: orderItems.productSku,
-				})
-				.from(orderItems)
-				.where(eq(orderItems.orderId, orderId));
-
-			expect(before.length).toBe(1);
-			expect(before[0].productId).toBe(productId);
-			expect(before[0].productTitle).toBe(titleV1);
-			expect(before[0].productSlug).toBe(slugV1);
-			expect(before[0].productSku).toBe(skuV1);
-			expect(before[0].unitPriceMinor).toBe(900);
-			expect(before[0].lineTotalMinor).toBe(900);
-
-			// Mutate product + product_prices aggressively (attempt to "break" snapshots)
-			const titleV2 = `${titleV1} UPDATED`;
-			const slugV2 = `${slugV1}-updated`;
-			const skuV2 = `${skuV1}-UPDATED`;
-
-			await db
-				.update(products)
-				.set({
-					title: titleV2,
-					slug: slugV2,
-					sku: skuV2,
-					updatedAt: new Date(),
-				})
-				.where(eq(products.id, productId));
-
-			await db
-				.update(productPrices)
-				.set({
-					priceMinor: 1000,
-					price: "10.00",
-					updatedAt: new Date(),
-				})
-				.where(
-					and(
-						eq(productPrices.productId, productId),
-						eq(productPrices.currency, "USD"),
-					),
-				);
-
-			const after = await db
-				.select({
-					orderId: orderItems.orderId,
-					productId: orderItems.productId,
-					quantity: orderItems.quantity,
-					unitPriceMinor: orderItems.unitPriceMinor,
-					lineTotalMinor: orderItems.lineTotalMinor,
-					productTitle: orderItems.productTitle,
-					productSlug: orderItems.productSlug,
-					productSku: orderItems.productSku,
-				})
-				.from(orderItems)
-				.where(eq(orderItems.orderId, orderId));
-
-			expect(after.length).toBe(1);
-
-			// Snapshot MUST remain V1 even after product changes
-			expect(after[0]).toEqual(before[0]);
-		} catch (e) {
-			primaryError = e;
-			throw e;
-		} finally {
-			try {
-				await cleanupByIds({ orderId, productId });
-			} catch (e) {
-				cleanupError = e;
-				console.error("[test cleanup failed]", { orderId, productId }, e);
-			}
-		}
-		if (!primaryError && cleanupError) {
-			throw cleanupError;
-		}
-	}, 30_000);
-});
diff --git a/frontend/lib/tests/orders-access.test.ts b/frontend/lib/tests/orders-access.test.ts
deleted file mode 100644
index 028182fe..00000000
--- a/frontend/lib/tests/orders-access.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest"
-import { NextRequest } from "next/server"
-
-vi.mock("@/lib/auth", () => ({
-  getCurrentUser: vi.fn(),
-}))
-
-vi.mock("@/db", () => ({
-  db: {
-    select: vi.fn(),
-  },
-}))
-
-import { getCurrentUser } from "@/lib/auth"
-import { db } from "@/db"
-
-type MockUser = { id: string; role: "user" | "admin" }
-
-describe("P0-SEC-1.1: GET /api/shop/orders/[id] access control", () => {
-  const orderId = "00000000-0000-0000-0000-000000000000"
-  const ownerId = "11111111-1111-1111-1111-111111111111"
-  const otherUserId = "22222222-2222-2222-2222-222222222222"
-  const adminId = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
-
-  function mockDbRows(rows: any[]) {
-    const builder = {
-      from: vi.fn().mockReturnThis(),
-      leftJoin: vi.fn().mockReturnThis(),
-      where: vi.fn().mockResolvedValue(rows),
-    }
-    ;(db.select as any).mockReturnValue(builder)
-    return builder
-  }
-
-  async function callGet(id: string) {
-    const { GET } = await import("@/app/api/shop/orders/[id]/route")
-    const req = new NextRequest(`http://localhost/api/shop/orders/${id}`, {
-      method: "GET",
-    })
-
-    // route expects: context: { params: Promise<{ id: string }> }
-    const res = await (GET as any)(req, { params: Promise.resolve({ id }) })
-    return res as Response
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it("no session -> 401", async () => {
-    ;(getCurrentUser as any).mockResolvedValue(null)
-
-    const res = await callGet(orderId)
-    expect(res.status).toBe(401)
-    expect(db.select).not.toHaveBeenCalled()
-  })
-
-  it("not owner and not admin -> 404 (hide existence)", async () => {
-    const user: MockUser = { id: otherUserId, role: "user" }
-    ;(getCurrentUser as any).mockResolvedValue(user)
-
-    mockDbRows([]) // whereClause should filter out чужий order => 0 rows
-
-    const res = await callGet(orderId)
-    expect(res.status).toBe(404)
-  })
-
-  it("owner -> 200", async () => {
-    const user: MockUser = { id: ownerId, role: "user" }
-    ;(getCurrentUser as any).mockResolvedValue(user)
-
-    const now = new Date()
-    mockDbRows([
-      {
-        order: {
-          id: orderId,
-          userId: ownerId,
-          totalAmount: "10.00",
-          currency: "USD",
-          paymentStatus: "pending",
-          paymentProvider: "stripe",
-          paymentIntentId: null,
-          stockRestored: false,
-          restockedAt: null,
-          idempotencyKey: "idem_key",
-          createdAt: now,
-          updatedAt: now,
-        },
-        item: null,
-      },
-    ])
-
-    const res = await callGet(orderId)
-    expect(res.status).toBe(200)
-
-    const json = await res.json()
-    expect(json?.success).toBe(true)
-    expect(json?.order?.id).toBe(orderId)
-    expect(json?.order?.userId).toBe(ownerId)
-  })
-
-  it("admin -> 200", async () => {
-    const user: MockUser = { id: adminId, role: "admin" }
-    ;(getCurrentUser as any).mockResolvedValue(user)
-
-    const now = new Date()
-    mockDbRows([
-      {
-        order: {
-          id: orderId,
-          userId: ownerId,
-          totalAmount: "10.00",
-          currency: "USD",
-          paymentStatus: "pending",
-          paymentProvider: "stripe",
-          paymentIntentId: null,
-          stockRestored: false,
-          restockedAt: null,
-          idempotencyKey: "idem_key",
-          createdAt: now,
-          updatedAt: now,
-        },
-        item: null,
-      },
-    ])
-
-    const res = await callGet(orderId)
-    expect(res.status).toBe(200)
-  })
-})
diff --git a/frontend/lib/tests/prices.test.ts b/frontend/lib/tests/prices.test.ts
deleted file mode 100644
index eed21c86..00000000
--- a/frontend/lib/tests/prices.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { adminPriceRowSchema } from "../validation/shop";
-
-describe("pricing validation", () => {
-  it("rejects originalPriceMinor == priceMinor (SALE must be strict)", () => {
-    const r = adminPriceRowSchema.safeParse({
-      currency: "USD",
-      priceMinor: 1000,
-      originalPriceMinor: 1000,
-    });
-
-    expect(r.success).toBe(false);
-  });
-
-  it("accepts originalPriceMinor > priceMinor", () => {
-    const r = adminPriceRowSchema.safeParse({
-      currency: "USD",
-      priceMinor: 1000,
-      originalPriceMinor: 1200,
-    });
-
-    expect(r.success).toBe(true);
-  });
-});
-
diff --git a/frontend/lib/tests/q&a/questions-route.test.ts b/frontend/lib/tests/q&a/questions-route.test.ts
index fae43044..ec21e5df 100644
--- a/frontend/lib/tests/q&a/questions-route.test.ts
+++ b/frontend/lib/tests/q&a/questions-route.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('@/db', () => ({
   db: {
@@ -6,8 +6,8 @@ vi.mock('@/db', () => ({
   },
 }));
 
-import { db } from '@/db';
 import { GET } from '@/app/api/questions/[category]/route';
+import { db } from '@/db';
 
 type Builder = {
   from: ReturnType<typeof vi.fn>;
diff --git a/frontend/lib/tests/quiz/guest-quiz.test.ts b/frontend/lib/tests/quiz/guest-quiz.test.ts
index ae225595..ce310677 100644
--- a/frontend/lib/tests/quiz/guest-quiz.test.ts
+++ b/frontend/lib/tests/quiz/guest-quiz.test.ts
@@ -1,9 +1,10 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import {
-  savePendingQuizResult,
-  getPendingQuizResult,
   clearPendingQuizResult,
+  getPendingQuizResult,
+  savePendingQuizResult,
 } from '@/lib/quiz/guest-quiz';
 
 describe('guest-quiz storage', () => {
@@ -92,7 +93,10 @@ describe('guest-quiz storage', () => {
   });
 
   it('clears pending quiz result', () => {
-    localStorage.setItem('devlovers_pending_quiz', JSON.stringify({ quizId: 'q1' }));
+    localStorage.setItem(
+      'devlovers_pending_quiz',
+      JSON.stringify({ quizId: 'q1' })
+    );
 
     clearPendingQuizResult();
 
diff --git a/frontend/lib/tests/quiz/guest-result-route.test.ts b/frontend/lib/tests/quiz/guest-result-route.test.ts
index 45296717..a1d62b45 100644
--- a/frontend/lib/tests/quiz/guest-result-route.test.ts
+++ b/frontend/lib/tests/quiz/guest-result-route.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { POST } from '@/app/api/quiz/guest-result/route';
 
 vi.mock('@/lib/auth', () => ({
@@ -17,9 +18,9 @@ vi.mock('@/db', () => ({
   },
 }));
 
-import { getCurrentUser } from '@/lib/auth';
-import { calculateQuizPoints, awardQuizPoints } from '@/db/queries/points';
 import { db } from '@/db';
+import { awardQuizPoints, calculateQuizPoints } from '@/db/queries/points';
+import { getCurrentUser } from '@/lib/auth';
 
 const getCurrentUserMock = getCurrentUser as ReturnType<typeof vi.fn>;
 const calculateQuizPointsMock = calculateQuizPoints as ReturnType<typeof vi.fn>;
@@ -135,7 +136,9 @@ describe('POST /api/quiz/guest-result', () => {
     awardQuizPointsMock.mockResolvedValue(7);
 
     selectMock
-      .mockImplementationOnce(() => makeSelectChain([{ id: 'q1' }, { id: 'q2' }]))
+      .mockImplementationOnce(() =>
+        makeSelectChain([{ id: 'q1' }, { id: 'q2' }])
+      )
       .mockImplementationOnce(() =>
         makeSelectChain([
           { id: 'a1', quizQuestionId: 'q1', isCorrect: true },
diff --git a/frontend/lib/tests/quiz/quiz-anticheat.test.ts b/frontend/lib/tests/quiz/quiz-anticheat.test.ts
index ea5967df..a0f1de7e 100644
--- a/frontend/lib/tests/quiz/quiz-anticheat.test.ts
+++ b/frontend/lib/tests/quiz/quiz-anticheat.test.ts
@@ -1,6 +1,6 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 // Mock next-intl before importing the hook
 vi.mock('next-intl', () => ({
@@ -14,9 +14,10 @@ vi.mock('sonner', () => ({
   },
 }));
 
-import { useAntiCheat } from '@/hooks/useAntiCheat';
 import { toast } from 'sonner';
 
+import { useAntiCheat } from '@/hooks/useAntiCheat';
+
 describe('useAntiCheat', () => {
   beforeEach(() => {
     vi.useFakeTimers();
@@ -45,7 +46,9 @@ describe('useAntiCheat', () => {
 
       expect(result.current.violationsCount).toBe(1);
       expect(result.current.violations[0].type).toBe('copy');
-      expect(toast.warning).toHaveBeenCalledWith('translated:copy', { duration: 3000 });
+      expect(toast.warning).toHaveBeenCalledWith('translated:copy', {
+        duration: 3000,
+      });
     });
 
     it('detects paste event and adds violation', () => {
@@ -64,7 +67,10 @@ describe('useAntiCheat', () => {
       const { result } = renderHook(() => useAntiCheat(true));
 
       act(() => {
-        const event = new Event('contextmenu', { bubbles: true, cancelable: true });
+        const event = new Event('contextmenu', {
+          bubbles: true,
+          cancelable: true,
+        });
         document.dispatchEvent(event);
       });
 
@@ -111,18 +117,17 @@ describe('useAntiCheat', () => {
     });
 
     it('sets showWarning to true when violation occurs', () => {
-        const { result } = renderHook(() => useAntiCheat(true));
+      const { result } = renderHook(() => useAntiCheat(true));
 
-        expect(result.current.showWarning).toBe(false);
+      expect(result.current.showWarning).toBe(false);
 
-        act(() => {
-            document.dispatchEvent(new Event('copy'));
-        });
+      act(() => {
+        document.dispatchEvent(new Event('copy'));
+      });
 
-        expect(result.current.showWarning).toBe(true);
+      expect(result.current.showWarning).toBe(true);
     });
 
-
     it('resetViolations clears all violations', () => {
       const { result } = renderHook(() => useAntiCheat(true));
 
@@ -165,10 +170,22 @@ describe('useAntiCheat', () => {
 
       unmount();
 
-      expect(removeEventListenerSpy).toHaveBeenCalledWith('copy', expect.any(Function));
-      expect(removeEventListenerSpy).toHaveBeenCalledWith('paste', expect.any(Function));
-      expect(removeEventListenerSpy).toHaveBeenCalledWith('contextmenu', expect.any(Function));
-      expect(removeEventListenerSpy).toHaveBeenCalledWith('visibilitychange', expect.any(Function));
+      expect(removeEventListenerSpy).toHaveBeenCalledWith(
+        'copy',
+        expect.any(Function)
+      );
+      expect(removeEventListenerSpy).toHaveBeenCalledWith(
+        'paste',
+        expect.any(Function)
+      );
+      expect(removeEventListenerSpy).toHaveBeenCalledWith(
+        'contextmenu',
+        expect.any(Function)
+      );
+      expect(removeEventListenerSpy).toHaveBeenCalledWith(
+        'visibilitychange',
+        expect.any(Function)
+      );
 
       removeEventListenerSpy.mockRestore();
     });
diff --git a/frontend/lib/tests/quiz/quiz-crypto.test.ts b/frontend/lib/tests/quiz/quiz-crypto.test.ts
deleted file mode 100644
index 84370f6b..00000000
--- a/frontend/lib/tests/quiz/quiz-crypto.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import {
-  encryptAnswers,
-  decryptAnswers,
-  createEncryptedAnswersBlob,
-} from '@/lib/quiz/quiz-crypto';
-import { setupQuizTestEnv, cleanupQuizTestEnv } from './setup';
-import {
-  createMockQuestions,
-  createCorrectAnswersMap,
-  resetFactoryCounters,
-} from '../factories/quiz/quiz';
-
-describe('quiz-crypto', () => {
-  // Setup: set encryption key before each test
-  beforeEach(() => {
-    setupQuizTestEnv();
-    resetFactoryCounters();
-  });
-
-  // Cleanup: remove encryption key after each test
-  afterEach(() => {
-    cleanupQuizTestEnv();
-  });
-
-  describe('encryptAnswers', () => {
-    it('returns a base64 string', () => {
-      const answers = { 'q-1': 'a-1' };
-
-      const result = encryptAnswers(answers);
-
-      // Base64 pattern: letters, numbers, +, /, ends with optional =
-      expect(result).toMatch(/^[A-Za-z0-9+/]+=*$/);
-    });
-
-    it('returns different output for same input (random IV)', () => {
-      const answers = { 'q-1': 'a-1' };
-
-      const result1 = encryptAnswers(answers);
-      const result2 = encryptAnswers(answers);
-
-      // Each encryption uses random IV, so outputs differ
-      expect(result1).not.toBe(result2);
-    });
-
-    it('handles empty object', () => {
-      const result = encryptAnswers({});
-
-      expect(result).toBeDefined();
-      expect(typeof result).toBe('string');
-    });
-
-    it('handles multiple questions', () => {
-      const answers = {
-        'q-1': 'a-1',
-        'q-2': 'a-2',
-        'q-3': 'a-3',
-      };
-
-      const result = encryptAnswers(answers);
-
-      expect(result).toBeDefined();
-      expect(result.length).toBeGreaterThan(0);
-    });
-  });
-
-  describe('decryptAnswers', () => {
-    it('decrypts back to original data', () => {
-      const original = { 'q-1': 'a-1', 'q-2': 'a-2' };
-
-      const encrypted = encryptAnswers(original);
-      const decrypted = decryptAnswers(encrypted);
-
-      expect(decrypted).toEqual(original);
-    });
-
-    it('returns null for tampered data', () => {
-      const original = { 'q-1': 'a-1' };
-      const encrypted = encryptAnswers(original);
-
-      // Tamper: change last 5 characters
-      const tampered = encrypted.slice(0, -5) + 'XXXXX';
-
-      const result = decryptAnswers(tampered);
-
-      expect(result).toBeNull();
-    });
-
-    it('returns null for invalid base64', () => {
-      const result = decryptAnswers('not-valid-base64!!!');
-
-      expect(result).toBeNull();
-    });
-
-    it('returns null for empty string', () => {
-      const result = decryptAnswers('');
-
-      expect(result).toBeNull();
-    });
-
-    it('returns null for truncated data', () => {
-      const original = { 'q-1': 'a-1' };
-      const encrypted = encryptAnswers(original);
-
-      // Truncate: remove half of the data
-      const truncated = encrypted.slice(0, encrypted.length / 2);
-
-      const result = decryptAnswers(truncated);
-
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('createEncryptedAnswersBlob', () => {
-    it('creates encrypted blob from questions', () => {
-      const questions = createMockQuestions(3);
-
-      const blob = createEncryptedAnswersBlob(questions);
-
-      expect(blob).toBeDefined();
-      expect(typeof blob).toBe('string');
-      expect(blob.length).toBeGreaterThan(0);
-    });
-
-    it('encrypted blob decrypts to correct answers map', () => {
-      const questions = createMockQuestions(3);
-      const expectedMap = createCorrectAnswersMap(questions);
-
-      const blob = createEncryptedAnswersBlob(questions);
-      const decrypted = decryptAnswers(blob);
-
-      expect(decrypted).toEqual(expectedMap);
-    });
-
-    it('handles questions with no correct answer', () => {
-      const questions = [
-        {
-          id: 'q-no-correct',
-          answers: [
-            { id: 'a-1', isCorrect: false },
-            { id: 'a-2', isCorrect: false },
-          ],
-        },
-      ];
-
-      const blob = createEncryptedAnswersBlob(questions);
-      const decrypted = decryptAnswers(blob);
-
-      // Question with no correct answer is not included in map
-      expect(decrypted).toEqual({});
-    });
-
-    it('handles empty questions array', () => {
-      const blob = createEncryptedAnswersBlob([]);
-      const decrypted = decryptAnswers(blob);
-
-      expect(decrypted).toEqual({});
-    });
-  });
-});
diff --git a/frontend/lib/tests/quiz/quiz-session.test.ts b/frontend/lib/tests/quiz/quiz-session.test.ts
index 8b204578..f4df2dee 100644
--- a/frontend/lib/tests/quiz/quiz-session.test.ts
+++ b/frontend/lib/tests/quiz/quiz-session.test.ts
@@ -1,11 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
+
 import {
-  saveQuizSession,
-  loadQuizSession,
   clearQuizSession,
+  loadQuizSession,
+  saveQuizSession,
 } from '@/lib/quiz/quiz-session';
+
+import {
+  createMockQuizSession,
+  resetFactoryCounters,
+} from '../factories/quiz/quiz';
 import { installMockLocalStorage } from './setup';
-import { createMockQuizSession, resetFactoryCounters } from '../factories/quiz/quiz';
 
 describe('quiz-session', () => {
   beforeEach(() => {
@@ -71,12 +76,9 @@ describe('quiz-session', () => {
         savedAt: thirtyOneMinutesAgo,
         status: 'in_progress',
       });
-      
+
       // Directly set localStorage to bypass saveQuizSession's timestamp update
-      localStorage.setItem(
-        'quiz_session_quiz-123',
-        JSON.stringify(session)
-      );
+      localStorage.setItem('quiz_session_quiz-123', JSON.stringify(session));
 
       const loaded = loadQuizSession('quiz-123');
 
@@ -89,18 +91,15 @@ describe('quiz-session', () => {
         savedAt: twentyMinutesAgo,
         status: 'in_progress',
       });
-      
-      localStorage.setItem(
-        'quiz_session_quiz-123',
-        JSON.stringify(session)
-      );
+
+      localStorage.setItem('quiz_session_quiz-123', JSON.stringify(session));
 
       const loaded = loadQuizSession('quiz-123');
 
       expect(loaded).not.toBeNull();
     });
 
-    it('returns null for completed session', () => {
+    it('returns completed session (for guest result screen language switch)', () => {
       const session = createMockQuizSession({ status: 'completed' });
       localStorage.setItem(
         'quiz_session_quiz-123',
@@ -109,7 +108,8 @@ describe('quiz-session', () => {
 
       const loaded = loadQuizSession('quiz-123');
 
-      expect(loaded).toBeNull();
+      expect(loaded).not.toBeNull();
+      expect(loaded?.status).toBe('completed');
     });
 
     it('returns null for rules session', () => {
@@ -127,10 +127,7 @@ describe('quiz-session', () => {
     it('clears expired session from storage', () => {
       const thirtyOneMinutesAgo = Date.now() - 31 * 60 * 1000;
       const session = createMockQuizSession({ savedAt: thirtyOneMinutesAgo });
-      localStorage.setItem(
-        'quiz_session_quiz-123',
-        JSON.stringify(session)
-      );
+      localStorage.setItem('quiz_session_quiz-123', JSON.stringify(session));
 
       loadQuizSession('quiz-123');
 
diff --git a/frontend/lib/tests/quiz/quiz-setup.test.ts b/frontend/lib/tests/quiz/quiz-setup.test.ts
index 3f4b1004..b9771616 100644
--- a/frontend/lib/tests/quiz/quiz-setup.test.ts
+++ b/frontend/lib/tests/quiz/quiz-setup.test.ts
@@ -1,15 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
 import {
+  createCorrectAnswersMap,
   createMockQuestion,
   createMockQuestions,
   createMockQuizSession,
-  createCorrectAnswersMap,
   resetFactoryCounters,
 } from '../factories/quiz/quiz';
 import {
-  setupQuizTestEnv,
   cleanupQuizTestEnv,
   installMockLocalStorage,
+  setupQuizTestEnv,
   TEST_ENCRYPTION_KEY,
 } from './setup';
 
diff --git a/frontend/lib/tests/quiz/quiz-slug-route.test.ts b/frontend/lib/tests/quiz/quiz-slug-route.test.ts
index 23e814a7..c41e64c7 100644
--- a/frontend/lib/tests/quiz/quiz-slug-route.test.ts
+++ b/frontend/lib/tests/quiz/quiz-slug-route.test.ts
@@ -1,5 +1,5 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('@/db/queries/quiz', () => ({
   getQuizBySlug: vi.fn(),
@@ -10,7 +10,9 @@ import { GET } from '@/app/api/quiz/[slug]/route';
 import { getQuizBySlug, getQuizQuestionsRandomized } from '@/db/queries/quiz';
 
 const getQuizBySlugMock = getQuizBySlug as ReturnType<typeof vi.fn>;
-const getQuizQuestionsRandomizedMock = getQuizQuestionsRandomized as ReturnType<typeof vi.fn>;
+const getQuizQuestionsRandomizedMock = getQuizQuestionsRandomized as ReturnType<
+  typeof vi.fn
+>;
 
 describe('GET /api/quiz/[slug]', () => {
   beforeEach(() => {
@@ -20,8 +22,12 @@ describe('GET /api/quiz/[slug]', () => {
   it('returns 404 when quiz not found', async () => {
     getQuizBySlugMock.mockResolvedValue(null);
 
-    const request = new NextRequest('http://localhost/api/quiz/react?locale=en');
-    const response = await GET(request, { params: Promise.resolve({ slug: 'react' }) });
+    const request = new NextRequest(
+      'http://localhost/api/quiz/react?locale=en'
+    );
+    const response = await GET(request, {
+      params: Promise.resolve({ slug: 'react' }),
+    });
 
     const data = await response.json();
 
@@ -47,13 +53,22 @@ describe('GET /api/quiz/[slug]', () => {
         questionText: 'Question 1',
         explanation: null,
         answers: [
-          { id: 'a1', displayOrder: 1, isCorrect: true, answerText: 'Answer 1' },
+          {
+            id: 'a1',
+            displayOrder: 1,
+            isCorrect: true,
+            answerText: 'Answer 1',
+          },
         ],
       },
     ]);
 
-    const request = new NextRequest('http://localhost/api/quiz/react?locale=en');
-    const response = await GET(request, { params: Promise.resolve({ slug: 'react' }) });
+    const request = new NextRequest(
+      'http://localhost/api/quiz/react?locale=en'
+    );
+    const response = await GET(request, {
+      params: Promise.resolve({ slug: 'react' }),
+    });
 
     const data = await response.json();
 
@@ -83,8 +98,12 @@ describe('GET /api/quiz/[slug]', () => {
   it('returns 500 on unexpected error', async () => {
     getQuizBySlugMock.mockRejectedValue(new Error('db error'));
     const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    const request = new NextRequest('http://localhost/api/quiz/react?locale=en');
-    const response = await GET(request, { params: Promise.resolve({ slug: 'react' }) });
+    const request = new NextRequest(
+      'http://localhost/api/quiz/react?locale=en'
+    );
+    const response = await GET(request, {
+      params: Promise.resolve({ slug: 'react' }),
+    });
 
     const data = await response.json();
 
diff --git a/frontend/lib/tests/quiz/setup.ts b/frontend/lib/tests/quiz/setup.ts
index 237e1b38..b534f2fe 100644
--- a/frontend/lib/tests/quiz/setup.ts
+++ b/frontend/lib/tests/quiz/setup.ts
@@ -1,5 +1,3 @@
-import { vi, beforeEach, afterEach } from 'vitest';
-
 /**
  * 32-byte hex key for AES-256 (64 hex characters)
  * Only used in tests — not a real secret
diff --git a/frontend/lib/tests/quiz/use-quiz-guards.test.ts b/frontend/lib/tests/quiz/use-quiz-guards.test.ts
index 62fe0763..17779239 100644
--- a/frontend/lib/tests/quiz/use-quiz-guards.test.ts
+++ b/frontend/lib/tests/quiz/use-quiz-guards.test.ts
@@ -1,6 +1,7 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { useQuizGuards } from '@/hooks/useQuizGuards';
 import { getQuizReloadKey } from '@/lib/quiz/quiz-storage-keys';
 
@@ -10,12 +11,14 @@ vi.mock('@/lib/quiz/quiz-session', () => ({
 
 import { clearQuizSession } from '@/lib/quiz/quiz-session';
 
-const createParams = (overrides: Partial<{
-  quizId: string;
-  status: 'rules' | 'in_progress' | 'completed';
-  onExit: () => void;
-  resetViolations: () => void;
-}> = {}) => ({
+const createParams = (
+  overrides: Partial<{
+    quizId: string;
+    status: 'rules' | 'in_progress' | 'completed';
+    onExit: () => void;
+    resetViolations: () => void;
+  }> = {}
+) => ({
   quizId: 'quiz-1',
   status: 'in_progress' as const,
   onExit: vi.fn(),
@@ -41,9 +44,7 @@ describe('useQuizGuards', () => {
   });
 
   it('does not push guard when status is not in_progress', () => {
-    renderHook(() =>
-      useQuizGuards(createParams({ status: 'rules' }))
-    );
+    renderHook(() => useQuizGuards(createParams({ status: 'rules' })));
 
     expect(window.history.state?.quizGuard).toBeUndefined();
   });
@@ -66,7 +67,7 @@ describe('useQuizGuards', () => {
     const confirmSpy = vi.spyOn(window, 'confirm').mockReturnValue(true);
 
     renderHook(() => useQuizGuards(params));
-    
+
     window.history.pushState({}, '', '/en/quizzes');
     const link = document.createElement('a');
     link.setAttribute('href', 'javascript:void(0)');
diff --git a/frontend/lib/tests/quiz/use-quiz-session.test.ts b/frontend/lib/tests/quiz/use-quiz-session.test.ts
index 9d91a904..219f03d9 100644
--- a/frontend/lib/tests/quiz/use-quiz-session.test.ts
+++ b/frontend/lib/tests/quiz/use-quiz-session.test.ts
@@ -1,8 +1,12 @@
 // @vitest-environment jsdom
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { renderHook, waitFor } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { useQuizSession } from '@/hooks/useQuizSession';
-import { QUIZ_ALLOW_RESTORE_KEY, getQuizReloadKey } from '@/lib/quiz/quiz-storage-keys';
+import {
+  getQuizReloadKey,
+  QUIZ_ALLOW_RESTORE_KEY,
+} from '@/lib/quiz/quiz-storage-keys';
 
 vi.mock('@/lib/quiz/quiz-session', () => ({
   saveQuizSession: vi.fn(),
@@ -10,7 +14,11 @@ vi.mock('@/lib/quiz/quiz-session', () => ({
   clearQuizSession: vi.fn(),
 }));
 
-import { saveQuizSession, loadQuizSession, clearQuizSession } from '@/lib/quiz/quiz-session';
+import {
+  clearQuizSession,
+  loadQuizSession,
+  saveQuizSession,
+} from '@/lib/quiz/quiz-session';
 
 type QuizState = {
   status: 'rules' | 'in_progress' | 'completed';
@@ -48,7 +56,6 @@ describe('useQuizSession', () => {
     vi.clearAllMocks();
   });
 
-
   it('restores session on reload', async () => {
     const onRestore = vi.fn();
     const reloadKey = getQuizReloadKey(quizId);
@@ -64,7 +71,9 @@ describe('useQuizSession', () => {
       savedAt: Date.now(),
     });
 
-    renderHook(() => useQuizSession({ quizId, state: createState(), onRestore }));
+    renderHook(() =>
+      useQuizSession({ quizId, state: createState(), onRestore })
+    );
 
     await waitFor(() => expect(onRestore).toHaveBeenCalledTimes(1));
     expect(clearMock).not.toHaveBeenCalled();
@@ -85,7 +94,9 @@ describe('useQuizSession', () => {
       savedAt: Date.now(),
     });
 
-    renderHook(() => useQuizSession({ quizId, state: createState(), onRestore }));
+    renderHook(() =>
+      useQuizSession({ quizId, state: createState(), onRestore })
+    );
 
     await waitFor(() => expect(onRestore).toHaveBeenCalledTimes(1));
     expect(clearMock).not.toHaveBeenCalled();
@@ -105,7 +116,9 @@ describe('useQuizSession', () => {
       savedAt: Date.now(),
     });
 
-    renderHook(() => useQuizSession({ quizId, state: createState(), onRestore }));
+    renderHook(() =>
+      useQuizSession({ quizId, state: createState(), onRestore })
+    );
 
     await waitFor(() => expect(clearMock).toHaveBeenCalledWith(quizId));
     expect(onRestore).not.toHaveBeenCalled();
@@ -116,7 +129,9 @@ describe('useQuizSession', () => {
 
     loadMock.mockReturnValue(null);
 
-    renderHook(() => useQuizSession({ quizId, state: createState(), onRestore }));
+    renderHook(() =>
+      useQuizSession({ quizId, state: createState(), onRestore })
+    );
 
     await waitFor(() => {
       expect(onRestore).not.toHaveBeenCalled();
@@ -175,7 +190,9 @@ describe('useQuizSession', () => {
   it('does not save session when status is not in_progress', async () => {
     const onRestore = vi.fn();
 
-    renderHook(() => useQuizSession({ quizId, state: createState(), onRestore }));
+    renderHook(() =>
+      useQuizSession({ quizId, state: createState(), onRestore })
+    );
 
     await waitFor(() => expect(saveMock).not.toHaveBeenCalled());
   });
diff --git a/frontend/lib/tests/quiz/verify-answer.test.ts b/frontend/lib/tests/quiz/verify-answer.test.ts
index 8bccbd60..22fb5018 100644
--- a/frontend/lib/tests/quiz/verify-answer.test.ts
+++ b/frontend/lib/tests/quiz/verify-answer.test.ts
@@ -1,17 +1,17 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { POST } from '@/app/api/quiz/verify-answer/route';
-import { encryptAnswers } from '@/lib/quiz/quiz-crypto';
-import { setupQuizTestEnv, cleanupQuizTestEnv } from './setup';
-import {
-  createMockQuestions,
-  createCorrectAnswersMap,
-  resetFactoryCounters,
-} from '../factories/quiz/quiz';
-
-/**
- * Creates a mock NextRequest for POST /api/quiz/verify-answer
- */
+
+// Mock the Redis module
+vi.mock('@/lib/quiz/quiz-answers-redis', () => ({
+  getCorrectAnswer: vi.fn(),
+}));
+
+import { getCorrectAnswer } from '@/lib/quiz/quiz-answers-redis';
+
+const mockGetCorrectAnswer = vi.mocked(getCorrectAnswer);
+
 function createVerifyRequest(body: unknown): NextRequest {
   return new NextRequest('http://localhost/api/quiz/verify-answer', {
     method: 'POST',
@@ -20,97 +20,89 @@ function createVerifyRequest(body: unknown): NextRequest {
   });
 }
 
-describe('POST /api/quiz/verify-answer', () => {
+describe('POST /api/quiz/verify-answer (Redis)', () => {
   beforeEach(() => {
-    setupQuizTestEnv();
-    resetFactoryCounters();
-  });
-
-  afterEach(() => {
-    cleanupQuizTestEnv();
+    vi.clearAllMocks();
   });
 
   describe('successful verification', () => {
     it('returns isCorrect: true for correct answer', async () => {
-      const questions = createMockQuestions(3);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
+      const quizId = 'quiz-123';
+      const questionId = 'question-1';
+      const correctAnswerId = 'answer-a';
 
-      const questionId = questions[0].id;
-      const correctAnswerId = correctAnswersMap[questionId];
+      mockGetCorrectAnswer.mockResolvedValue(correctAnswerId);
 
       const request = createVerifyRequest({
+        quizId,
         questionId,
-        answerId: correctAnswerId,
-        encryptedAnswers,
+        selectedAnswerId: correctAnswerId,
       });
 
       const response = await POST(request);
       const data = await response.json();
 
       expect(response.status).toBe(200);
+      expect(data.success).toBe(true);
       expect(data.isCorrect).toBe(true);
+      expect(mockGetCorrectAnswer).toHaveBeenCalledWith(quizId, questionId);
     });
 
     it('returns isCorrect: false for wrong answer', async () => {
-      const questions = createMockQuestions(3);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
+      const quizId = 'quiz-123';
+      const questionId = 'question-1';
+      const correctAnswerId = 'answer-a';
+      const wrongAnswerId = 'answer-b';
 
-      const questionId = questions[0].id;
-      const wrongAnswerId = questions[0].answers[1].id; // second answer is wrong
+      mockGetCorrectAnswer.mockResolvedValue(correctAnswerId);
 
       const request = createVerifyRequest({
+        quizId,
         questionId,
-        answerId: wrongAnswerId,
-        encryptedAnswers,
+        selectedAnswerId: wrongAnswerId,
       });
 
       const response = await POST(request);
       const data = await response.json();
 
       expect(response.status).toBe(200);
+      expect(data.success).toBe(true);
       expect(data.isCorrect).toBe(false);
     });
   });
 
   describe('validation errors (400)', () => {
-    it('returns 400 for missing questionId', async () => {
-      const questions = createMockQuestions(1);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
-
+    it('returns 400 for missing quizId', async () => {
       const request = createVerifyRequest({
-        answerId: 'some-answer',
-        encryptedAnswers,
+        questionId: 'q-1',
+        selectedAnswerId: 'a-1',
       });
 
       const response = await POST(request);
       const data = await response.json();
 
       expect(response.status).toBe(400);
+      expect(data.success).toBe(false);
       expect(data.error).toBe('Missing required fields');
     });
 
-    it('returns 400 for missing answerId', async () => {
-      const questions = createMockQuestions(1);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
-
+    it('returns 400 for missing questionId', async () => {
       const request = createVerifyRequest({
-        questionId: questions[0].id,
-        encryptedAnswers,
+        quizId: 'quiz-123',
+        selectedAnswerId: 'a-1',
       });
 
       const response = await POST(request);
+      const data = await response.json();
 
       expect(response.status).toBe(400);
+      expect(data.error).toBe('Missing required fields');
     });
 
-    it('returns 400 for missing encryptedAnswers', async () => {
+    it('returns 400 for missing selectedAnswerId', async () => {
       const request = createVerifyRequest({
+        quizId: 'quiz-123',
         questionId: 'q-1',
-        answerId: 'a-1',
       });
 
       const response = await POST(request);
@@ -118,57 +110,58 @@ describe('POST /api/quiz/verify-answer', () => {
       expect(response.status).toBe(400);
     });
 
-    it('returns 400 for tampered encryptedAnswers', async () => {
-      const questions = createMockQuestions(1);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
-
-      // Tamper with the encrypted data
-      const tamperedAnswers = encryptedAnswers.slice(0, -10) + 'XXXXXXXXXX';
-
-      const request = createVerifyRequest({
-        questionId: questions[0].id,
-        answerId: questions[0].answers[0].id,
-        encryptedAnswers: tamperedAnswers,
-      });
+    it('returns 400 for invalid JSON body', async () => {
+      const request = new NextRequest(
+        'http://localhost/api/quiz/verify-answer',
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: 'not-valid-json',
+        }
+      );
 
       const response = await POST(request);
-      const data = await response.json();
 
       expect(response.status).toBe(400);
-      expect(data.error).toBe('Invalid encrypted data');
     });
+  });
+
+  describe('not found (404)', () => {
+    it('returns 404 when question not in cache', async () => {
+      mockGetCorrectAnswer.mockResolvedValue(null);
 
-    it('returns 400 for invalid base64 encryptedAnswers', async () => {
       const request = createVerifyRequest({
-        questionId: 'q-1',
-        answerId: 'a-1',
-        encryptedAnswers: 'not-valid-base64!!!',
+        quizId: 'quiz-123',
+        questionId: 'unknown-question',
+        selectedAnswerId: 'a-1',
       });
 
       const response = await POST(request);
+      const data = await response.json();
 
-      expect(response.status).toBe(400);
+      expect(response.status).toBe(404);
+      expect(data.success).toBe(false);
+      expect(data.error).toBe('Question not found in cache');
     });
   });
 
-  describe('not found (404)', () => {
-    it('returns 404 for unknown questionId', async () => {
-      const questions = createMockQuestions(1);
-      const correctAnswersMap = createCorrectAnswersMap(questions);
-      const encryptedAnswers = encryptAnswers(correctAnswersMap);
+  describe('Redis integration', () => {
+    it('calls getCorrectAnswer with correct params', async () => {
+      mockGetCorrectAnswer.mockResolvedValue('correct-id');
 
       const request = createVerifyRequest({
-        questionId: 'unknown-question-id',
-        answerId: 'some-answer',
-        encryptedAnswers,
+        quizId: 'my-quiz',
+        questionId: 'my-question',
+        selectedAnswerId: 'my-answer',
       });
 
-      const response = await POST(request);
-      const data = await response.json();
+      await POST(request);
 
-      expect(response.status).toBe(404);
-      expect(data.error).toBe('Question not found');
+      expect(mockGetCorrectAnswer).toHaveBeenCalledTimes(1);
+      expect(mockGetCorrectAnswer).toHaveBeenCalledWith(
+        'my-quiz',
+        'my-question'
+      );
     });
   });
 });
diff --git a/frontend/lib/tests/admin-api-killswitch.test.ts b/frontend/lib/tests/shop/admin-api-killswitch.test.ts
similarity index 86%
rename from frontend/lib/tests/admin-api-killswitch.test.ts
rename to frontend/lib/tests/shop/admin-api-killswitch.test.ts
index 2dd39ea0..ce7c3dbb 100644
--- a/frontend/lib/tests/admin-api-killswitch.test.ts
+++ b/frontend/lib/tests/shop/admin-api-killswitch.test.ts
@@ -1,10 +1,9 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { vi } from 'vitest';
 import { NextRequest } from 'next/server';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { vi } from 'vitest';
 
 const BASE_URL = 'http://localhost';
 
-// Valid UUIDs for dynamic routes; format matters more than real existence.
 const TEST_PRODUCT_ID = '00000000-0000-4000-8000-000000000001';
 const TEST_ORDER_ID = '00000000-0000-4000-8000-000000000002';
 
@@ -78,15 +77,12 @@ function makeReq(path: string, method: string) {
   const url = `${BASE_URL}${path}`;
   const origin = process.env.APP_ORIGIN ?? 'http://localhost:3000';
 
-  // Intentionally invalid JSON payload to ensure kill-switch guard runs
-  // BEFORE any req.json()/formData() parsing.
   const init: RequestInit = {
     method,
     headers: { 'content-type': 'application/json', origin },
   };
 
   if (method !== 'GET' && method !== 'HEAD') {
-    // Using invalid JSON lets us detect incorrect handler ordering.
     (init as any).body = '{';
   }
 
@@ -98,7 +94,6 @@ async function readCodeFromResponse(
 ): Promise<{ status: number; code?: string; raw: string }> {
   const status = res.status;
 
-  // Read body ONCE to avoid "body used already"
   const raw = await res.text();
 
   if (!raw) return { status, raw: '' };
@@ -120,8 +115,6 @@ async function expectAdminDisabled(res: Response) {
 
   expect(body.status).toBe(403);
 
-  // Contract: we must surface ADMIN_API_DISABLED.
-  // Allow either {code} or {error:{code}}; also allow plain text containing the code.
   if (body.code) {
     expect(body.code).toBe('ADMIN_API_DISABLED');
   } else {
@@ -145,9 +138,7 @@ describe('P0-7.1 Admin API kill-switch coverage (production)', () => {
   beforeEach(() => {
     vi.resetModules();
 
-    // Emulate production and disabled admin API.
     vi.stubEnv('NODE_ENV', 'production');
-    // Treat anything except 'true' as disabled; empty string is explicitly disabled.
     vi.stubEnv('ENABLE_ADMIN_API', '');
     vi.stubEnv('APP_ORIGIN', 'https://admin.example.test');
   });
diff --git a/frontend/lib/tests/admin-csrf-contract.test.ts b/frontend/lib/tests/shop/admin-csrf-contract.test.ts
similarity index 96%
rename from frontend/lib/tests/admin-csrf-contract.test.ts
rename to frontend/lib/tests/shop/admin-csrf-contract.test.ts
index 99965180..3312e906 100644
--- a/frontend/lib/tests/admin-csrf-contract.test.ts
+++ b/frontend/lib/tests/shop/admin-csrf-contract.test.ts
@@ -1,7 +1,6 @@
-import { describe, expect, it, vi } from 'vitest';
 import { NextRequest } from 'next/server';
+import { describe, expect, it, vi } from 'vitest';
 
-// Mock admin auth to "pass"
 vi.mock('@/lib/auth/admin', () => {
   class AdminApiDisabledError extends Error {
     code = 'ADMIN_API_DISABLED';
@@ -20,7 +19,6 @@ vi.mock('@/lib/auth/admin', () => {
   };
 });
 
-// Import AFTER mocking
 import { PATCH as patchStatus } from '@/app/api/shop/admin/products/[id]/status/route';
 
 describe('P0-SEC: admin CSRF required for mutating endpoints', () => {
diff --git a/frontend/lib/tests/admin-product-patch-price-config-error-contract.test.ts b/frontend/lib/tests/shop/admin-product-patch-price-config-error-contract.test.ts
similarity index 94%
rename from frontend/lib/tests/admin-product-patch-price-config-error-contract.test.ts
rename to frontend/lib/tests/shop/admin-product-patch-price-config-error-contract.test.ts
index 95c4105e..785ff55e 100644
--- a/frontend/lib/tests/admin-product-patch-price-config-error-contract.test.ts
+++ b/frontend/lib/tests/shop/admin-product-patch-price-config-error-contract.test.ts
@@ -1,5 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { PriceConfigError } from '@/lib/services/errors';
 
 vi.mock('@/lib/auth/admin', () => ({
@@ -45,14 +46,12 @@ beforeEach(() => {
 function makeReq(): NextRequest {
   const fd = new FormData();
 
-  // Make payload realistic enough to pass parseAdminProductForm in PATCH
   fd.set('title', 'Test product');
   fd.set('badge', 'NONE');
   fd.set('isActive', 'true');
   fd.set('isFeatured', 'false');
   fd.set('stock', '0');
 
-  // Include USD to avoid parser-level USD requirements if any still exist
   fd.set(
     'prices',
     JSON.stringify([
diff --git a/frontend/lib/tests/admin-product-sale-contract.test.ts b/frontend/lib/tests/shop/admin-product-sale-contract.test.ts
similarity index 95%
rename from frontend/lib/tests/admin-product-sale-contract.test.ts
rename to frontend/lib/tests/shop/admin-product-sale-contract.test.ts
index 4264de3a..4373603c 100644
--- a/frontend/lib/tests/admin-product-sale-contract.test.ts
+++ b/frontend/lib/tests/shop/admin-product-sale-contract.test.ts
@@ -1,14 +1,5 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { NextRequest } from 'next/server';
-
-/**
- * We intentionally mock:
- * - getCurrentUser() -> always admin
- * - parseAdminProductForm() -> returns controlled payload
- *
- * This isolates contract behavior of the API route:
- * returns stable code + details for SALE rule violations.
- */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const { getCurrentUserMock, parseAdminProductFormMock } = vi.hoisted(() => ({
   getCurrentUserMock: vi.fn(async () => ({
diff --git a/frontend/lib/tests/cart-rehydrate-variant-sanitize.test.ts b/frontend/lib/tests/shop/cart-rehydrate-variant-sanitize.test.ts
similarity index 97%
rename from frontend/lib/tests/cart-rehydrate-variant-sanitize.test.ts
rename to frontend/lib/tests/shop/cart-rehydrate-variant-sanitize.test.ts
index 112134d0..a3a356f3 100644
--- a/frontend/lib/tests/cart-rehydrate-variant-sanitize.test.ts
+++ b/frontend/lib/tests/shop/cart-rehydrate-variant-sanitize.test.ts
@@ -1,9 +1,10 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import crypto from 'node:crypto';
+
 import { eq } from 'drizzle-orm';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
+import { productPrices, products } from '@/db/schema';
 import { rehydrateCartItems } from '@/lib/services/products';
 
 let productId: string;
diff --git a/frontend/lib/tests/checkout-concurrency-stock1.test.ts b/frontend/lib/tests/shop/checkout-concurrency-stock1.test.ts
similarity index 85%
rename from frontend/lib/tests/checkout-concurrency-stock1.test.ts
rename to frontend/lib/tests/shop/checkout-concurrency-stock1.test.ts
index e459e36b..31f3d279 100644
--- a/frontend/lib/tests/checkout-concurrency-stock1.test.ts
+++ b/frontend/lib/tests/shop/checkout-concurrency-stock1.test.ts
@@ -1,25 +1,22 @@
-// lib/tests/checkout-concurrency-stock1.test.ts
-import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
 import crypto from 'crypto';
-import { NextRequest } from 'next/server';
 import { eq, inArray } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
 import { db } from '@/db';
 import {
-  products,
-  productPrices,
-  orders,
-  orderItems,
   inventoryMoves,
+  orderItems,
+  orders,
+  productPrices,
+  products,
 } from '@/db/schema/shop';
 
-// NOTE: checkout route will be imported dynamically after mocks are installed.
-
 vi.mock('@/lib/auth', async () => {
   const actual = await vi.importActual<any>('@/lib/auth');
   return {
     ...actual,
-    getCurrentUser: async () => null, // avoid cookies() in vitest
+    getCurrentUser: async () => null,
   };
 });
 
@@ -81,7 +78,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
   });
 
   it('must allow only one success and must not double-reserve (stock must not go below 0)', async () => {
-    // ---------- Arrange: create isolated product + USD price, stock=1 ----------
     const productId = crypto.randomUUID();
     const slug = `__test_checkout_concurrency_${productId.slice(0, 8)}`;
     const now = new Date();
@@ -91,7 +87,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
       title: `TEST concurrency stock=1 (${slug})`,
       imageUrl: '/placeholder.svg',
 
-      // FIX: products.price is NOT NULL in DB (legacy column)
       price: 1000,
       originalPrice: null,
       currency: 'USD',
@@ -107,23 +102,19 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
       productId,
       currency: 'USD',
 
-      // minor-units
       priceMinor: 1000,
       originalPriceMinor: null,
 
-      // FIX: legacy major-unit columns are NOT NULL
-      price: 10, // 1000 minor -> 10.00
+      price: 10,
       originalPrice: null,
 
       createdAt: now,
       updatedAt: now,
     } as any);
 
-    // ---------- Helper: call checkout with given idempotency key ----------
     const baseUrl = 'http://localhost:3000';
-    const { POST: checkoutPOST } = await import(
-      '@/app/api/shop/checkout/route'
-    );
+    const { POST: checkoutPOST } =
+      await import('@/app/api/shop/checkout/route');
 
     async function callCheckout(idemKey: string) {
       const body = JSON.stringify({
@@ -147,7 +138,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
       return { status: res.status, json };
     }
 
-    // ---------- Act: run two requests in parallel (start-gated) ----------
     const idemA = crypto.randomUUID();
     const idemB = crypto.randomUUID();
 
@@ -168,7 +158,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
 
     const [r1, r2] = await Promise.all([p1, p2]);
 
-    // ---------- Assert: exactly one success, the other controlled failure ----------
     const results = [r1, r2];
     const success = results.filter(r => r.status === 201);
     const fail = results.filter(r => r.status !== 201);
@@ -194,7 +183,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
       ).toBe(true);
     }
 
-    // ---------- DB asserts: stock must be 0 ----------
     const prodRows = await db
       .select()
       .from(products)
@@ -209,7 +197,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
     expect(toNum(stock)).toBe(0);
     expect(toNum(stock)).toBeGreaterThanOrEqual(0);
 
-    // ---------- Ledger asserts: no double reserve for this product ----------
     const moves = await db
       .select()
       .from(inventoryMoves)
@@ -237,7 +224,6 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
     expect(reservedUnits).toBe(1);
     expect(reserveMoves.length).toBe(1);
 
-    // ---------- Cleanup: best-effort ----------
     try {
       const oi = await db
         .select({ orderId: (orderItems as any).orderId })
@@ -261,8 +247,12 @@ describe('P0-8.10.1 checkout concurrency: stock=1, two parallel checkouts', () =
       }
 
       await db.delete(products).where(eq((products as any).id, productId));
-    } catch {
-      // best-effort cleanup
+    } catch (err) {
+      // Do not swallow cleanup failures: they can leave residual rows and cause flaky follow-up tests.
+      // In CI we fail fast so flakes are visible.
+      if (process.env.CI) throw err;
+
+      console.warn('checkout concurrency cleanup failed', err);
     }
   }, 30000);
 });
diff --git a/frontend/lib/tests/checkout-currency-policy.test.ts b/frontend/lib/tests/shop/checkout-currency-policy.test.ts
similarity index 88%
rename from frontend/lib/tests/checkout-currency-policy.test.ts
rename to frontend/lib/tests/shop/checkout-currency-policy.test.ts
index 0d34c8c6..56f2ebd8 100644
--- a/frontend/lib/tests/checkout-currency-policy.test.ts
+++ b/frontend/lib/tests/shop/checkout-currency-policy.test.ts
@@ -1,16 +1,15 @@
-import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
+import crypto from 'crypto';
 import { inArray } from 'drizzle-orm';
 import { NextRequest } from 'next/server';
-import crypto from 'crypto';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
 process.env.STRIPE_PAYMENTS_ENABLED = 'false';
 process.env.STRIPE_SECRET_KEY = '';
 process.env.STRIPE_WEBHOOK_SECRET = '';
 
 vi.mock('@/lib/auth', async () => {
-  const actual = await vi.importActual<typeof import('@/lib/auth')>(
-    '@/lib/auth'
-  );
+  const actual =
+    await vi.importActual<typeof import('@/lib/auth')>('@/lib/auth');
   return {
     ...actual,
     getCurrentUser: async () => null, // guest
@@ -21,7 +20,8 @@ vi.mock('@/lib/env/stripe', () => ({
   isPaymentsEnabled: () => false,
 }));
 
-const createPaymentIntentMock = vi.fn((..._args: any[]) => {
+const createPaymentIntentMock = vi.fn((...args: any[]) => {
+  void args;
   throw new Error(
     'Stripe should not be called in this test (payments disabled).'
   );
@@ -29,22 +29,26 @@ const createPaymentIntentMock = vi.fn((..._args: any[]) => {
 
 vi.mock('@/lib/psp/stripe', () => ({
   createPaymentIntent: (...args: any[]) => createPaymentIntentMock(...args),
-  retrievePaymentIntent: (..._args: any[]) => {
+  retrievePaymentIntent: (...args: any[]) => {
+    void args;
     throw new Error(
       'Stripe should not be called in this test (payments disabled).'
     );
   },
 }));
 
-// checkout-currency-policy.test.ts
-
-const logErrorMock = vi.fn((..._args: any[]) => undefined);
-const logWarnMock = vi.fn((..._args: any[]) => undefined);
+const logErrorMock = vi.fn((...args: any[]) => {
+  void args;
+  return undefined;
+});
+const logWarnMock = vi.fn((...args: any[]) => {
+  void args;
+  return undefined;
+});
 
 vi.mock('@/lib/logging', async () => {
-  const actual = await vi.importActual<typeof import('@/lib/logging')>(
-    '@/lib/logging'
-  );
+  const actual =
+    await vi.importActual<typeof import('@/lib/logging')>('@/lib/logging');
   return {
     ...actual,
     logError: (...args: any[]) => logErrorMock(...args),
@@ -53,7 +57,7 @@ vi.mock('@/lib/logging', async () => {
 });
 
 import { db } from '@/db';
-import { products, productPrices, orders } from '@/db/schema';
+import { orders, productPrices, products } from '@/db/schema';
 
 let POST: (req: NextRequest) => Promise<Response>;
 
@@ -69,13 +73,11 @@ beforeAll(() => {
 });
 
 beforeAll(async () => {
-  // Import route after env + mocks are set
   const mod = await import('@/app/api/shop/checkout/route');
   POST = mod.POST;
 });
 
 afterAll(async () => {
-  // delete orders first (cascade order_items)
   if (createdOrderIds.length) {
     await db.delete(orders).where(inArray(orders.id, createdOrderIds));
   }
@@ -88,7 +90,6 @@ afterAll(async () => {
 });
 
 function makeIdempotencyKey(): string {
-  // 36 chars, allowed by your schema
   return crypto.randomUUID();
 }
 
@@ -127,7 +128,6 @@ async function seedProduct(options: {
       imageUrl: 'https://example.com/img.png',
       imagePublicId: null,
 
-      // legacy mirror required by schema
       price: '10.00',
       originalPrice: null,
       currency: 'USD',
@@ -165,7 +165,7 @@ async function debugIfNotExpected(res: Response, expectedStatus: number) {
   if (res.status === expectedStatus) return;
 
   const text = await res.text().catch(() => '<failed to read body>');
-  // Keep output minimal but decisive
+
   console.log('checkout failed', { status: res.status, body: text });
   console.log('logError calls', logErrorMock.mock.calls);
   console.log(
diff --git a/frontend/lib/tests/checkout-no-payments.test.ts b/frontend/lib/tests/shop/checkout-no-payments.test.ts
similarity index 85%
rename from frontend/lib/tests/checkout-no-payments.test.ts
rename to frontend/lib/tests/shop/checkout-no-payments.test.ts
index 4b119870..fe9747cc 100644
--- a/frontend/lib/tests/checkout-no-payments.test.ts
+++ b/frontend/lib/tests/shop/checkout-no-payments.test.ts
@@ -2,11 +2,12 @@
 import crypto from 'crypto';
 import { eq, sql } from 'drizzle-orm';
 import { NextRequest } from 'next/server';
-import { deriveTestIpFromIdemKey } from '@/lib/tests/helpers/ip';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+
 import { db } from '@/db';
-import { orders, products, productPrices } from '@/db/schema';
+import { orders, productPrices, products } from '@/db/schema';
 import { toDbMoney } from '@/lib/shop/money';
-import { describe, it, expect, vi, beforeAll, afterAll } from 'vitest';
+import { deriveTestIpFromIdemKey } from '@/lib/tests/helpers/ip';
 
 const __prevRateLimitDisabled = process.env.RATE_LIMIT_DISABLED;
 
@@ -24,11 +25,10 @@ vi.mock('@/lib/logging', async () => {
   const actual = await vi.importActual<any>('@/lib/logging');
   return {
     ...actual,
-    logWarn: () => {}, // silence expected business warnings in this test file
+    logWarn: () => {},
   };
 });
 
-// Force "no payments" for this whole test file.
 vi.mock('@/lib/env/stripe', async () => {
   const actual = await vi.importActual<any>('@/lib/env/stripe');
   return {
@@ -41,7 +41,7 @@ vi.mock('@/lib/auth', async () => {
   const actual = await vi.importActual<any>('@/lib/auth');
   return {
     ...actual,
-    getCurrentUser: async () => null, // critical: avoid cookies() in tests
+    getCurrentUser: async () => null,
   };
 });
 
@@ -53,19 +53,12 @@ function logTestCleanupFailed(meta: Record<string, unknown>, error: unknown) {
   });
 }
 
-/**
- * Creates an isolated product + product_prices row to avoid stock races
- * with parallel test files that also reserve/release inventory.
- *
- * Product is created as inactive by default; tests activate it only for the minimal window needed.
- */
 async function createIsolatedProductForCurrency(opts: {
   currency: 'USD' | 'UAH';
   stock: number;
 }): Promise<{ productId: string }> {
   const now = new Date();
 
-  // Clone a real product row to satisfy NOT NULL columns (schema varies).
   const [tpl] = await db
     .select()
     .from(products)
@@ -82,7 +75,6 @@ async function createIsolatedProductForCurrency(opts: {
   const slug = `t-iso-nopay-${crypto.randomUUID()}`;
   const sku = `t-iso-nopay-${crypto.randomUUID()}`;
 
-  // Keep inactive by default to avoid being picked by other tests.
   await db.insert(products).values({
     ...(tpl as any),
     id: productId,
@@ -95,7 +87,6 @@ async function createIsolatedProductForCurrency(opts: {
     updatedAt: now,
   } as any);
 
-  // Ensure price exists for requested currency (minor + legacy).
   try {
     await db.insert(productPrices).values({
       productId,
@@ -108,7 +99,6 @@ async function createIsolatedProductForCurrency(opts: {
       updatedAt: now,
     } as any);
   } catch (e) {
-    // Cleanup orphaned product on price insert failure (best-effort)
     try {
       await db.delete(products).where(eq(products.id, productId));
     } catch (cleanupError) {
@@ -130,14 +120,12 @@ async function createIsolatedProductForCurrency(opts: {
 }
 
 async function cleanupIsolatedProduct(productId: string) {
-  // Make sure it won't be visible for any selector.
   try {
     await db
       .update(products)
       .set({ isActive: false, updatedAt: new Date() } as any)
       .where(eq(products.id, productId));
   } catch (e) {
-    // Non-fatal: best-effort test teardown
     logTestCleanupFailed(
       { fn: 'cleanupIsolatedProduct', step: 'deactivate product', productId },
       e
@@ -231,8 +219,6 @@ async function countMovesForProduct(productId: string): Promise<number> {
 }
 
 async function bestEffortHardDeleteOrder(orderId: string) {
-  // Keep DB reasonably clean in dev.
-  // Use raw SQL because inventory_moves/order_items may not be exported as Drizzle tables.
   try {
     await db.execute(
       sql`delete from inventory_moves where order_id = ${orderId}::uuid`
@@ -283,7 +269,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
     let orderId: string | null = null;
 
     try {
-      // Activate only for the minimal window needed by checkout.
       await db
         .update(products)
         .set({ isActive: true, updatedAt: new Date() } as any)
@@ -314,18 +299,15 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(typeof orderId).toBe('string');
       expect(orderId.length).toBeGreaterThan(10);
 
-      // Deactivate immediately to minimize chance other parallel tests pick it.
       await db
         .update(products)
         .set({ isActive: false, updatedAt: new Date() } as any)
         .where(eq(products.id, productId));
 
-      // response-level contract
       expect(json.order.paymentProvider).toBe('none');
       expect(json.order.paymentStatus).toBe('paid');
       expect(json.order.currency).toBe('USD');
 
-      // DB contract (source of truth)
       const [row] = await db
         .select({
           id: orders.id,
@@ -342,13 +324,12 @@ describe.sequential('Checkout (no payments) invariants', () => {
 
       expect(row).toBeTruthy();
       expect(row!.paymentProvider).toBe('none');
-      expect(row!.paymentStatus).toBe('paid'); // forced by DB CHECK for provider=none
-      expect(row!.inventoryStatus).toBe('reserved'); // TRUE finality for no-payments
+      expect(row!.paymentStatus).toBe('paid');
+      expect(row!.inventoryStatus).toBe('reserved');
       expect(row!.status).toBe('PAID');
       expect(row!.currency).toBe('USD');
       expect(row!.totalAmountMinor).toBeGreaterThan(0);
 
-      // Ledger: exactly one reserve (no duplicates on single request)
       const moves = await readMoves(orderId);
       const reserves = moves.filter(m => m.type === 'reserve');
       const releases = moves.filter(m => m.type === 'release');
@@ -358,7 +339,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(reserves[0]!.quantity).toBe(1);
       expect(releases.length).toBe(0);
 
-      // Stock decreased
       const [p1] = await db
         .select({ stock: products.stock })
         .from(products)
@@ -368,7 +348,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(p1).toBeTruthy();
       expect(p1!.stock).toBe(stockBefore - 1);
 
-      // cleanup: restore stock via release
       const { restockOrder } = await import('@/lib/services/orders');
       await restockOrder(orderId, { reason: 'stale' });
 
@@ -384,7 +363,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       await bestEffortHardDeleteOrder(orderId);
       orderId = null;
     } finally {
-      // If test failed after creating an order, try to delete it.
       if (orderId) {
         await bestEffortHardDeleteOrder(orderId);
       }
@@ -429,13 +407,11 @@ describe.sequential('Checkout (no payments) invariants', () => {
       orderId1 = (j1?.order?.id ?? j1?.orderId) as string;
       expect(orderId1).toBeTruthy();
 
-      // Deactivate immediately (same reason as in success-path test)
       await db
         .update(products)
         .set({ isActive: false, updatedAt: new Date() } as any)
         .where(eq(products.id, productId));
 
-      // same IdemKey + same payload => same order id (no extra reserve)
       const r2 = await postCheckout({
         idemKey,
         acceptLanguage: 'en',
@@ -450,9 +426,8 @@ describe.sequential('Checkout (no payments) invariants', () => {
 
       const movesAfter2 = await readMoves(orderId1);
       const reservesAfter2 = movesAfter2.filter(m => m.type === 'reserve');
-      expect(reservesAfter2.length).toBe(1); // critical: no double-reserve
+      expect(reservesAfter2.length).toBe(1);
 
-      // same IdemKey but different payload => 409 conflict
       const r3 = await postCheckout({
         idemKey,
         acceptLanguage: 'en',
@@ -460,7 +435,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       });
       expect(r3.status).toBe(409);
 
-      // cleanup: restore stock via release
       const { restockOrder } = await import('@/lib/services/orders');
       await restockOrder(orderId1, { reason: 'stale' });
 
@@ -492,13 +466,11 @@ describe.sequential('Checkout (no payments) invariants', () => {
     let unexpectedOrderId: string | null = null;
 
     try {
-      // Activate only for the minimal window needed by checkout.
       await db
         .update(products)
         .set({ isActive: true, updatedAt: new Date() } as any)
         .where(eq(products.id, productId));
 
-      // Make variants deterministic for this test.
       await db
         .update(products)
         .set({
@@ -518,7 +490,7 @@ describe.sequential('Checkout (no payments) invariants', () => {
 
       expect(p0).toBeTruthy();
       const stockBefore = p0!.stock;
-      // ДО checkout: порахували moves
+
       const countBefore = await countMovesForProduct(productId);
 
       const res = await postCheckout({
@@ -537,7 +509,7 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(res.status).toBe(400);
 
       const json: any = await res.json();
-      // Deactivate immediately to minimize chance other parallel tests pick it.
+
       await db
         .update(products)
         .set({ isActive: false, updatedAt: new Date() } as any)
@@ -547,7 +519,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       const countAfter = await countMovesForProduct(productId);
       expect(countAfter).toBe(countBefore);
 
-      // No order should be created for invalid variant
       const [maybeOrder] = await db
         .select({ id: orders.id })
         .from(orders)
@@ -557,7 +528,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       if (maybeOrder?.id) unexpectedOrderId = maybeOrder.id;
       expect(maybeOrder).toBeFalsy();
 
-      // Stock must not change
       const [p1] = await db
         .select({ stock: products.stock })
         .from(products)
@@ -567,7 +537,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(p1).toBeTruthy();
       expect(p1!.stock).toBe(stockBefore);
     } finally {
-      // Deactivate to reduce cross-test interference.
       try {
         await db
           .update(products)
@@ -575,7 +544,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
           .where(eq(products.id, productId));
       } catch {}
 
-      // If an order was unexpectedly created, remove it (keep DB clean).
       if (unexpectedOrderId) {
         await bestEffortHardDeleteOrder(unexpectedOrderId);
       }
@@ -594,13 +562,11 @@ describe.sequential('Checkout (no payments) invariants', () => {
     let unexpectedOrderId: string | null = null;
 
     try {
-      // Activate only for the minimal window needed by checkout.
       await db
         .update(products)
         .set({ isActive: true, updatedAt: new Date() } as any)
         .where(eq(products.id, productId));
 
-      // Simulate "no variants configured" (empty lists).
       await db
         .update(products)
         .set({
@@ -621,7 +587,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(p0).toBeTruthy();
       const stockBefore = p0!.stock;
 
-      // ДО checkout: порахували moves
       const countBefore = await countMovesForProduct(productId);
 
       const res = await postCheckout({
@@ -631,7 +596,7 @@ describe.sequential('Checkout (no payments) invariants', () => {
           {
             productId,
             quantity: 1,
-            // Client sends options, but product has none => must be rejected.
+
             selectedSize: 'S',
             selectedColor: 'Red',
           },
@@ -642,7 +607,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
 
       const json: any = await res.json();
 
-      // Deactivate immediately to minimize chance other parallel tests pick it.
       await db
         .update(products)
         .set({ isActive: false, updatedAt: new Date() } as any)
@@ -650,11 +614,9 @@ describe.sequential('Checkout (no payments) invariants', () => {
 
       expect(json?.code).toBe('INVALID_VARIANT');
 
-      // Після checkout: moves count must be unchanged
       const countAfter = await countMovesForProduct(productId);
       expect(countAfter).toBe(countBefore);
 
-      // No order should be created for this idemKey
       const [maybeOrder] = await db
         .select({ id: orders.id })
         .from(orders)
@@ -664,7 +626,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       if (maybeOrder?.id) unexpectedOrderId = maybeOrder.id;
       expect(maybeOrder).toBeFalsy();
 
-      // Stock must not change
       const [p1] = await db
         .select({ stock: products.stock })
         .from(products)
@@ -674,7 +635,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
       expect(p1).toBeTruthy();
       expect(p1!.stock).toBe(stockBefore);
     } finally {
-      // Deactivate to reduce cross-test interference.
       try {
         await db
           .update(products)
@@ -682,7 +642,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
           .where(eq(products.id, productId));
       } catch {}
 
-      // If an order was unexpectedly created, remove it (keep DB clean).
       if (unexpectedOrderId) {
         await bestEffortHardDeleteOrder(unexpectedOrderId);
       }
@@ -696,7 +655,6 @@ describe.sequential('Checkout (no payments) invariants', () => {
     const idemKey = crypto.randomUUID();
     const createdAt = new Date(Date.now() - 11 * 60_000);
 
-    // Insert orphan order (no inventory_moves)
     await db.insert(orders).values({
       id: orphanId,
       currency: 'USD',
@@ -721,9 +679,8 @@ describe.sequential('Checkout (no payments) invariants', () => {
     const moves0 = await readMoves(orphanId);
     expect(moves0.length).toBe(0);
 
-    const { restockStaleNoPaymentOrders } = await import(
-      '@/lib/services/orders'
-    );
+    const { restockStaleNoPaymentOrders } =
+      await import('@/lib/services/orders');
     const processed = await restockStaleNoPaymentOrders({
       olderThanMinutes: 10,
       batchSize: 50,
diff --git a/frontend/lib/tests/checkout-origin-posture-contract.test.ts b/frontend/lib/tests/shop/checkout-origin-posture-contract.test.ts
similarity index 91%
rename from frontend/lib/tests/checkout-origin-posture-contract.test.ts
rename to frontend/lib/tests/shop/checkout-origin-posture-contract.test.ts
index df22d2b8..4515bc4e 100644
--- a/frontend/lib/tests/checkout-origin-posture-contract.test.ts
+++ b/frontend/lib/tests/shop/checkout-origin-posture-contract.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
+
 import { POST } from '@/app/api/shop/checkout/route';
 import { makeCheckoutReq } from '@/lib/tests/helpers/makeCheckoutReq';
 
diff --git a/frontend/lib/tests/checkout-set-payment-intent-reject-contract.test.ts b/frontend/lib/tests/shop/checkout-set-payment-intent-reject-contract.test.ts
similarity index 92%
rename from frontend/lib/tests/checkout-set-payment-intent-reject-contract.test.ts
rename to frontend/lib/tests/shop/checkout-set-payment-intent-reject-contract.test.ts
index a2068474..be239eaf 100644
--- a/frontend/lib/tests/checkout-set-payment-intent-reject-contract.test.ts
+++ b/frontend/lib/tests/shop/checkout-set-payment-intent-reject-contract.test.ts
@@ -1,18 +1,17 @@
 import {
+  afterAll,
+  beforeAll,
+  beforeEach,
   describe,
-  it,
   expect,
+  it,
   vi,
-  beforeEach,
-  beforeAll,
-  afterAll,
 } from 'vitest';
-import { makeCheckoutReq } from '@/lib/tests/helpers/makeCheckoutReq';
+
 import { InvalidPayloadError } from '@/lib/services/errors';
 import { ensureStripePaymentIntentForOrder } from '@/lib/services/orders/payment-attempts';
+import { makeCheckoutReq } from '@/lib/tests/helpers/makeCheckoutReq';
 
-// Force payments enabled so route goes into Stripe flow
-// gitleaks:allow
 vi.mock('@/lib/env/stripe', () => ({
   getStripeEnv: () => ({
     paymentsEnabled: true,
@@ -20,15 +19,13 @@ vi.mock('@/lib/env/stripe', () => ({
     secretKey: 'sk_test_dummy',
     webhookSecret: 'whsec_test_dummy',
   }),
-  isPaymentsEnabled: () => true, // kept for backward compatibility
+  isPaymentsEnabled: () => true,
 }));
 
-// Avoid auth coupling
 vi.mock('@/lib/auth', () => ({
   getCurrentUser: vi.fn().mockResolvedValue(null),
 }));
 
-// Stripe: PI creation succeeds
 vi.mock('@/lib/psp/stripe', () => ({
   createPaymentIntent: vi.fn(async () => ({
     paymentIntentId: 'pi_test_attach_reject',
@@ -37,7 +34,6 @@ vi.mock('@/lib/psp/stripe', () => ({
   retrievePaymentIntent: vi.fn(),
 }));
 
-// Avoid DB coupling introduced by #6 (DB-canonical PI amount/currency)
 vi.mock('@/lib/services/orders/payment-intent', () => ({
   readStripePaymentIntentParams: vi.fn(async () => ({
     amountMinor: 1000,
@@ -45,7 +41,6 @@ vi.mock('@/lib/services/orders/payment-intent', () => ({
   })),
 }));
 
-// Mock order services
 vi.mock('@/lib/services/orders', async () => {
   const actual = await vi.importActual<any>('@/lib/services/orders');
   return {
@@ -69,8 +64,8 @@ vi.mock('@/lib/services/orders/payment-attempts', async () => {
 import { POST } from '@/app/api/shop/checkout/route';
 import {
   createOrderWithItems,
-  setOrderPaymentIntent,
   restockOrder,
+  setOrderPaymentIntent,
 } from '@/lib/services/orders';
 
 type MockedFn = ReturnType<typeof vi.fn>;
@@ -134,7 +129,6 @@ describe('checkout: setOrderPaymentIntent rejection after order creation must no
     const json = await res.json();
     expect(json.code).toBe('CHECKOUT_CONFLICT');
 
-    // Policy: conflict should not trigger immediate restock here.
     expect(restock).not.toHaveBeenCalled();
   });
 
diff --git a/frontend/lib/tests/checkout-stripe-error-contract.test.ts b/frontend/lib/tests/shop/checkout-stripe-error-contract.test.ts
similarity index 88%
rename from frontend/lib/tests/checkout-stripe-error-contract.test.ts
rename to frontend/lib/tests/shop/checkout-stripe-error-contract.test.ts
index 208aa6c6..e897fced 100644
--- a/frontend/lib/tests/checkout-stripe-error-contract.test.ts
+++ b/frontend/lib/tests/shop/checkout-stripe-error-contract.test.ts
@@ -1,15 +1,15 @@
 import {
+  afterAll,
+  beforeAll,
+  beforeEach,
   describe,
-  it,
   expect,
+  it,
   vi,
-  beforeEach,
-  beforeAll,
-  afterAll,
 } from 'vitest';
+
 import { makeCheckoutReq } from '@/lib/tests/helpers/makeCheckoutReq';
 
-// 1) force payments enabled so route goes into Stripe flow
 vi.mock('@/lib/env/stripe', () => ({
   getStripeEnv: () => ({
     paymentsEnabled: true,
@@ -17,15 +17,13 @@ vi.mock('@/lib/env/stripe', () => ({
     secretKey: 'sk_test_dummy',
     webhookSecret: 'whsec_test_dummy',
   }),
-  isPaymentsEnabled: () => true, // kept for backward compatibility
+  isPaymentsEnabled: () => true,
 }));
 
-// 2) avoid auth coupling
 vi.mock('@/lib/auth', () => ({
   getCurrentUser: vi.fn().mockResolvedValue(null),
 }));
 
-// 3) force Stripe PI creation to fail AFTER "DB writes" (simulated by createOrderWithItems resolving)
 vi.mock('@/lib/psp/stripe', () => ({
   createPaymentIntent: vi.fn(async () => {
     throw new Error('STRIPE_TEST_DOWN');
@@ -33,7 +31,6 @@ vi.mock('@/lib/psp/stripe', () => ({
   retrievePaymentIntent: vi.fn(),
 }));
 
-// Avoid DB coupling introduced by #6 (DB-canonical PI amount/currency)
 vi.mock('@/lib/services/orders/payment-intent', () => ({
   readStripePaymentIntentParams: vi.fn(async () => ({
     amountMinor: 1000,
@@ -41,7 +38,6 @@ vi.mock('@/lib/services/orders/payment-intent', () => ({
   })),
 }));
 
-// 4) mock orders services so we don't depend on DB schema/seed here
 vi.mock('@/lib/services/orders', async () => {
   const actual = await vi.importActual<any>('@/lib/services/orders');
   return {
diff --git a/frontend/lib/tests/shop/currency.test.ts b/frontend/lib/tests/shop/currency.test.ts
new file mode 100644
index 00000000..be16e77b
--- /dev/null
+++ b/frontend/lib/tests/shop/currency.test.ts
@@ -0,0 +1,46 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  parsePrimaryLocaleFromAcceptLanguage,
+  resolveCurrencyFromHeaders,
+  resolveCurrencyFromLocale,
+} from '../../shop/currency';
+
+describe('currency policy (CUR-0 / D1)', () => {
+  it('uk -> UAH', () => {
+    expect(resolveCurrencyFromLocale('uk')).toBe('UAH');
+    expect(resolveCurrencyFromLocale('uk-UA')).toBe('UAH');
+    expect(resolveCurrencyFromLocale('uk_UA')).toBe('UAH');
+    expect(resolveCurrencyFromLocale('UK-ua')).toBe('UAH');
+  });
+
+  it('non-uk -> USD', () => {
+    expect(resolveCurrencyFromLocale('en')).toBe('USD');
+    expect(resolveCurrencyFromLocale('pl-PL')).toBe('USD');
+    expect(resolveCurrencyFromLocale(null)).toBe('USD');
+    expect(resolveCurrencyFromLocale(undefined)).toBe('USD');
+    expect(resolveCurrencyFromLocale('')).toBe('USD');
+  });
+
+  it('parses primary locale from Accept-Language', () => {
+    expect(
+      parsePrimaryLocaleFromAcceptLanguage('uk-UA,uk;q=0.9,en-US;q=0.8')
+    ).toBe('uk-UA');
+    expect(parsePrimaryLocaleFromAcceptLanguage('en-US')).toBe('en-US');
+    expect(parsePrimaryLocaleFromAcceptLanguage('')).toBe(null);
+    expect(parsePrimaryLocaleFromAcceptLanguage(null)).toBe(null);
+  });
+
+  it('resolves from headers only (Accept-Language)', () => {
+    const h1 = new Headers({
+      'accept-language': 'uk-UA,uk;q=0.9,en-US;q=0.8',
+    });
+    expect(resolveCurrencyFromHeaders(h1)).toBe('UAH');
+
+    const h2 = new Headers({ 'accept-language': 'en-US,en;q=0.9' });
+    expect(resolveCurrencyFromHeaders(h2)).toBe('USD');
+
+    const h3 = new Headers();
+    expect(resolveCurrencyFromHeaders(h3)).toBe('USD');
+  });
+});
diff --git a/frontend/lib/tests/shop/format-money.test.ts b/frontend/lib/tests/shop/format-money.test.ts
new file mode 100644
index 00000000..57d81ea2
--- /dev/null
+++ b/frontend/lib/tests/shop/format-money.test.ts
@@ -0,0 +1,15 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatMoney } from '@/lib/shop/currency';
+
+describe('formatMoney', () => {
+  it('formats USD with $ for en', () => {
+    const s = formatMoney(1999, 'USD', 'en');
+    expect(s).toContain('$');
+  });
+
+  it('formats UAH with ₴ for uk', () => {
+    const s = formatMoney(1999, 'UAH', 'uk');
+    expect(s).toContain('₴');
+  });
+});
diff --git a/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts b/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts
new file mode 100644
index 00000000..5606444c
--- /dev/null
+++ b/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts
@@ -0,0 +1,218 @@
+import { randomUUID } from 'node:crypto';
+
+import { and, eq } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import { describe, expect, it, vi } from 'vitest';
+
+import { db } from '@/db';
+import {
+  inventoryMoves,
+  orderItems,
+  orders,
+  productPrices,
+  products,
+} from '@/db/schema';
+
+vi.mock('@/lib/auth', async () => {
+  const actual = await vi.importActual<Record<string, unknown>>('@/lib/auth');
+  return {
+    ...actual,
+    getCurrentUser: vi.fn(async () => null),
+  };
+});
+
+vi.mock('@/lib/env/stripe', async () => {
+  const actual =
+    await vi.importActual<Record<string, unknown>>('@/lib/env/stripe');
+  return {
+    ...actual,
+    isPaymentsEnabled: () => false,
+  };
+});
+
+type CheckoutResponse = {
+  success: boolean;
+  orderId?: string;
+  order?: { id?: string };
+};
+
+function makeJsonRequest(
+  url: string,
+  body: unknown,
+  headers: Record<string, string>
+) {
+  return new NextRequest(url, {
+    method: 'POST',
+    headers,
+    body: JSON.stringify(body),
+  });
+}
+
+async function cleanupByIds(params: { orderId?: string; productId: string }) {
+  const { orderId, productId } = params;
+
+  if (orderId) {
+    // delete children first
+    await db.delete(inventoryMoves).where(eq(inventoryMoves.orderId, orderId));
+    await db.delete(orderItems).where(eq(orderItems.orderId, orderId));
+    await db.delete(orders).where(eq(orders.id, orderId));
+  }
+
+  await db.delete(productPrices).where(eq(productPrices.productId, productId));
+
+  await db.delete(products).where(eq(products.id, productId));
+}
+
+describe('P0-6 snapshots: order_items immutability', () => {
+  it('snapshot fields must not change after products/product_prices update', async () => {
+    const productId = randomUUID();
+    const priceId = randomUUID();
+
+    const titleV1 = 'Snapshot Test Product';
+    const slugV1 = `snapshot-test-${productId.slice(0, 8)}`;
+    const skuV1 = `SKU-${productId.slice(0, 8)}`;
+
+    await db.insert(products).values({
+      id: productId,
+      slug: slugV1,
+      title: titleV1,
+      description: 'snapshot test',
+      imageUrl: 'https://res.cloudinary.com/devlovers/image/upload/v1/test.png',
+      imagePublicId: null,
+      price: '9.00',
+      originalPrice: null,
+      currency: 'USD',
+      category: null,
+      type: null,
+      colors: [],
+      sizes: [],
+      badge: 'NONE',
+      isActive: true,
+      isFeatured: false,
+      stock: 10,
+      sku: skuV1,
+    });
+
+    await db.insert(productPrices).values({
+      id: priceId,
+      productId,
+      currency: 'USD',
+      priceMinor: 900,
+      originalPriceMinor: null,
+      price: '9.00',
+      originalPrice: null,
+    });
+
+    const idem = randomUUID();
+    const req = makeJsonRequest(
+      'http://localhost:3000/api/shop/checkout',
+      { items: [{ productId, quantity: 1 }] },
+      {
+        'Accept-Language': 'en-US,en;q=0.9',
+        'Content-Type': 'application/json',
+        'Idempotency-Key': idem,
+        Origin: 'http://localhost:3000',
+      }
+    );
+    const { POST: checkoutPOST } =
+      await import('@/app/api/shop/checkout/route');
+
+    const res = await checkoutPOST(req);
+
+    expect(res.status).toBeGreaterThanOrEqual(200);
+    expect(res.status).toBeLessThan(300);
+
+    const json = (await res.json()) as CheckoutResponse;
+    expect(json.success).toBe(true);
+
+    const orderId = json.orderId ?? json.order?.id;
+    expect(typeof orderId).toBe('string');
+    if (!orderId) throw new Error('Missing orderId from checkout response');
+
+    let primaryError: unknown = null;
+    let cleanupError: unknown = null;
+
+    try {
+      const before = await db
+        .select({
+          orderId: orderItems.orderId,
+          productId: orderItems.productId,
+          quantity: orderItems.quantity,
+          unitPriceMinor: orderItems.unitPriceMinor,
+          lineTotalMinor: orderItems.lineTotalMinor,
+          productTitle: orderItems.productTitle,
+          productSlug: orderItems.productSlug,
+          productSku: orderItems.productSku,
+        })
+        .from(orderItems)
+        .where(eq(orderItems.orderId, orderId));
+
+      expect(before.length).toBe(1);
+      expect(before[0].productId).toBe(productId);
+      expect(before[0].productTitle).toBe(titleV1);
+      expect(before[0].productSlug).toBe(slugV1);
+      expect(before[0].productSku).toBe(skuV1);
+      expect(before[0].unitPriceMinor).toBe(900);
+      expect(before[0].lineTotalMinor).toBe(900);
+
+      const titleV2 = `${titleV1} UPDATED`;
+      const slugV2 = `${slugV1}-updated`;
+      const skuV2 = `${skuV1}-UPDATED`;
+
+      await db
+        .update(products)
+        .set({
+          title: titleV2,
+          slug: slugV2,
+          sku: skuV2,
+          updatedAt: new Date(),
+        })
+        .where(eq(products.id, productId));
+
+      await db
+        .update(productPrices)
+        .set({
+          priceMinor: 1000,
+          price: '10.00',
+          updatedAt: new Date(),
+        })
+        .where(
+          and(
+            eq(productPrices.productId, productId),
+            eq(productPrices.currency, 'USD')
+          )
+        );
+
+      const after = await db
+        .select({
+          orderId: orderItems.orderId,
+          productId: orderItems.productId,
+          quantity: orderItems.quantity,
+          unitPriceMinor: orderItems.unitPriceMinor,
+          lineTotalMinor: orderItems.lineTotalMinor,
+          productTitle: orderItems.productTitle,
+          productSlug: orderItems.productSlug,
+          productSku: orderItems.productSku,
+        })
+        .from(orderItems)
+        .where(eq(orderItems.orderId, orderId));
+
+      expect(after.length).toBe(1);
+
+      expect(after[0]).toEqual(before[0]);
+    } catch (e) {
+      primaryError = e;
+      throw e;
+    } finally {
+      try {
+        await cleanupByIds({ orderId, productId });
+      } catch (e) {
+        cleanupError = e;
+        console.error('[test cleanup failed]', { orderId, productId }, e);
+      }
+    }
+    if (!primaryError && cleanupError) {
+      throw cleanupError;
+    }
+  }, 30_000);
+});
diff --git a/frontend/lib/tests/order-items-variants.test.ts b/frontend/lib/tests/shop/order-items-variants.test.ts
similarity index 83%
rename from frontend/lib/tests/order-items-variants.test.ts
rename to frontend/lib/tests/shop/order-items-variants.test.ts
index f23d72dd..9dc09c54 100644
--- a/frontend/lib/tests/order-items-variants.test.ts
+++ b/frontend/lib/tests/shop/order-items-variants.test.ts
@@ -1,9 +1,9 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq, sql } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
-import { products, productPrices, orders, orderItems } from '@/db/schema/shop';
+import { orderItems, orders, productPrices, products } from '@/db/schema/shop';
 import { createOrderWithItems } from '@/lib/services/orders';
 
 describe('order_items variants (selected_size/selected_color)', () => {
@@ -16,7 +16,6 @@ describe('order_items variants (selected_size/selected_color)', () => {
 
     let orderId: string | null = null;
 
-    // Arrange: create product + price row (USD)
     await db.insert(products).values({
       id: productId,
       slug,
@@ -27,7 +26,6 @@ describe('order_items variants (selected_size/selected_color)', () => {
       isActive: true,
       stock: 50,
 
-      // NEW: allow selected variants used below
       ...({
         sizes: ['S', 'M'],
         colors: ['Red'],
@@ -45,7 +43,6 @@ describe('order_items variants (selected_size/selected_color)', () => {
     });
 
     try {
-      // Act: checkout with two variants for same productId
       const idem = crypto.randomUUID();
       const result = await createOrderWithItems({
         idempotencyKey: idem,
@@ -55,14 +52,14 @@ describe('order_items variants (selected_size/selected_color)', () => {
           {
             productId,
             quantity: 1,
-            // variants:
+
             selectedSize: 'S',
             selectedColor: 'Red',
           } as any,
           {
             productId,
             quantity: 1,
-            // variants:
+
             selectedSize: 'M',
             selectedColor: 'Red',
           } as any,
@@ -71,7 +68,6 @@ describe('order_items variants (selected_size/selected_color)', () => {
 
       orderId = result.order.id;
 
-      // Assert (API-level): should keep two lines
       expect(result.order.items.length).toBe(2);
       const norm = (v: unknown) =>
         String(v ?? '')
@@ -86,8 +82,6 @@ describe('order_items variants (selected_size/selected_color)', () => {
       expect(sizes.sort()).toEqual(['m', 's']);
       expect(colors.sort()).toEqual(['red', 'red']);
 
-      // DB-level
-
       const rows = await db
         .select({
           productId: orderItems.productId,
@@ -108,15 +102,12 @@ describe('order_items variants (selected_size/selected_color)', () => {
 
       expect(rowKeys).toEqual([`${productId}|m|red`, `${productId}|s|red`]);
     } finally {
-      // Cleanup: delete order first (cascade deletes order_items + inventory_moves)
       if (orderId) {
         await db.delete(orders).where(eq(orders.id, orderId));
       }
-      // Then delete product (cascade deletes product_prices)
+
       await db.delete(products).where(eq(products.id, productId));
 
-      // Safety: if something was left behind (shouldn't), try to clear by ids
-      // (No-throw best-effort)
       try {
         await db.execute(
           sql`delete from product_prices where product_id = ${productId}::uuid`
diff --git a/frontend/lib/tests/shop/orders-access.test.ts b/frontend/lib/tests/shop/orders-access.test.ts
new file mode 100644
index 00000000..209d53d9
--- /dev/null
+++ b/frontend/lib/tests/shop/orders-access.test.ts
@@ -0,0 +1,129 @@
+import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/lib/auth', () => ({
+  getCurrentUser: vi.fn(),
+}));
+
+vi.mock('@/db', () => ({
+  db: {
+    select: vi.fn(),
+  },
+}));
+
+import { db } from '@/db';
+import { getCurrentUser } from '@/lib/auth';
+
+type MockUser = { id: string; role: 'user' | 'admin' };
+
+describe('P0-SEC-1.1: GET /api/shop/orders/[id] access control', () => {
+  const orderId = '00000000-0000-0000-0000-000000000000';
+  const ownerId = '11111111-1111-1111-1111-111111111111';
+  const otherUserId = '22222222-2222-2222-2222-222222222222';
+  const adminId = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
+
+  function mockDbRows(rows: any[]) {
+    const builder = {
+      from: vi.fn().mockReturnThis(),
+      leftJoin: vi.fn().mockReturnThis(),
+      where: vi.fn().mockResolvedValue(rows),
+    };
+    (db.select as any).mockReturnValue(builder);
+    return builder;
+  }
+
+  async function callGet(id: string) {
+    const { GET } = await import('@/app/api/shop/orders/[id]/route');
+    const req = new NextRequest(`http://localhost/api/shop/orders/${id}`, {
+      method: 'GET',
+    });
+
+    const res = await (GET as any)(req, { params: Promise.resolve({ id }) });
+    return res as Response;
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('no session -> 401', async () => {
+    (getCurrentUser as any).mockResolvedValue(null);
+
+    const res = await callGet(orderId);
+    expect(res.status).toBe(401);
+    expect(db.select).not.toHaveBeenCalled();
+  });
+
+  it('not owner and not admin -> 404 (hide existence)', async () => {
+    const user: MockUser = { id: otherUserId, role: 'user' };
+    (getCurrentUser as any).mockResolvedValue(user);
+
+    mockDbRows([]);
+
+    const res = await callGet(orderId);
+    expect(res.status).toBe(404);
+  });
+
+  it('owner -> 200', async () => {
+    const user: MockUser = { id: ownerId, role: 'user' };
+    (getCurrentUser as any).mockResolvedValue(user);
+
+    const now = new Date();
+    mockDbRows([
+      {
+        order: {
+          id: orderId,
+          userId: ownerId,
+          totalAmount: '10.00',
+          currency: 'USD',
+          paymentStatus: 'pending',
+          paymentProvider: 'stripe',
+          paymentIntentId: null,
+          stockRestored: false,
+          restockedAt: null,
+          idempotencyKey: 'idem_key',
+          createdAt: now,
+          updatedAt: now,
+        },
+        item: null,
+      },
+    ]);
+
+    const res = await callGet(orderId);
+    expect(res.status).toBe(200);
+
+    const json = await res.json();
+    expect(json?.success).toBe(true);
+    expect(json?.order?.id).toBe(orderId);
+    expect(json?.order?.userId).toBe(ownerId);
+  });
+
+  it('admin -> 200', async () => {
+    const user: MockUser = { id: adminId, role: 'admin' };
+    (getCurrentUser as any).mockResolvedValue(user);
+
+    const now = new Date();
+    mockDbRows([
+      {
+        order: {
+          id: orderId,
+          userId: ownerId,
+          totalAmount: '10.00',
+          currency: 'USD',
+          paymentStatus: 'pending',
+          paymentProvider: 'stripe',
+          paymentIntentId: null,
+          stockRestored: false,
+          restockedAt: null,
+          idempotencyKey: 'idem_key',
+          createdAt: now,
+          updatedAt: now,
+        },
+        item: null,
+      },
+    ]);
+
+    const res = await callGet(orderId);
+    expect(res.status).toBe(200);
+  });
+});
diff --git a/frontend/lib/tests/origin-posture.test.ts b/frontend/lib/tests/shop/origin-posture.test.ts
similarity index 97%
rename from frontend/lib/tests/origin-posture.test.ts
rename to frontend/lib/tests/shop/origin-posture.test.ts
index f6c7a7a4..d8d8f46e 100644
--- a/frontend/lib/tests/origin-posture.test.ts
+++ b/frontend/lib/tests/shop/origin-posture.test.ts
@@ -1,9 +1,10 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { NextRequest } from 'next/server';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import {
-  normalizeOrigin,
   guardBrowserSameOrigin,
   guardNonBrowserOnly,
+  normalizeOrigin,
 } from '@/lib/security/origin';
 
 function makeReq(init: RequestInit) {
diff --git a/frontend/lib/tests/payment-state-legacy-writers.test.ts b/frontend/lib/tests/shop/payment-state-legacy-writers.test.ts
similarity index 97%
rename from frontend/lib/tests/payment-state-legacy-writers.test.ts
rename to frontend/lib/tests/shop/payment-state-legacy-writers.test.ts
index 337d9d9d..93f8b393 100644
--- a/frontend/lib/tests/payment-state-legacy-writers.test.ts
+++ b/frontend/lib/tests/shop/payment-state-legacy-writers.test.ts
@@ -2,8 +2,8 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { describe, it, expect, afterEach } from 'vitest';
 import { eq } from 'drizzle-orm';
+import { afterEach, describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
@@ -17,8 +17,6 @@ type SeedArgs = {
 async function seedOrder(args: SeedArgs): Promise<string> {
   const orderId = crypto.randomUUID();
   const now = new Date();
-
-  // NOTE: if your orders schema has extra NOT NULL columns, add them here once.
   const idempotencyKey = `test:${orderId}`;
 
   await db.insert(orders).values({
diff --git a/frontend/lib/tests/payment-state-machine.helper.test.ts b/frontend/lib/tests/shop/payment-state-machine.helper.test.ts
similarity index 91%
rename from frontend/lib/tests/payment-state-machine.helper.test.ts
rename to frontend/lib/tests/shop/payment-state-machine.helper.test.ts
index 3cec96da..5ed27222 100644
--- a/frontend/lib/tests/payment-state-machine.helper.test.ts
+++ b/frontend/lib/tests/shop/payment-state-machine.helper.test.ts
@@ -35,7 +35,6 @@ vi.mock('@/db', () => ({
 }));
 
 vi.mock('@/db/schema/shop', () => ({
-  // minimal runtime shape needed by payment-state.ts
   orders: {
     id: 'orders.id',
     paymentStatus: 'orders.payment_status',
@@ -86,21 +85,20 @@ describe('P1-6 payment state machine helper', () => {
   });
 
   it('forbidden transition does not change state and logs warn', async () => {
-    // simulate "no row updated"
     updateReturningRows = [];
-    // current state returned by getCurrentState() after failed update
+
     selectQueue = [[{ paymentStatus: 'failed', paymentProvider: 'stripe' }]];
 
     const res = await mod.guardedPaymentStatusUpdate({
       orderId: 'o2',
       paymentProvider: 'stripe',
-      to: 'paid', // failed -> paid is forbidden by matrix
+      to: 'paid',
       source: 'system',
       eventId: 'evt_2',
       note: 'test-forbidden',
       set: { updatedAt: new Date() } as any,
     });
-    
+
     expect(res.applied).toBe(false);
     if (res.applied) throw new Error('expected not applied');
     expect(res.reason).toBe('INVALID_TRANSITION');
@@ -116,13 +114,12 @@ describe('P1-6 payment state machine helper', () => {
   });
 
   it('provider=none hard-rejects invalid targets before UPDATE and logs warn', async () => {
-    // helper reads current state to log context
     selectQueue = [[{ paymentStatus: 'paid', paymentProvider: 'none' }]];
 
     const res = await mod.guardedPaymentStatusUpdate({
       orderId: 'o3',
       paymentProvider: 'none',
-      to: 'refunded', // explicitly forbidden for provider none
+      to: 'refunded',
       source: 'system',
       eventId: 'evt_3',
       note: 'test-none',
diff --git a/frontend/lib/tests/payment-status-tripwire.test.ts b/frontend/lib/tests/shop/payment-status-tripwire.test.ts
similarity index 80%
rename from frontend/lib/tests/payment-status-tripwire.test.ts
rename to frontend/lib/tests/shop/payment-status-tripwire.test.ts
index 96bc0a1d..6229572c 100644
--- a/frontend/lib/tests/payment-status-tripwire.test.ts
+++ b/frontend/lib/tests/shop/payment-status-tripwire.test.ts
@@ -1,19 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { describe, it, expect } from 'vitest';
-
-/**
- * Tripwire: fail if any code writes orders.paymentStatus via direct:
- *   - db.update(orders).set({ paymentStatus: ... })
- *   - db.insert(orders).values({ paymentStatus: ... })
- * outside an explicit allowlist.
- *
- * Scope: repo TS/TSX files (excluding node_modules/.next/dist/etc).
- * NOTE: This is NOT an AST parser. It is a scoped scan:
- *   - Finds `.set({ ... })` / `.values({ ... })`
- *   - Extracts ONLY the balanced object literal argument `{ ... }`
- *   - Detects `paymentStatus` only as a TOP-LEVEL key inside that object literal
- */
+
+import { describe, expect, it } from 'vitest';
 
 const REPO_ROOT = process.cwd();
 
@@ -33,19 +21,12 @@ function norm(p: string): string {
   return p.replaceAll('\\', '/');
 }
 
-// Keep this allowlist very small on purpose.
-// Rules are per-file and per-operation (insert(values) vs update(set)).
 type AllowedWriters = { set: boolean; values: boolean };
 
 const WRITER_RULES = new Map<string, AllowedWriters>([
-  // Guarded writer (allowed): internal state machine transitions
   [norm('lib/services/orders/payment-state.ts'), { set: true, values: true }],
 
-  // Allowed ONLY for initial order creation (insert). Updates must stay guarded.
   [norm('lib/services/orders/checkout.ts'), { set: false, values: true }],
-
-  // If you ever intentionally allow route-level inserts, add explicitly:
-  // [norm('app/api/shop/checkout/route.ts'), { set: false, values: true }],
 ]);
 
 function getAllowed(rel: string): AllowedWriters {
@@ -72,10 +53,6 @@ function walk(dirAbs: string, relBase: string, out: string[]) {
 
 type ExtractedObject = { text: string; endIndex: number };
 
-/**
- * Extracts a balanced object literal starting at `braceStart` (which MUST point to '{').
- * Handles strings and comments to avoid premature brace matching.
- */
 function extractBalancedObjectLiteral(
   src: string,
   braceStart: number
@@ -89,14 +66,12 @@ function extractBalancedObjectLiteral(
 
   let depth = 0;
 
-  // For `${ ... }` inside template strings
   const templateExprDepth: number[] = [];
 
   for (let i = braceStart; i < src.length; i++) {
     const ch = src[i];
     const next = i + 1 < src.length ? src[i + 1] : '';
 
-    // --- comment/string handling ---
     if (mode() === 'line') {
       if (ch === '\n') stack.pop();
       continue;
@@ -133,18 +108,17 @@ function extractBalancedObjectLiteral(
         stack.pop();
         continue;
       }
-      // Enter template expr `${`
+
       if (ch === '$' && next === '{') {
         depth++;
         templateExprDepth.push(1);
         stack.push('code');
-        i++; // skip '{'
+        i++;
         continue;
       }
       continue;
     }
 
-    // --- code mode ---
     if (ch === '/' && next === '/') {
       stack.push('line');
       i++;
@@ -168,7 +142,6 @@ function extractBalancedObjectLiteral(
       continue;
     }
 
-    // --- braces ---
     if (ch === '{') {
       depth++;
       if (templateExprDepth.length > 0) {
@@ -182,9 +155,8 @@ function extractBalancedObjectLiteral(
         templateExprDepth[templateExprDepth.length - 1]--;
         if (templateExprDepth[templateExprDepth.length - 1] === 0) {
           templateExprDepth.pop();
-          // return to template mode (we entered code because of `${ ... }`)
           if (stack.length >= 2 && stack[stack.length - 2] === 'template') {
-            stack.pop(); // pop 'code'
+            stack.pop();
           }
         }
       }
@@ -198,10 +170,6 @@ function extractBalancedObjectLiteral(
   return null;
 }
 
-/**
- * Returns true if the extracted `{ ... }` contains a TOP-LEVEL key `paymentStatus`
- * (identifier, quoted, shorthand, or computed string literal).
- */
 function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
   if (
     objectLiteralWithBraces.length < 2 ||
@@ -217,7 +185,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
   const stack: Mode[] = ['code'];
   const mode = () => stack[stack.length - 1];
 
-  // nesting inside the object literal body (nested { [ ( )
   let nest = 0;
 
   const isIdentStart = (c: string) => /[A-Za-z_$]/.test(c);
@@ -250,7 +217,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
     const ch = body[i];
     const next = i + 1 < body.length ? body[i + 1] : '';
 
-    // --- comment/string handling ---
     if (mode() === 'line') {
       if (ch === '\n') stack.pop();
       continue;
@@ -290,7 +256,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
       continue;
     }
 
-    // --- code mode ---
     if (ch === '/' && next === '/') {
       stack.push('line');
       i++;
@@ -314,7 +279,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
       continue;
     }
 
-    // nesting
     if (ch === '{' || ch === '[' || ch === '(') {
       nest++;
       continue;
@@ -324,12 +288,10 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
       continue;
     }
 
-    // only top-level keys
     if (nest !== 0) continue;
 
     if (ch === ',' || /\s/.test(ch)) continue;
 
-    // identifier key: paymentStatus: ... OR shorthand: paymentStatus,
     if (isIdentStart(ch)) {
       let j = i + 1;
       while (j < body.length && isIdentPart(body[j])) j++;
@@ -345,7 +307,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
       continue;
     }
 
-    // quoted key: 'paymentStatus': or "paymentStatus":
     if (ch === "'" || ch === '"') {
       const q = readQuoted(body, i);
       if (q) {
@@ -359,7 +320,6 @@ function hasTopLevelPaymentStatusKey(objectLiteralWithBraces: string): boolean {
       continue;
     }
 
-    // computed key: ['paymentStatus']:
     if (ch === '[') {
       let j = skipWs(body, i + 1);
       const qch = body[j];
@@ -402,26 +362,20 @@ function hasDirectOrdersWriter(
     return /\binsert\s*\(\s*orders\s*\)/m.test(chunk);
   };
 
-  // Scan `.set({ ... })` / `.values({ ... })` call sites, then inspect ONLY their object literal argument.
   const CALL_RE = /\.(set|values)\s*\(\s*{/g;
 
   let m: RegExpExecArray | null;
   while ((m = CALL_RE.exec(source)) !== null) {
     const callKind = m[1] as 'set' | 'values';
 
-    // Only enforce for orders table chains:
-    // - db.update(orders).set({ ... })
-    // - db.insert(orders).values({ ... })
     if (callKind === 'set' && !isOrdersUpdateContext(source, m.index)) continue;
     if (callKind === 'values' && !isOrdersInsertContext(source, m.index))
       continue;
 
-    // `m[0]` ends with `{` due to the regex
     const braceStart = m.index + (m[0].length - 1);
     const extracted = extractBalancedObjectLiteral(source, braceStart);
     if (!extracted) continue;
 
-    // If this operation is explicitly allowed for this file, ignore it
     if (callKind === 'set' && allowed.set) {
       CALL_RE.lastIndex = Math.max(CALL_RE.lastIndex, extracted.endIndex);
       continue;
@@ -433,7 +387,6 @@ function hasDirectOrdersWriter(
 
     if (hasTopLevelPaymentStatusKey(extracted.text)) return true;
 
-    // jump forward to end of this object to avoid rescanning inside it
     CALL_RE.lastIndex = Math.max(CALL_RE.lastIndex, extracted.endIndex);
   }
 
@@ -448,7 +401,6 @@ describe('Task 6: Tripwire — no direct orders.paymentStatus writers outside al
     const offenders: string[] = [];
 
     for (const rel of files) {
-      // Skip tests entirely (they contain regex/fixtures that look like writers)
       if (rel.startsWith('lib/tests/')) continue;
       if (rel.endsWith('.test.ts') || rel.endsWith('.test.tsx')) continue;
       if (rel.endsWith('.spec.ts') || rel.endsWith('.spec.tsx')) continue;
diff --git a/frontend/lib/tests/shop/prices.test.ts b/frontend/lib/tests/shop/prices.test.ts
new file mode 100644
index 00000000..8160e084
--- /dev/null
+++ b/frontend/lib/tests/shop/prices.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from 'vitest';
+
+import { adminPriceRowSchema } from '../../validation/shop';
+
+describe('pricing validation', () => {
+  it('rejects originalPriceMinor == priceMinor (SALE must be strict)', () => {
+    const r = adminPriceRowSchema.safeParse({
+      currency: 'USD',
+      priceMinor: 1000,
+      originalPriceMinor: 1000,
+    });
+
+    expect(r.success).toBe(false);
+  });
+
+  it('accepts originalPriceMinor > priceMinor', () => {
+    const r = adminPriceRowSchema.safeParse({
+      currency: 'USD',
+      priceMinor: 1000,
+      originalPriceMinor: 1200,
+    });
+
+    expect(r.success).toBe(true);
+  });
+});
diff --git a/frontend/lib/tests/product-admin-merged-prices-policy.test.ts b/frontend/lib/tests/shop/product-admin-merged-prices-policy.test.ts
similarity index 99%
rename from frontend/lib/tests/product-admin-merged-prices-policy.test.ts
rename to frontend/lib/tests/shop/product-admin-merged-prices-policy.test.ts
index 3706ee43..9d788d7a 100644
--- a/frontend/lib/tests/product-admin-merged-prices-policy.test.ts
+++ b/frontend/lib/tests/shop/product-admin-merged-prices-policy.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
-import { assertMergedPricesPolicy } from '@/lib/services/products/prices';
+
 import { PriceConfigError } from '@/lib/services/errors';
+import { assertMergedPricesPolicy } from '@/lib/services/products/prices';
 
 describe('assertMergedPricesPolicy (merged-state)', () => {
   it('throws PRICE_CONFIG_ERROR when USD is missing after merge', () => {
diff --git a/frontend/lib/tests/product-admin-update-prices-patch-semantics.test.ts b/frontend/lib/tests/shop/product-admin-update-prices-patch-semantics.test.ts
similarity index 90%
rename from frontend/lib/tests/product-admin-update-prices-patch-semantics.test.ts
rename to frontend/lib/tests/shop/product-admin-update-prices-patch-semantics.test.ts
index 3f5fa223..951ddd3d 100644
--- a/frontend/lib/tests/product-admin-update-prices-patch-semantics.test.ts
+++ b/frontend/lib/tests/shop/product-admin-update-prices-patch-semantics.test.ts
@@ -1,12 +1,11 @@
 import { describe, expect, it } from 'vitest';
+
 import { productAdminUpdateSchema } from '@/lib/validation/shop';
 
 describe('productAdminUpdateSchema: prices PATCH semantics', () => {
   it('allows partial prices update without USD', () => {
     const res = productAdminUpdateSchema.safeParse({
-      prices: [
-        { currency: 'UAH', priceMinor: 1000, originalPriceMinor: 2000 },
-      ],
+      prices: [{ currency: 'UAH', priceMinor: 1000, originalPriceMinor: 2000 }],
     });
 
     expect(res.success).toBe(true);
diff --git a/frontend/lib/tests/product-sale-invariant.test.ts b/frontend/lib/tests/shop/product-sale-invariant.test.ts
similarity index 83%
rename from frontend/lib/tests/product-sale-invariant.test.ts
rename to frontend/lib/tests/shop/product-sale-invariant.test.ts
index 5bb9c894..a2586c4f 100644
--- a/frontend/lib/tests/product-sale-invariant.test.ts
+++ b/frontend/lib/tests/shop/product-sale-invariant.test.ts
@@ -1,5 +1,5 @@
-import { describe, it, expect, vi, afterEach } from 'vitest';
 import { eq } from 'drizzle-orm';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('@/lib/cloudinary', () => {
   return {
@@ -12,9 +12,9 @@ vi.mock('@/lib/cloudinary', () => {
 });
 
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
+import { productPrices, products } from '@/db/schema';
 import { createProduct, updateProduct } from '@/lib/services/products';
+import { toDbMoney } from '@/lib/shop/money';
 
 function uniqueSlug(prefix = 'sale-invariant') {
   return `${prefix}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
@@ -24,7 +24,6 @@ describe('SALE invariant: originalPriceMinor is required', () => {
   const createdProductIds: string[] = [];
 
   afterEach(async () => {
-    // cleanup (cascade deletes product_prices)
     for (const id of createdProductIds.splice(0)) {
       await db.delete(products).where(eq(products.id, id));
     }
@@ -52,7 +51,6 @@ describe('SALE invariant: originalPriceMinor is required', () => {
   it('updateProduct: existing SALE + PATCH that removes originalPriceMinor must reject (final state invariant)', async () => {
     const slug = uniqueSlug();
 
-    // Seed DB: product is SALE and has valid originalPriceMinor in DB
     const [p] = await db
       .insert(products)
       .values({
@@ -61,8 +59,8 @@ describe('SALE invariant: originalPriceMinor is required', () => {
         description: null,
         imageUrl: 'https://example.com/seed.png',
         imagePublicId: null,
-        price: toDbMoney(1000), // 10.00
-        originalPrice: toDbMoney(2000), // 20.00
+        price: toDbMoney(1000),
+        originalPrice: toDbMoney(2000),
         currency: 'USD',
         category: null,
         type: null,
@@ -87,7 +85,6 @@ describe('SALE invariant: originalPriceMinor is required', () => {
       originalPrice: toDbMoney(2000),
     });
 
-    // Attempt to "remove" originalPrice via PATCH (prices upsert with null originalPriceMinor)
     await expect(
       updateProduct(p.id, {
         prices: [
@@ -97,11 +94,9 @@ describe('SALE invariant: originalPriceMinor is required', () => {
             originalPriceMinor: null,
           },
         ],
-        // badge omitted intentionally: finalBadge derives from existing.badge (SALE)
       } as any)
     ).rejects.toThrow(/SALE badge requires originalPrice/i);
 
-    // Ensure DB was not modified by the failed update
     const [pp] = await db
       .select({
         priceMinor: productPrices.priceMinor,
diff --git a/frontend/lib/tests/public-product-visibility.test.ts b/frontend/lib/tests/shop/public-product-visibility.test.ts
similarity index 90%
rename from frontend/lib/tests/public-product-visibility.test.ts
rename to frontend/lib/tests/shop/public-product-visibility.test.ts
index a05b25c7..6399b2d6 100644
--- a/frontend/lib/tests/public-product-visibility.test.ts
+++ b/frontend/lib/tests/shop/public-product-visibility.test.ts
@@ -1,10 +1,11 @@
-import { describe, it, expect } from 'vitest';
-import { eq } from 'drizzle-orm';
 import { randomUUID } from 'node:crypto';
 
+import { eq } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
+
 import { db } from '@/db';
-import { products, productPrices } from '@/db/schema';
 import { getPublicProductBySlug } from '@/db/queries/shop/products';
+import { productPrices, products } from '@/db/schema';
 
 function logTestCleanupFailed(meta: Record<string, unknown>, error: unknown) {
   console.error('[test cleanup failed]', {
@@ -53,7 +54,6 @@ describe('P0-5 Public products: inactive not visible', () => {
         stock: 5,
         sku: null,
 
-        // legacy mirror required by schema + checks
         price: '10.00',
         originalPrice: null,
         currency: 'USD',
@@ -64,7 +64,6 @@ describe('P0-5 Public products: inactive not visible', () => {
         productId,
         currency: 'USD',
 
-        // canonical + mirror must match checks
         priceMinor: 1000,
         originalPriceMinor: null,
         price: '10.00',
@@ -100,7 +99,6 @@ describe('P0-5 Public products: inactive not visible', () => {
         stock: 5,
         sku: null,
 
-        // legacy mirror required by schema + checks
         price: '19.99',
         originalPrice: null,
         currency: 'USD',
@@ -111,7 +109,6 @@ describe('P0-5 Public products: inactive not visible', () => {
         productId,
         currency: 'USD',
 
-        // canonical + mirror must match checks
         priceMinor: 1999,
         originalPriceMinor: null,
         price: '19.99',
diff --git a/frontend/lib/tests/rate-limit-subject-normalization.test.ts b/frontend/lib/tests/shop/rate-limit-subject-normalization.test.ts
similarity index 100%
rename from frontend/lib/tests/rate-limit-subject-normalization.test.ts
rename to frontend/lib/tests/shop/rate-limit-subject-normalization.test.ts
diff --git a/frontend/lib/tests/rate-limit-subject.test.ts b/frontend/lib/tests/shop/rate-limit-subject.test.ts
similarity index 96%
rename from frontend/lib/tests/rate-limit-subject.test.ts
rename to frontend/lib/tests/shop/rate-limit-subject.test.ts
index 749a8a4b..258a3ef5 100644
--- a/frontend/lib/tests/rate-limit-subject.test.ts
+++ b/frontend/lib/tests/shop/rate-limit-subject.test.ts
@@ -1,7 +1,8 @@
-import { describe, expect, it, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 vi.mock('@/db', () => ({ db: { execute: vi.fn() } }));
 
 import { NextRequest } from 'next/server';
+
 import {
   getClientIpFromHeaders,
   getRateLimitSubject,
@@ -67,7 +68,6 @@ describe('rate limit subject', () => {
       'x-real-ip': '198.51.100.4',
     });
 
-    // cf invalid; trust disabled => must NOT accept x-real-ip
     expect(getClientIpFromHeaders(headers)).toBeNull();
   });
 
diff --git a/frontend/lib/tests/restock-order-only-once.test.ts b/frontend/lib/tests/shop/restock-order-only-once.test.ts
similarity index 99%
rename from frontend/lib/tests/restock-order-only-once.test.ts
rename to frontend/lib/tests/shop/restock-order-only-once.test.ts
index a69993e4..0e0a37cc 100644
--- a/frontend/lib/tests/restock-order-only-once.test.ts
+++ b/frontend/lib/tests/shop/restock-order-only-once.test.ts
@@ -1,12 +1,12 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq, sql } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders, products } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
 import { applyReserveMove } from '@/lib/services/inventory';
 import { restockOrder } from '@/lib/services/orders';
+import { toDbMoney } from '@/lib/shop/money';
 
 function readRows(res: any): any[] {
   if (Array.isArray(res)) return res;
diff --git a/frontend/lib/tests/restock-release-failure-invariant.test.ts b/frontend/lib/tests/shop/restock-release-failure-invariant.test.ts
similarity index 75%
rename from frontend/lib/tests/restock-release-failure-invariant.test.ts
rename to frontend/lib/tests/shop/restock-release-failure-invariant.test.ts
index 3dd1b23e..fa786a85 100644
--- a/frontend/lib/tests/restock-release-failure-invariant.test.ts
+++ b/frontend/lib/tests/shop/restock-release-failure-invariant.test.ts
@@ -1,18 +1,19 @@
 import crypto from 'node:crypto';
+
 import { eq } from 'drizzle-orm';
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 
 import { db } from '@/db';
 import {
-  orders,
+  inventoryMoves,
   orderItems,
-  products,
+  orders,
   productPrices,
-  inventoryMoves,
+  products,
 } from '@/db/schema/shop';
-import { toDbMoney } from '@/lib/shop/money';
-import { restockOrder } from '@/lib/services/orders/restock';
 import * as inventory from '@/lib/services/inventory';
+import { restockOrder } from '@/lib/services/orders/restock';
+import { toDbMoney } from '@/lib/shop/money';
 
 describe('P0 Inventory release invariants', () => {
   it('must NOT mark released/stockRestored/restockedAt when applyReleaseMove fails (leave safe for janitor)', async () => {
@@ -24,29 +25,24 @@ describe('P0 Inventory release invariants', () => {
     const slug = `t-${productId.slice(0, 8)}`;
     const sku = `SKU-${productId.slice(0, 8)}`;
 
-    // Keep references for cleanup
     const now = new Date();
 
-    // Spy/mocking: force release to fail
-    // NOTE: if applyReleaseMove throws in your impl, mockRejectedValueOnce is also OK.
     const releaseSpy = vi
       .spyOn(inventory, 'applyReleaseMove')
       .mockRejectedValue(new Error('SIMULATED_RELEASE_FAIL'));
 
     try {
-      // 1) Seed product + price
       await db.insert(products).values({
         id: productId,
         slug,
         title: 'Test product',
         description: 'Test description',
         imageUrl: 'https://example.com/test.png',
-        imagePublicId: 'test-public-id', // додай одразу, щоб не впертись у NOT NULL, якщо він є
+        imagePublicId: 'test-public-id',
         sku,
 
-        // IMPORTANT: products.price is NOT NULL (legacy)
         currency: 'USD',
-        price: toDbMoney(1000), // 10.00
+        price: toDbMoney(1000),
         originalPrice: null,
 
         stock: 1,
@@ -59,14 +55,13 @@ describe('P0 Inventory release invariants', () => {
       await db.insert(productPrices).values({
         productId,
         currency: 'USD',
-        // canonical minor (int)
+
         priceMinor: 1000,
-        // legacy fallback (numeric)
+
         price: 10,
         originalPrice: null,
       } as any);
 
-      // 2) Seed order + order item (minimal required fields)
       await db.insert(orders).values({
         id: orderId,
         totalAmountMinor: 1000,
@@ -75,10 +70,10 @@ describe('P0 Inventory release invariants', () => {
 
         paymentProvider: 'stripe',
         paymentIntentId: null,
-        paymentStatus: 'failed', // we are testing restock on "failed" path
+        paymentStatus: 'failed',
 
         status: 'INVENTORY_FAILED',
-        inventoryStatus: 'reserving', // will reserve first, then switch to release_pending
+        inventoryStatus: 'reserving',
         failureCode: 'INTERNAL_ERROR',
         failureMessage: 'fail before release',
 
@@ -111,8 +106,6 @@ describe('P0 Inventory release invariants', () => {
         productSku: sku,
       } as any);
 
-      // 3) Create an ACTUAL reservation move (so “release” is реально потрібен)
-      //    This should decrement product stock from 1 -> 0.
       const reserveRes = await inventory.applyReserveMove(
         orderId,
         productId,
@@ -128,7 +121,6 @@ describe('P0 Inventory release invariants', () => {
 
       expect(pAfterReserve?.stock).toBe(0);
 
-      // 4) Put order into release_pending so restockOrder will attempt release
       await db
         .update(orders)
         .set({
@@ -138,17 +130,30 @@ describe('P0 Inventory release invariants', () => {
         } as any)
         .where(eq(orders.id, orderId));
 
-      // 5) Call restockOrder — release fails; function may throw OR no-op, but must NOT finalize release fields
+      let restockErr: unknown;
+
       try {
         await restockOrder(orderId, {
           reason: 'failed',
           workerId: 'test',
         } as any);
-      } catch {
-        // acceptable: some implementations throw for manual/admin path
+      } catch (err) {
+        restockErr = err;
+      }
+
+      if (restockErr) {
+        // Accept ONLY the simulated release failure; rethrow anything else.
+        if (
+          restockErr instanceof Error &&
+          restockErr.message.includes('SIMULATED_RELEASE_FAIL')
+        ) {
+          expect(restockErr).toBeInstanceOf(Error);
+          expect(restockErr.message).toContain('SIMULATED_RELEASE_FAIL');
+        } else {
+          throw restockErr;
+        }
       }
 
-      // 6) Assert invariants: order NOT finalized to released/stockRestored/restockedAt
       const [o] = await db
         .select({
           inventoryStatus: orders.inventoryStatus,
@@ -161,12 +166,10 @@ describe('P0 Inventory release invariants', () => {
 
       expect(o).toBeTruthy();
 
-      // Key invariants:
       expect(o!.inventoryStatus).not.toBe('released');
       expect(o!.stockRestored).toBe(false);
       expect(o!.restockedAt).toBeNull();
 
-      // 7) Assert product stock DID NOT increment (release not confirmed)
       const [pAfterFail] = await db
         .select({ stock: products.stock })
         .from(products)
@@ -177,9 +180,7 @@ describe('P0 Inventory release invariants', () => {
     } finally {
       releaseSpy.mockRestore();
 
-      // cleanup (best-effort)
       try {
-        // delete ledger rows for this order if table exists in your schema
         if (inventoryMoves) {
           await db
             .delete(inventoryMoves as any)
diff --git a/frontend/lib/tests/restock-stale-claim-gate.test.ts b/frontend/lib/tests/shop/restock-stale-claim-gate.test.ts
similarity index 88%
rename from frontend/lib/tests/restock-stale-claim-gate.test.ts
rename to frontend/lib/tests/shop/restock-stale-claim-gate.test.ts
index 5efa9ece..01cc81d7 100644
--- a/frontend/lib/tests/restock-stale-claim-gate.test.ts
+++ b/frontend/lib/tests/shop/restock-stale-claim-gate.test.ts
@@ -1,11 +1,11 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
 import { restockStalePendingOrders } from '@/lib/services/orders';
+import { toDbMoney } from '@/lib/shop/money';
 
 describe('restockStalePendingOrders claim gate', () => {
   it('must skip orders with an active (not expired) claim', async () => {
@@ -14,7 +14,7 @@ describe('restockStalePendingOrders claim gate', () => {
     const createdAt = new Date(Date.now() - 2 * 60 * 60 * 1000);
 
     const claimNow = new Date();
-    const activeExpires = new Date(Date.now() + 5 * 60 * 1000); // not expired
+    const activeExpires = new Date(Date.now() + 5 * 60 * 1000);
 
     try {
       await db.insert(orders).values({
@@ -40,7 +40,6 @@ describe('restockStalePendingOrders claim gate', () => {
         restockedAt: null,
         idempotencyKey: idem,
 
-        // claim fields:
         sweepClaimedAt: claimNow,
         sweepClaimExpiresAt: activeExpires,
         sweepRunId: crypto.randomUUID(),
@@ -93,7 +92,7 @@ describe('restockStalePendingOrders claim gate', () => {
     const createdAt = new Date(Date.now() - 2 * 60 * 60 * 1000);
 
     const claimNow = new Date(Date.now() - 10 * 60 * 1000);
-    const expiredAt = new Date(Date.now() - 5 * 60 * 1000); // expired
+    const expiredAt = new Date(Date.now() - 5 * 60 * 1000);
 
     try {
       await db.insert(orders).values({
@@ -119,7 +118,6 @@ describe('restockStalePendingOrders claim gate', () => {
         restockedAt: null,
         idempotencyKey: idem,
 
-        // expired claim fields:
         sweepClaimedAt: claimNow,
         sweepClaimExpiresAt: expiredAt,
         sweepRunId: crypto.randomUUID(),
@@ -138,6 +136,19 @@ describe('restockStalePendingOrders claim gate', () => {
       });
 
       expect(processed).toBe(1);
+
+      const [row] = await db
+        .select({
+          stockRestored: orders.stockRestored,
+          restockedAt: orders.restockedAt,
+        })
+        .from(orders)
+        .where(eq(orders.id, orderId))
+        .limit(1);
+
+      expect(row).toBeTruthy();
+      expect(row!.stockRestored).toBe(true);
+      expect(row!.restockedAt).not.toBeNull();
     } finally {
       try {
         await db.delete(orders).where(eq(orders.id, orderId));
diff --git a/frontend/lib/tests/restock-stale-stripe-orphan.test.ts b/frontend/lib/tests/shop/restock-stale-stripe-orphan.test.ts
similarity index 94%
rename from frontend/lib/tests/restock-stale-stripe-orphan.test.ts
rename to frontend/lib/tests/shop/restock-stale-stripe-orphan.test.ts
index ea06b49a..d12bca02 100644
--- a/frontend/lib/tests/restock-stale-stripe-orphan.test.ts
+++ b/frontend/lib/tests/shop/restock-stale-stripe-orphan.test.ts
@@ -1,18 +1,17 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
 import { restockStalePendingOrders } from '@/lib/services/orders';
+import { toDbMoney } from '@/lib/shop/money';
 
 describe('P0-3.x Restock stale pending orders: stripe orphan cleanup', () => {
   it('marks stale stripe orphan (no inventory_moves) as terminal failed and releases to avoid infinite sweep re-pick', async () => {
     const orderId = crypto.randomUUID();
     const idem = `test-stale-orphan-stripe-${crypto.randomUUID()}`;
 
-    // Make it old enough to be considered stale.
     const createdAt = new Date(Date.now() - 2 * 60 * 60 * 1000); // 2h ago
     const totalAmountMinor = 1234;
 
@@ -44,11 +43,10 @@ describe('P0-3.x Restock stale pending orders: stripe orphan cleanup', () => {
         updatedAt: createdAt,
       });
 
-      // Run sweep
       const processed = await restockStalePendingOrders({
         olderThanMinutes: 60,
         batchSize: 50,
-        orderIds: [orderId], // <-- add
+        orderIds: [orderId],
       });
 
       expect(processed).toBeGreaterThan(0);
@@ -78,7 +76,6 @@ describe('P0-3.x Restock stale pending orders: stripe orphan cleanup', () => {
       expect(row!.stockRestored).toBe(true);
       expect(row!.restockedAt).not.toBeNull();
     } finally {
-      // cleanup
       try {
         await db.delete(orders).where(eq(orders.id, orderId));
       } catch (error) {
diff --git a/frontend/lib/tests/restock-stuck-reserving-sweep.test.ts b/frontend/lib/tests/shop/restock-stuck-reserving-sweep.test.ts
similarity index 92%
rename from frontend/lib/tests/restock-stuck-reserving-sweep.test.ts
rename to frontend/lib/tests/shop/restock-stuck-reserving-sweep.test.ts
index 4a4454de..1d3ff5b3 100644
--- a/frontend/lib/tests/restock-stuck-reserving-sweep.test.ts
+++ b/frontend/lib/tests/shop/restock-stuck-reserving-sweep.test.ts
@@ -1,12 +1,14 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq, sql } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders, products } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
 import { applyReserveMove } from '@/lib/services/inventory';
 import { restockStuckReservingOrders } from '@/lib/services/orders';
+import { toDbMoney } from '@/lib/shop/money';
+
+const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
 
 function readRows(res: any): any[] {
   if (Array.isArray(res)) return res;
@@ -25,7 +27,6 @@ async function countMoveKey(moveKey: string): Promise<number> {
 async function cleanupTestRows(params: { orderId: string; productId: string }) {
   const { orderId, productId } = params;
 
-  // IMPORTANT: delete children first to avoid FK failures and silent leftovers.
   await db.execute(
     sql`delete from inventory_moves where order_id = ${orderId}::uuid`
   );
@@ -46,12 +47,12 @@ describe('P0-7 stuckReserving sweep: restock exactly-once', () => {
 
     const initialStock = 5;
     const qty = 2;
-    const createdAt = new Date(Date.now() - 2 * 60 * 60 * 1000); // old enough
+    const createdAt = new Date(Date.now() - TWO_HOURS_MS);
     const idem = `test-stuck-${crypto.randomUUID()}`;
     let originalError: unknown = null;
 
     try {
-      await db.insert(products).values({
+      const productInsert = {
         id: productId,
         title: 'Test Product',
         slug,
@@ -64,9 +65,11 @@ describe('P0-7 stuckReserving sweep: restock exactly-once', () => {
         currency: 'USD',
         createdAt,
         updatedAt: createdAt,
-      } as any);
+      } satisfies typeof products.$inferInsert;
 
-      await db.insert(orders).values({
+      await db.insert(products).values(productInsert);
+
+      const orderInsert = {
         id: orderId,
         userId: null,
 
@@ -91,7 +94,9 @@ describe('P0-7 stuckReserving sweep: restock exactly-once', () => {
 
         createdAt,
         updatedAt: createdAt,
-      } as any);
+      } satisfies typeof orders.$inferInsert;
+
+      await db.insert(orders).values(orderInsert);
 
       const r = await applyReserveMove(orderId, productId, qty);
       expect(r.ok).toBe(true);
@@ -172,14 +177,12 @@ describe('P0-7 stuckReserving sweep: restock exactly-once', () => {
         await cleanupTestRows({ orderId, productId });
       } catch (cleanupError) {
         if (originalError) {
-          // cleanup failed, but do NOT hide the real test failure
           console.error('[test cleanup failed]', {
             orderId,
             productId,
             error: cleanupError,
           });
         } else {
-          // no original failure -> cleanup error is the failure
           originalError = cleanupError;
         }
       }
diff --git a/frontend/lib/tests/restock-sweep-claim.test.ts b/frontend/lib/tests/shop/restock-sweep-claim.test.ts
similarity index 97%
rename from frontend/lib/tests/restock-sweep-claim.test.ts
rename to frontend/lib/tests/shop/restock-sweep-claim.test.ts
index 8f53bd56..b670c47b 100644
--- a/frontend/lib/tests/restock-sweep-claim.test.ts
+++ b/frontend/lib/tests/shop/restock-sweep-claim.test.ts
@@ -1,11 +1,11 @@
-import { describe, it, expect } from 'vitest';
 import crypto from 'crypto';
 import { eq } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
 import { orders } from '@/db/schema';
-import { toDbMoney } from '@/lib/shop/money';
 import { restockStalePendingOrders } from '@/lib/services/orders';
+import { toDbMoney } from '@/lib/shop/money';
 
 describe('restockStalePendingOrders claim', () => {
   it('two concurrent sweeps must not both process the same order', async () => {
diff --git a/frontend/lib/tests/stripe-webhook-contract.test.ts b/frontend/lib/tests/shop/stripe-webhook-contract.test.ts
similarity index 83%
rename from frontend/lib/tests/stripe-webhook-contract.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-contract.test.ts
index 4071b0c5..04399ff4 100644
--- a/frontend/lib/tests/stripe-webhook-contract.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-contract.test.ts
@@ -1,9 +1,6 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { NextRequest } from 'next/server';
-/**
- * Silence expected stderr noise for this contract test file only.
- * We keep assertions intact; we only suppress logging side effects.
- */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 vi.mock('@/lib/logging', async () => {
   const actual = await vi.importActual<any>('@/lib/logging');
   return {
@@ -33,7 +30,6 @@ describe('P0-3.3 Stripe webhook contract: disabled vs invalid signature', () =>
     vi.clearAllMocks();
     process.env = { ...ORIG_ENV };
 
-    // stderr (console.error) spam is expected in these negative scenarios
     consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
   });
 
@@ -48,7 +44,7 @@ describe('P0-3.3 Stripe webhook contract: disabled vs invalid signature', () =>
 
     process.env.PAYMENTS_ENABLED = 'true';
     process.env.STRIPE_SECRET_KEY = 'sk_test_dummy';
-    process.env.STRIPE_WEBHOOK_SECRET = ''; // ключове: після імпорту і саме порожній рядок
+    process.env.STRIPE_WEBHOOK_SECRET = '';
 
     const res = await POST(
       makeReq('{"id":"evt_test"}', { 'stripe-signature': 't=0,v1=deadbeef' })
diff --git a/frontend/lib/tests/stripe-webhook-mismatch.test.ts b/frontend/lib/tests/shop/stripe-webhook-mismatch.test.ts
similarity index 83%
rename from frontend/lib/tests/stripe-webhook-mismatch.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-mismatch.test.ts
index 167184dc..77b50e8c 100644
--- a/frontend/lib/tests/stripe-webhook-mismatch.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-mismatch.test.ts
@@ -1,6 +1,7 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { NextRequest } from 'next/server';
 import { sql } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
 import { db } from '@/db';
 
 const ORIG_ENV = process.env;
@@ -55,9 +56,6 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
   });
 
   it('mismatch: does NOT set paid and stores pspStatusReason + pspMetadata(expected/actual + event id)', async () => {
-    /**
-     * 1) Create an order with payments disabled (so no Stripe network calls).
-     */
     process.env.PAYMENTS_ENABLED = 'false';
 
     vi.doMock('@/lib/auth', async () => {
@@ -69,14 +67,12 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
       };
     });
 
-    // IMPORTANT: mock stripe module BEFORE importing ANY route modules
-    // so webhook route doesn't cache the real module.
     vi.doMock('@/lib/psp/stripe', async () => {
       const actual = await vi.importActual<any>('@/lib/psp/stripe');
       return {
         __esModule: true,
         ...actual,
-        // IMPORTANT: route.ts calls this SYNC (no await). So mock MUST be sync.
+
         verifyWebhookSignature: vi.fn((params: any) => {
           const rawBody = params?.rawBody;
           if (typeof rawBody !== 'string' || !rawBody.trim()) {
@@ -86,9 +82,8 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
         }),
       };
     });
-    const { POST: checkoutPOST } = await import(
-      '@/app/api/shop/checkout/route'
-    );
+    const { POST: checkoutPOST } =
+      await import('@/app/api/shop/checkout/route');
 
     const productId = await pickActiveProductIdForCurrency('UAH');
     const idemKey =
@@ -119,9 +114,6 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
       /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
     );
 
-    /**
-     * 2) Read expected total_amount_minor + currency from DB.
-     */
     const row0 = (await db.execute(sql`
       select total_amount_minor, currency
       from orders
@@ -136,9 +128,6 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
     expect(expectedMinor).toBeGreaterThan(0);
     expect(expectedCurrency).toBe('UAH');
 
-    /**
-     * 3) Turn this order into a "Stripe" order in DB (no real Stripe PI needed).
-     */
     const piId = `pi_test_mismatch_${orderId.slice(0, 8)}`;
     await db.execute(sql`
       update orders
@@ -148,10 +137,6 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
       where id = ${orderId}
     `);
 
-    /**
-     * 4) Prepare mocked Stripe event with mismatched amount (expectedMinor + 1).
-     *    We mock verifyWebhookSignature so we don't need real Stripe signature.
-     */
     process.env.PAYMENTS_ENABLED = 'true';
     process.env.STRIPE_SECRET_KEY = 'stripe_secret_key_placeholder';
     process.env.STRIPE_WEBHOOK_SECRET = 'stripe_webhook_secret_placeholder';
@@ -175,9 +160,8 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
       },
     };
 
-    const { POST: webhookPOST } = await import(
-      '@/app/api/shop/webhooks/stripe/route'
-    );
+    const { POST: webhookPOST } =
+      await import('@/app/api/shop/webhooks/stripe/route');
 
     const webhookRes = await webhookPOST(
       makeReq(
@@ -189,12 +173,8 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
       )
     );
 
-    // webhook handler should accept the event and record mismatch (usually 200)
     expect([200, 202]).toContain(webhookRes.status);
 
-    /**
-     * 5) Assert DB: not paid + pspStatusReason set + pspMetadata contains expected/actual + event id.
-     */
     const row1 = (await db.execute(sql`
       select payment_status, psp_status_reason, psp_metadata
       from orders
@@ -214,7 +194,7 @@ describe('P0-3.4 Stripe webhook: amount/currency mismatch (minor) must not set p
     expect(reason && reason.length > 0).toBe(true);
 
     const metaObj =
-      typeof metaRaw === 'string' ? JSON.parse(metaRaw) : metaRaw ?? {};
+      typeof metaRaw === 'string' ? JSON.parse(metaRaw) : (metaRaw ?? {});
 
     expect(metaObj?.mismatch?.eventId).toBe(evtId);
     expect(metaObj?.mismatch?.expected?.amountMinor).toBe(expectedMinor);
diff --git a/frontend/lib/tests/stripe-webhook-paid-status-repair.test.ts b/frontend/lib/tests/shop/stripe-webhook-paid-status-repair.test.ts
similarity index 91%
rename from frontend/lib/tests/stripe-webhook-paid-status-repair.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-paid-status-repair.test.ts
index 6ed80c87..c2eaacef 100644
--- a/frontend/lib/tests/stripe-webhook-paid-status-repair.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-paid-status-repair.test.ts
@@ -1,7 +1,8 @@
 import crypto from 'crypto';
+import { eq } from 'drizzle-orm';
 import { NextRequest } from 'next/server';
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { eq } from 'drizzle-orm';
+
 import { db } from '@/db';
 import { orders, stripeEvents } from '@/db/schema';
 import { toDbMoney } from '@/lib/shop/money';
@@ -15,9 +16,9 @@ async function seedOrder(params: { orderId: string; pi: string }) {
     totalAmount: toDbMoney(2500),
     currency: 'USD',
     paymentProvider: 'stripe',
-    paymentStatus: 'paid', // mismatch: already "paid"
+    paymentStatus: 'paid',
     paymentIntentId: params.pi,
-    status: 'INVENTORY_RESERVED', // mismatch: not "PAID"
+    status: 'INVENTORY_RESERVED',
     inventoryStatus: 'reserved',
     stockRestored: false,
     restockedAt: null,
@@ -31,7 +32,6 @@ async function callWebhook(params: {
   pi: string;
   orderId: string;
 }) {
-  // Keep this pattern: reset module cache so route picks up env + mocks.
   vi.resetModules();
 
   vi.doMock('@/lib/psp/stripe', async () => {
@@ -55,7 +55,6 @@ async function callWebhook(params: {
     };
   });
 
-  // Task #5: avoid process.env mutation; use stubEnv + restore in afterEach.
   vi.stubEnv('STRIPE_SECRET_KEY', 'sk_test_dummy');
   vi.stubEnv('STRIPE_WEBHOOK_SECRET', 'whsec_test_dummy');
 
@@ -68,7 +67,7 @@ async function callWebhook(params: {
       'content-type': 'application/json',
     },
     body: JSON.stringify({ id: params.eventId }),
-    // Node-fetch/undici інколи вимагає duplex при body; безпечно лишити як any.
+
     duplex: 'half',
   } as any);
 
@@ -121,7 +120,6 @@ describe('stripe webhook: repair paid status mismatch', () => {
   let lastEventId: string | null = null;
 
   afterEach(async () => {
-    // restore env stubs to avoid cross-test coupling
     vi.unstubAllEnvs();
 
     if (lastOrderId || lastEventId) {
diff --git a/frontend/lib/tests/stripe-webhook-psp-fields.test.ts b/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
similarity index 90%
rename from frontend/lib/tests/stripe-webhook-psp-fields.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
index bb9c41fd..3334e5ef 100644
--- a/frontend/lib/tests/stripe-webhook-psp-fields.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
@@ -1,30 +1,28 @@
-// lib/tests/stripe-webhook-psp-fields.test.ts
-import { describe, it, expect, vi } from 'vitest';
-import { NextRequest } from 'next/server';
-import { eq } from 'drizzle-orm';
 import { randomUUID } from 'crypto';
+import { eq } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import { describe, expect, it, vi } from 'vitest';
 
 import { db } from '@/db';
 import {
-  products,
-  productPrices,
-  orders,
   orderItems,
+  orders,
+  productPrices,
+  products,
   stripeEvents,
 } from '@/db/schema';
 
 vi.mock('@/lib/psp/stripe', async () => {
-  const actual = await vi.importActual<Record<string, unknown>>(
-    '@/lib/psp/stripe'
-  );
+  const actual =
+    await vi.importActual<Record<string, unknown>>('@/lib/psp/stripe');
   return {
     ...actual,
     verifyWebhookSignature: vi.fn(),
   };
 });
 
-import { verifyWebhookSignature } from '@/lib/psp/stripe';
 import { POST as webhookPOST } from '@/app/api/shop/webhooks/stripe/route';
+import { verifyWebhookSignature } from '@/lib/psp/stripe';
 
 function logTestCleanupFailed(meta: Record<string, unknown>, error: unknown) {
   console.error('[test cleanup failed]', {
@@ -39,7 +37,6 @@ function makeWebhookRequest(rawBody: string) {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
-      // route calls verifyWebhookSignature(rawBody, signatureHeader)
       'Stripe-Signature': 't=1,v1=test',
     },
     body: rawBody,
@@ -53,7 +50,6 @@ async function cleanup(params: {
 }) {
   const { orderId, productId, eventId } = params;
 
-  // teardown must not mask assertion failures, but must surface cleanup problems
   try {
     await db.delete(stripeEvents).where(eq(stripeEvents.eventId, eventId));
   } catch (e) {
@@ -125,7 +121,6 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
     const slug = `webhook-psp-${productId.slice(0, 8)}`;
     const sku = `SKU-${productId.slice(0, 8)}`;
 
-    // Seed product + price (needed because order_items FK -> products)
     await db.insert(products).values({
       id: productId,
       slug,
@@ -157,7 +152,6 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
       originalPrice: null,
     });
 
-    // Seed order in the pre-payment state that webhook expects
     await db.insert(orders).values({
       id: orderId,
       totalAmountMinor: 900,
@@ -166,7 +160,7 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
       paymentStatus: 'requires_payment',
       paymentProvider: 'stripe',
       paymentIntentId,
-      // keep defaults for PSP fields; metadata default is {}
+
       idempotencyKey: idemKey,
       status: 'INVENTORY_RESERVED',
       inventoryStatus: 'reserved',
@@ -253,10 +247,8 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
       expect(updated1.length).toBe(1);
       expect(updated1[0].paymentIntentId).toBe(paymentIntentId);
 
-      // Must be marked paid (or at minimum be terminal + PSP fields set; but your flow expects paid)
       expect(updated1[0].paymentStatus).toBe('paid');
 
-      // PSP fields must be written
       expect(updated1[0].pspChargeId).toBe(chargeId);
       expect(typeof updated1[0].pspPaymentMethod).toBe('string');
       expect((updated1[0].pspPaymentMethod ?? '').length).toBeGreaterThan(0);
@@ -266,14 +258,12 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
         'succeeded'
       );
 
-      // pspMetadata must not stay "{}"
       expect(updated1[0].pspMetadata).toBeTruthy();
       expect(
         Object.keys((updated1[0].pspMetadata ?? {}) as Record<string, unknown>)
           .length
       ).toBeGreaterThan(0);
 
-      // stripe_events must record the eventId once
       const ev1 = await db
         .select({ eventId: stripeEvents.eventId })
         .from(stripeEvents)
@@ -281,7 +271,6 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
 
       expect(ev1.length).toBe(1);
 
-      // Duplicate delivery must not break (idempotency / dedupe)
       const req2 = makeWebhookRequest(rawBody);
       const res2 = await webhookPOST(req2);
       expect(res2.status).toBeGreaterThanOrEqual(200);
diff --git a/frontend/lib/tests/stripe-webhook-rate-limit-env.test.ts b/frontend/lib/tests/shop/stripe-webhook-rate-limit-env.test.ts
similarity index 97%
rename from frontend/lib/tests/stripe-webhook-rate-limit-env.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-rate-limit-env.test.ts
index fa14b0b4..c9f67980 100644
--- a/frontend/lib/tests/stripe-webhook-rate-limit-env.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-rate-limit-env.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
+
 import { resolveStripeWebhookRateLimit } from '@/lib/security/stripe-webhook-rate-limit';
 
 describe('stripe webhook rate limit env precedence', () => {
@@ -65,7 +66,7 @@ describe('stripe webhook rate limit env precedence', () => {
 
   it('supports partial config (field-by-field): missing_sig MAX can override while WINDOW falls back', () => {
     vi.stubEnv('STRIPE_WEBHOOK_MISSING_SIG_RL_MAX', '66');
-    vi.stubEnv('STRIPE_WEBHOOK_RL_WINDOW_SECONDS', '555'); // fallback source for window
+    vi.stubEnv('STRIPE_WEBHOOK_RL_WINDOW_SECONDS', '555');
 
     expect(resolveStripeWebhookRateLimit('missing_sig')).toEqual({
       max: 66,
diff --git a/frontend/lib/tests/stripe-webhook-refund-full.test.ts b/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
similarity index 89%
rename from frontend/lib/tests/stripe-webhook-refund-full.test.ts
rename to frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
index 8b81bc82..f7cfc247 100644
--- a/frontend/lib/tests/stripe-webhook-refund-full.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
@@ -1,15 +1,15 @@
-// frontend/lib/tests/stripe-webhook-refund-full.test.ts
-
 import crypto from 'node:crypto';
+
 import { eq } from 'drizzle-orm';
 import { NextRequest } from 'next/server';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type Stripe from 'stripe';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 vi.mock('@/lib/psp/stripe', async () => {
-  const actual = await vi.importActual<typeof import('@/lib/psp/stripe')>(
-    '@/lib/psp/stripe'
-  );
+  const actual =
+    await vi.importActual<typeof import('@/lib/psp/stripe')>(
+      '@/lib/psp/stripe'
+    );
 
   return {
     ...actual,
@@ -123,8 +123,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
   beforeEach(async () => {
     vi.clearAllMocks();
 
-    // restockOrder mocked: we don't retest inventory ledger here (it is covered by restock tests),
-    // we only assert webhook triggers it exactly-once and marks order as restocked.
     restockOrderMock.mockImplementation(async (orderId: string) => {
       await db
         .update(orders)
@@ -182,7 +180,7 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       .limit(1);
 
     expect(row1.paymentStatus).toBe('refunded');
-    expect(row1.status).toBe('CANCELED'); // terminal status per current enum
+    expect(row1.status).toBe('CANCELED');
     expect(row1.stockRestored).toBe(true);
 
     expect(restockOrderMock).toHaveBeenCalledTimes(1);
@@ -190,7 +188,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       reason: 'refunded',
     });
 
-    // 2nd call with SAME event.id -> dedupe => no side effects
     const res2 = await POST(makeRequest());
     expect(res2.status).toBe(200);
 
@@ -217,12 +214,11 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       amount: 2500,
       status: 'succeeded',
       reason: null,
-      charge: chargeId, // IMPORTANT: real Stripe shape is usually string id
+      charge: chargeId,
       payment_intent: inserted.paymentIntentId,
       metadata: {},
     };
 
-    // Webhook code should retrieve the charge by id to get cumulative refunded, etc.
     retrieveChargeMock.mockResolvedValue(
       makeCharge({
         chargeId,
@@ -256,7 +252,7 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     expect(row.paymentStatus).toBe('refunded');
     expect(row.status).toBe('CANCELED');
     expect(row.stockRestored).toBe(true);
-    expect(row.pspChargeId).toBe(chargeId); // requires PATCH 1 in webhook
+    expect(row.pspChargeId).toBe(chargeId);
 
     expect(retrieveChargeMock).toHaveBeenCalledTimes(1);
     expect(retrieveChargeMock).toHaveBeenCalledWith(chargeId);
@@ -279,7 +275,7 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       chargeId,
       paymentIntentId: inserted.paymentIntentId,
       amount: 2500,
-      amountRefunded: 1000, // partial
+      amountRefunded: 1000,
       refunds: [{ id: refundId, amount: 1000 }],
     });
 
@@ -330,7 +326,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       data: { object: charge },
     } as unknown as Stripe.Event);
 
-    // first call: restock throws => webhook returns 500
     restockOrderMock
       .mockImplementationOnce(async () => {
         throw new Error('RESTOCK_FAILED');
@@ -350,7 +345,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     const res1 = await POST(makeRequest());
     expect(res1.status).toBe(500);
 
-    // same eventId retry: MUST reprocess (processedAt is still NULL) and restock succeeds
     const res2 = await POST(makeRequest());
     expect(res2.status).toBe(200);
 
@@ -387,19 +381,17 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     const refund2Id = `re_${crypto.randomUUID()}`;
     const refund3Id = `re_${crypto.randomUUID()}`;
 
-    // current event refund is only 500 (not full by itself)
     const refund = {
       id: refund3Id,
       object: 'refund',
       amount: 500,
       status: 'succeeded',
       reason: null,
-      charge: chargeId, // IMPORTANT: real Stripe shape is usually string id
+      charge: chargeId,
       payment_intent: inserted.paymentIntentId,
       metadata: {},
     };
 
-    // Charge says cumulative refunded is FULL (2500), but refund.amount is only 500.
     retrieveChargeMock.mockResolvedValue(
       makeCharge({
         chargeId,
@@ -454,14 +446,13 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       chargeId,
       paymentIntentId: inserted.paymentIntentId,
       amount: 2500,
-      amountRefunded: 2500, // will be deleted to force fallback
+      amountRefunded: 2500,
       refunds: [
         { id: refund1Id, amount: 1000 },
         { id: refund2Id, amount: 1500 },
       ],
     });
 
-    // force edge-case: Stripe object without amount_refunded
     delete (charge as any).amount_refunded;
 
     verifyWebhookSignatureMock.mockReturnValue({
@@ -502,14 +493,12 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       chargeId,
       paymentIntentId: inserted.paymentIntentId,
       amount: 2500,
-      amountRefunded: 0, // will be deleted to force "missing"
-      refunds: [], // empty list => refund object unavailable (refund == null)
+      amountRefunded: 0,
+      refunds: [],
     });
 
-    // Edge-case: Stripe object WITHOUT amount_refunded
     delete (charge as any).amount_refunded;
 
-    // Ensure refunds list is present but empty (covers "refunds.data = []")
     (charge as any).refunds = { object: 'list', data: [] };
 
     verifyWebhookSignatureMock.mockReturnValue({
@@ -523,11 +512,9 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     const res = await POST(makeRequest());
     expect(res.status).toBe(500);
 
-    // If you kept the explicit diagnostic mapping:
     const body = await res.json();
     expect(body).toEqual({ code: 'REFUND_FULLNESS_UNDETERMINED' });
 
-    // stripe_events.processed_at must remain NULL (no ack -> Stripe retries)
     const [evt] = await db
       .select({
         processedAt: stripeEvents.processedAt,
@@ -542,7 +529,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     expect(evt.processedAt).toBeNull();
     expect(evt.paymentIntentId).toBe(inserted.paymentIntentId);
 
-    // Order must NOT change (safe no-op)
     const [row] = await db
       .select({
         paymentStatus: orders.paymentStatus,
@@ -561,7 +547,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
 
     expect(restockOrderMock).toHaveBeenCalledTimes(0);
 
-    // Optional: assert warning fired (locks observability behavior)
     expect(warnSpy).toHaveBeenCalled();
 
     const firstArg = warnSpy.mock.calls[0]?.[0];
@@ -577,7 +562,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     expect(parsed.level).toBe('warn');
     expect(parsed.msg).toBe('stripe_webhook_refund_fullness_undetermined');
 
-    // (опційно, але корисно: зафіксувати reason)
     expect(parsed.meta?.reason).toBe(
       'missing_amount_refunded_and_empty_refunds_list'
     );
diff --git a/frontend/lib/types/shop.ts b/frontend/lib/types/shop.ts
index 25b3773c..5f387c18 100644
--- a/frontend/lib/types/shop.ts
+++ b/frontend/lib/types/shop.ts
@@ -30,14 +30,12 @@ export type OrderSummary = z.infer<typeof orderSummarySchema> & {
 export type OrderDetail = OrderSummary;
 
 export type OrderSummaryWithMinor = OrderSummary & {
-  // canonical money model (minor units)
   totalAmountMinor: number;
 };
 
 export type CheckoutResult = {
   order: OrderSummaryWithMinor;
   isNew: boolean;
-  // legacy name (keep for back-compat in client/tests)
   totalCents: number;
 };
 
diff --git a/frontend/lib/utils.ts b/frontend/lib/utils.ts
index bd0c391d..9ad0df42 100644
--- a/frontend/lib/utils.ts
+++ b/frontend/lib/utils.ts
@@ -1,6 +1,6 @@
-import { clsx, type ClassValue } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { type ClassValue, clsx } from 'clsx';
+import { twMerge } from 'tailwind-merge';
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+  return twMerge(clsx(inputs));
 }
diff --git a/frontend/lib/validation/checkout.ts b/frontend/lib/validation/checkout.ts
index cc8e94b6..57b1cd24 100644
--- a/frontend/lib/validation/checkout.ts
+++ b/frontend/lib/validation/checkout.ts
@@ -1,6 +1,6 @@
 export {
-  checkoutItemSchema,
-  checkoutPayloadSchema,
   type CheckoutItemInput,
+  checkoutItemSchema,
   type CheckoutPayload,
-} from "./shop"
+  checkoutPayloadSchema,
+} from './shop';
diff --git a/frontend/lib/validation/shop.ts b/frontend/lib/validation/shop.ts
index 9ba5c181..8fe979d2 100644
--- a/frontend/lib/validation/shop.ts
+++ b/frontend/lib/validation/shop.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+
 import {
   CATALOG_PAGE_SIZE,
   CATEGORIES,
@@ -12,7 +13,7 @@ import {
   paymentProviderValues,
   paymentStatusValues,
 } from '@/lib/shop/payments';
-export type { PaymentStatus, PaymentProvider } from '@/lib/shop/payments';
+export type { PaymentProvider, PaymentStatus } from '@/lib/shop/payments';
 
 export const MAX_QUANTITY_PER_LINE = 20;
 
@@ -99,8 +100,6 @@ export const dbProductSchema = z.object({
     .string()
     .nullish()
     .transform(value => value ?? undefined),
-  // NOTE: DB shape is still "price/originalPrice" here (whatever your query returns).
-  // You convert to minor in the mapper (fromDbMoney), so we keep these permissive.
   price: z.coerce.number(),
   originalPrice: z.coerce
     .number()
@@ -137,7 +136,6 @@ export const dbProductSchema = z.object({
   updatedAt: z.coerce.date(),
 });
 
-// IMPORTANT: shopProduct.price/originalPrice are MINOR units (integers).
 export const shopProductSchema = z.object({
   id: z.string(),
   slug: z.string(),
@@ -166,7 +164,6 @@ const booleanFromString = z.preprocess(value => {
   return undefined;
 }, z.boolean().optional());
 
-// Money in MINOR units (integers)
 const moneyMinor = z.number().int().min(0);
 const moneyMinorPositive = z.number().int().min(1);
 
@@ -177,7 +174,6 @@ export const adminPriceRowSchema = z
     originalPriceMinor: moneyMinor.optional().nullable(),
   })
   .superRefine((v, ctx) => {
-    // priceMinor already validated > 0
     if (v.originalPriceMinor != null) {
       if (!Number.isFinite(v.originalPriceMinor)) {
         ctx.addIssue({
@@ -239,10 +235,8 @@ export const productAdminSchema = z
     isFeatured: booleanFromString.default(false),
   })
   .superRefine((data, ctx) => {
-    // 1) no duplicate currencies
     refineNoDuplicateCurrencies(data.prices, ctx);
 
-    // 2) USD is required
     const usd = data.prices.find(p => p.currency === 'USD');
     if (!usd) {
       ctx.addIssue({
@@ -251,7 +245,7 @@ export const productAdminSchema = z
         message: 'USD price is required',
       });
     }
-    // 3) SALE badge requires compare-at/original price for every provided currency
+
     if (data.badge === 'SALE') {
       data.prices.forEach((p, idx) => {
         if (p.originalPriceMinor == null) {
@@ -358,10 +352,10 @@ export const cartRehydratedItemSchema = z.object({
   slug: z.string(),
   title: z.string(),
   quantity: z.number().int().min(1).max(MAX_QUANTITY_PER_LINE),
-  // canonical:
+
   unitPriceMinor: moneyMinorPositive,
   lineTotalMinor: moneyMinor,
-  // display/legacy:
+
   unitPrice: z.number().min(0),
   lineTotal: z.number().min(0),
 
@@ -381,9 +375,8 @@ export const cartRehydrateResultSchema = z.object({
   items: z.array(cartRehydratedItemSchema),
   removed: z.array(cartRemovedItemSchema),
   summary: z.object({
-    // canonical:
     totalAmountMinor: moneyMinor,
-    // display/legacy:
+
     totalAmount: z.number().min(0),
     itemCount: z.number().int().min(0),
     currency: currencySchema,
@@ -396,9 +389,9 @@ export const orderIdParamSchema = z.object({
 
 export const orderSummarySchema = z.object({
   id: z.string().uuid(),
-  // canonical:
+
   totalAmountMinor: moneyMinor,
-  // display/legacy:
+
   totalAmount: z.number().min(0),
   currency: currencySchema,
   paymentStatus: paymentStatusSchema,
@@ -414,10 +407,10 @@ export const orderSummarySchema = z.object({
       productTitle: z.string(),
       productSlug: z.string(),
       quantity: z.number().int().min(1),
-      // canonical:
+
       unitPriceMinor: moneyMinorPositive,
       lineTotalMinor: moneyMinor,
-      // display/legacy:
+
       unitPrice: z.number().min(0),
       lineTotal: z.number().min(0),
     })
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index d8eab905..53dd4e7d 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -17,7 +17,13 @@
     "searchBlog": "Search blog",
     "toggleMenu": "Toggle menu",
     "closeMenu": "Close menu",
-    "logout": "Log out"
+    "logout": "Log out",
+    "themeSystem": "System theme",
+    "themeLight": "Light theme",
+    "themeDark": "Dark theme",
+    "cart": "Cart",
+    "cartWithItems": "Cart, {count} items",
+    "starOnGithub": "Star on GitHub - {count} stars"
   },
   "mobileMenu": {
     "newProduct": "New product",
@@ -41,7 +47,17 @@
     "title": "DevLovers",
     "subtitle": "Platform for Technical Interview Preparation",
     "description": "Master frontend, backend, and full-stack development with our interview questions, quizzes, and learning materials.",
-    "cta": "Start Learning"
+    "cta": "Take the first step",
+    "ctaVariants": {
+      "1": "No pressure. Just start.",
+      "2": "This might actually be fun",
+      "3": "You're already halfway",
+      "4": "One click from progress",
+      "5": "You clicked. That counts.",
+      "6": "Brave move, by the way",
+      "7": "Okay, now it's happening",
+      "8": "Hello, new commit"
+    }
   },
   "qa": {
     "title": "Questions and Answers",
@@ -178,7 +194,8 @@
       "title": "Exit Quiz?",
       "message": "Your progress will not be saved.",
       "confirm": "Exit",
-      "cancel": "Continue"
+      "cancel": "Continue",
+      "exitButton": "Exit Quiz"
     },
     "antiCheat": {
       "copy": "Copying is not allowed during the quiz",
@@ -644,31 +661,64 @@
       },
       "bubbles": {
         "qa": {
-          "languages": { "label": "3 Languages", "desc": "EN, UK & PL supported" },
-          "aiHelper": { "label": "AI Helper", "desc": "Select text for AI explain" },
-          "smartCache": { "label": "Smart Cache", "desc": "Highlights learned terms" },
-          "techFilter": { "label": "Tech Filter", "desc": "React, Git, JS & more" }
+          "languages": {
+            "label": "3 Languages",
+            "desc": "EN, UK & PL supported"
+          },
+          "aiHelper": {
+            "label": "AI Helper",
+            "desc": "Select text for AI explain"
+          },
+          "smartCache": {
+            "label": "Smart Cache",
+            "desc": "Highlights learned terms"
+          },
+          "techFilter": {
+            "label": "Tech Filter",
+            "desc": "React, Git, JS & more"
+          }
         },
         "quiz": {
-          "smartTimer": { "label": "Smart Timer", "desc": "Race against the total time" },
-          "antiCheat": { "label": "Anti-Cheat", "desc": "Focus loss detection" },
-          "autoSync": { "label": "Auto Sync", "desc": "Saves progress post-login" },
+          "smartTimer": {
+            "label": "Smart Timer",
+            "desc": "Race against the total time"
+          },
+          "antiCheat": {
+            "label": "Anti-Cheat",
+            "desc": "Focus loss detection"
+          },
+          "autoSync": {
+            "label": "Auto Sync",
+            "desc": "Saves progress post-login"
+          },
           "tracking": { "label": "Tracking", "desc": "Best scores & attempts" }
         },
         "leaderboard": {
-          "podium": { "label": "The Podium", "desc": "Top 3 exclusive spotlight" },
+          "podium": {
+            "label": "The Podium",
+            "desc": "Top 3 exclusive spotlight"
+          },
           "globalRank": { "label": "Global Rank", "desc": "Compete worldwide" },
-          "xpSystem": { "label": "XP System", "desc": "Points for every answer" },
+          "xpSystem": {
+            "label": "XP System",
+            "desc": "Points for every answer"
+          },
           "liveFeed": { "label": "Live Feed", "desc": "Real-time rank updates" }
         },
         "profile": {
           "statsHub": { "label": "Stats Hub", "desc": "Visualize your growth" },
           "history": { "label": "History", "desc": "Track learning streaks" },
           "identity": { "label": "Identity", "desc": "Manage role & profile" },
-          "reminders": { "label": "Reminders", "desc": "Finish incomplete quizzes" }
+          "reminders": {
+            "label": "Reminders",
+            "desc": "Finish incomplete quizzes"
+          }
         },
         "blog": {
-          "techTrends": { "label": "Tech Trends", "desc": "Stay ahead of the curve" },
+          "techTrends": {
+            "label": "Tech Trends",
+            "desc": "Stay ahead of the curve"
+          },
           "tutorials": { "label": "Tutorials", "desc": "Step-by-step guides" },
           "deepDives": { "label": "Deep Dives", "desc": "In-depth analysis" },
           "community": { "label": "Community", "desc": "Written by developers" }
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index 06113f66..385af803 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -17,7 +17,13 @@
     "searchBlog": "Szukaj w blogu",
     "toggleMenu": "Przełącz menu",
     "closeMenu": "Zamknij menu",
-    "logout": "Wyloguj się"
+    "logout": "Wyloguj się",
+    "themeSystem": "Motyw systemowy",
+    "themeLight": "Jasny motyw",
+    "themeDark": "Ciemny motyw",
+    "cart": "Koszyk",
+    "cartWithItems": "Koszyk, {count} produktów",
+    "starOnGithub": "Gwiazdka na GitHub - {count} gwiazdek"
   },
   "mobileMenu": {
     "newProduct": "Nowy produkt",
@@ -41,7 +47,17 @@
     "title": "DevLovers",
     "subtitle": "Platforma do Przygotowania do Rozmów Kwalifikacyjnych",
     "description": "Opanuj frontend, backend i full-stack development dzięki naszym pytaniom do rozmów kwalifikacyjnych, quizom i materiałom edukacyjnym.",
-    "cta": "Rozpocznij naukę"
+    "cta": "Rozpocznij naukę",
+    "ctaVariants": {
+      "1": "Bez presji. Po prostu zacznij.",
+      "2": "To może być ciekawsze, niż myślisz.",
+      "3": "Właśnie tutaj to się zaczyna.",
+      "4": "Jesteś już w połowie drogi.",
+      "5": "Jeden klik do postępu.",
+      "6": "Klik był — to się liczy.",
+      "7": "Postęp ważniejszy niż perfekcja.",
+      "8": "Zacząć to też funkcja."
+    }
   },
   "qa": {
     "title": "Pytania i Odpowiedzi",
@@ -178,7 +194,8 @@
       "title": "Wyjść z Quizu?",
       "message": "Twój postęp nie zostanie zapisany.",
       "confirm": "Wyjdź",
-      "cancel": "Kontynuuj"
+      "cancel": "Kontynuuj",
+      "exitButton": "Wyjdź z quizu"
     },
     "antiCheat": {
       "copy": "Kopiowanie jest zabronione podczas quizu",
@@ -645,38 +662,98 @@
       "bubbles": {
         "qa": {
           "languages": { "label": "3 języki", "desc": "EN, UK i PL" },
-          "aiHelper": { "label": "Pomocnik AI", "desc": "Zaznacz tekst do wyjaśnienia" },
-          "smartCache": { "label": "Inteligentny cache", "desc": "Podświetla nauczone terminy" },
-          "techFilter": { "label": "Filtr tech", "desc": "React, Git, JS i więcej" }
+          "aiHelper": {
+            "label": "Pomocnik AI",
+            "desc": "Zaznacz tekst do wyjaśnienia"
+          },
+          "smartCache": {
+            "label": "Inteligentny cache",
+            "desc": "Podświetla nauczone terminy"
+          },
+          "techFilter": {
+            "label": "Filtr tech",
+            "desc": "React, Git, JS i więcej"
+          }
         },
         "quiz": {
-          "smartTimer": { "label": "Inteligentny timer", "desc": "Ścigaj się z czasem" },
-          "antiCheat": { "label": "Anti-Cheat", "desc": "Wykrywanie utraty fokusa" },
-          "autoSync": { "label": "Auto-synchronizacja", "desc": "Zapisuje postęp po logowaniu" },
-          "tracking": { "label": "Śledzenie", "desc": "Najlepsze wyniki i próby" }
+          "smartTimer": {
+            "label": "Inteligentny timer",
+            "desc": "Ścigaj się z czasem"
+          },
+          "antiCheat": {
+            "label": "Anti-Cheat",
+            "desc": "Wykrywanie utraty fokusa"
+          },
+          "autoSync": {
+            "label": "Auto-synchronizacja",
+            "desc": "Zapisuje postęp po logowaniu"
+          },
+          "tracking": {
+            "label": "Śledzenie",
+            "desc": "Najlepsze wyniki i próby"
+          }
         },
         "leaderboard": {
-          "podium": { "label": "Podium", "desc": "Ekskluzywny spotlight top 3" },
-          "globalRank": { "label": "Globalny ranking", "desc": "Rywalizuj na całym świecie" },
-          "xpSystem": { "label": "System XP", "desc": "Punkty za każdą odpowiedź" },
-          "liveFeed": { "label": "Live feed", "desc": "Aktualizacje rang w czasie rzeczywistym" }
+          "podium": {
+            "label": "Podium",
+            "desc": "Ekskluzywny spotlight top 3"
+          },
+          "globalRank": {
+            "label": "Globalny ranking",
+            "desc": "Rywalizuj na całym świecie"
+          },
+          "xpSystem": {
+            "label": "System XP",
+            "desc": "Punkty za każdą odpowiedź"
+          },
+          "liveFeed": {
+            "label": "Live feed",
+            "desc": "Aktualizacje rang w czasie rzeczywistym"
+          }
         },
         "profile": {
-          "statsHub": { "label": "Centrum statystyk", "desc": "Wizualizuj swój rozwój" },
+          "statsHub": {
+            "label": "Centrum statystyk",
+            "desc": "Wizualizuj swój rozwój"
+          },
           "history": { "label": "Historia", "desc": "Śledź serie nauki" },
-          "identity": { "label": "Tożsamość", "desc": "Zarządzaj rolą i profilem" },
-          "reminders": { "label": "Przypomnienia", "desc": "Dokończ niedokończone quizy" }
+          "identity": {
+            "label": "Tożsamość",
+            "desc": "Zarządzaj rolą i profilem"
+          },
+          "reminders": {
+            "label": "Przypomnienia",
+            "desc": "Dokończ niedokończone quizy"
+          }
         },
         "blog": {
-          "techTrends": { "label": "Trendy tech", "desc": "Bądź o krok przed innymi" },
-          "tutorials": { "label": "Tutoriale", "desc": "Przewodniki krok po kroku" },
-          "deepDives": { "label": "Głębokie analizy", "desc": "Szczegółowy rozbiór" },
-          "community": { "label": "Społeczność", "desc": "Pisane przez developerów" }
+          "techTrends": {
+            "label": "Trendy tech",
+            "desc": "Bądź o krok przed innymi"
+          },
+          "tutorials": {
+            "label": "Tutoriale",
+            "desc": "Przewodniki krok po kroku"
+          },
+          "deepDives": {
+            "label": "Głębokie analizy",
+            "desc": "Szczegółowy rozbiór"
+          },
+          "community": {
+            "label": "Społeczność",
+            "desc": "Pisane przez developerów"
+          }
         },
         "shop": {
           "newDrops": { "label": "Nowości", "desc": "Regularne aktualizacje" },
-          "curated": { "label": "Selekcja", "desc": "Kolekcje dla developerów" },
-          "checkout": { "label": "Płatność", "desc": "Płynny proces przez Stripe" },
+          "curated": {
+            "label": "Selekcja",
+            "desc": "Kolekcje dla developerów"
+          },
+          "checkout": {
+            "label": "Płatność",
+            "desc": "Płynny proces przez Stripe"
+          },
           "premium": { "label": "Premium", "desc": "Wysoka jakość materiałów" }
         }
       }
diff --git a/frontend/messages/uk.json b/frontend/messages/uk.json
index 7be5f3b7..9f141a38 100644
--- a/frontend/messages/uk.json
+++ b/frontend/messages/uk.json
@@ -17,7 +17,13 @@
     "searchBlog": "Пошук у блозі",
     "toggleMenu": "Відкрити/закрити меню",
     "closeMenu": "Закрити меню",
-    "logout": "Вийти"
+    "logout": "Вийти",
+    "themeSystem": "Системна тема",
+    "themeLight": "Світла тема",
+    "themeDark": "Темна тема",
+    "cart": "Кошик",
+    "cartWithItems": "Кошик, {count} товарів",
+    "starOnGithub": "Зірка на GitHub - {count} зірок"
   },
   "mobileMenu": {
     "newProduct": "Новий товар",
@@ -41,7 +47,17 @@
     "title": "DevLovers",
     "subtitle": "Платформа для підготовки до технічних співбесід",
     "description": "Опануйте frontend, backend та full-stack-розробку за допомогою наших питань для співбесід, квізів і навчальних матеріалів.",
-    "cta": "Стартуємо"
+    "cta": "Зроби перший крок",
+    "ctaVariants": {
+      "1": "Без тиску. Просто почни.",
+      "2": "Це може бути цікавіше, ніж здається.",
+      "3": "Ось тут усе й починається.",
+      "4": "Ти вже на пів шляху.",
+      "5": "Один клік до прогресу.",
+      "6": "Ну все, процес пішов.",
+      "7": "Простіше, ніж виглядає",
+      "8": "Почати — це теж фіча."
+    }
   },
   "qa": {
     "title": "Питання та Відповіді",
@@ -178,7 +194,8 @@
       "title": "Вийти з квізу?",
       "message": "Ваш прогрес не буде збережено.",
       "confirm": "Вийти",
-      "cancel": "Продовжити"
+      "cancel": "Продовжити",
+      "exitButton": "Вийти з квізу"
     },
     "antiCheat": {
       "copy": "Копіювання заборонено під час квізу",
@@ -645,32 +662,68 @@
       "bubbles": {
         "qa": {
           "languages": { "label": "3 мови", "desc": "EN, UK та PL" },
-          "aiHelper": { "label": "AI-помічник", "desc": "Виділи текст для пояснення" },
-          "smartCache": { "label": "Розумний кеш", "desc": "Підсвічує вивчені терміни" },
-          "techFilter": { "label": "Tech-фільтр", "desc": "React, Git, JS та інше" }
+          "aiHelper": {
+            "label": "AI-помічник",
+            "desc": "Виділи текст для пояснення"
+          },
+          "smartCache": {
+            "label": "Розумний кеш",
+            "desc": "Підсвічує вивчені терміни"
+          },
+          "techFilter": {
+            "label": "Tech-фільтр",
+            "desc": "React, Git, JS та інше"
+          }
         },
         "quiz": {
-          "smartTimer": { "label": "Розумний таймер", "desc": "Змагайся з часом" },
+          "smartTimer": {
+            "label": "Розумний таймер",
+            "desc": "Змагайся з часом"
+          },
           "antiCheat": { "label": "Античіт", "desc": "Детекція втрати фокусу" },
-          "autoSync": { "label": "Синхронізація", "desc": "Зберігає прогрес після входу" },
-          "tracking": { "label": "Відстеження", "desc": "Найкращі результати та спроби" }
+          "autoSync": {
+            "label": "Синхронізація",
+            "desc": "Зберігає прогрес після входу"
+          },
+          "tracking": {
+            "label": "Відстеження",
+            "desc": "Найкращі результати та спроби"
+          }
         },
         "leaderboard": {
           "podium": { "label": "Подіум", "desc": "Топ-3 в центрі уваги" },
-          "globalRank": { "label": "Глобальний рейтинг", "desc": "Змагайся зі світом" },
-          "xpSystem": { "label": "XP-система", "desc": "Бали за кожну відповідь" },
-          "liveFeed": { "label": "Live-стрічка", "desc": "Оновлення рангів в реальному часі" }
+          "globalRank": {
+            "label": "Глобальний рейтинг",
+            "desc": "Змагайся зі світом"
+          },
+          "xpSystem": {
+            "label": "XP-система",
+            "desc": "Бали за кожну відповідь"
+          },
+          "liveFeed": {
+            "label": "Live-стрічка",
+            "desc": "Оновлення рангів в реальному часі"
+          }
         },
         "profile": {
-          "statsHub": { "label": "Центр статистики", "desc": "Візуалізуй своє зростання" },
+          "statsHub": {
+            "label": "Центр статистики",
+            "desc": "Візуалізуй своє зростання"
+          },
           "history": { "label": "Історія", "desc": "Відстежуй серії навчання" },
           "identity": { "label": "Профіль", "desc": "Керуй роллю та даними" },
-          "reminders": { "label": "Нагадування", "desc": "Заверши незакінчені квізи" }
+          "reminders": {
+            "label": "Нагадування",
+            "desc": "Заверши незакінчені квізи"
+          }
         },
         "blog": {
           "techTrends": { "label": "Tech-тренди", "desc": "Будь попереду" },
           "tutorials": { "label": "Туторіали", "desc": "Покрокові гайди" },
-          "deepDives": { "label": "Глибокий аналіз", "desc": "Детальний розбір" },
+          "deepDives": {
+            "label": "Глибокий аналіз",
+            "desc": "Детальний розбір"
+          },
           "community": { "label": "Спільнота", "desc": "Написано розробниками" }
         },
         "shop": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index af79d47c..c8ab5d7e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -60,7 +60,11 @@
         "drizzle-kit": "^0.18.1",
         "eslint": "^9",
         "eslint-config-next": "16.0.1",
+        "eslint-config-prettier": "^10.1.8",
+        "eslint-plugin-react-hooks": "^7.0.1",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
         "jsdom": "^27.4.0",
+        "prettier-plugin-tailwindcss": "^0.7.2",
         "tailwindcss": "^4",
         "ts-node": "^1.7.1",
         "tsx": "^4.21.0",
@@ -1211,9 +1215,9 @@
       }
     },
     "node_modules/@exodus/bytes": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.10.0.tgz",
-      "integrity": "sha512-tf8YdcbirXdPnJ+Nd4UN1EXnz+IP2DI45YVEr3vvzcVTOyrApkmIB4zvOQVd3XPr7RXnfBtAx+PXImXOIU0Ajg==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.11.0.tgz",
+      "integrity": "sha512-wO3vd8nsEHdumsXrjGO/v4p6irbg7hy9kvIeR6i2AwylZSk4HJdWgL0FNaVquW1+AweJcdvU1IEpuIWk/WaPnA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1884,9 +1888,9 @@
       }
     },
     "node_modules/@neondatabase/serverless/node_modules/@types/node": {
-      "version": "22.19.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.7.tgz",
-      "integrity": "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw==",
+      "version": "22.19.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.8.tgz",
+      "integrity": "sha512-ebO/Yl+EAvVe8DnMfi+iaAyIqYdK0q/q0y0rw82INWEKJOBe6b/P3YWE8NW7oOlF/nXFNrHwhARrN/hdgDkraA==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -3912,9 +3916,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.19.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.30.tgz",
-      "integrity": "sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==",
+      "version": "20.19.31",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.31.tgz",
+      "integrity": "sha512-5jsi0wpncvTD33Sh1UCgacK37FFwDn+EG7wCmEvs62fCvBL+n8/76cAYDok21NF6+jaVWIqKwCZyX7Vbu8eB3A==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -4506,9 +4510,9 @@
       ]
     },
     "node_modules/@upstash/redis": {
-      "version": "1.36.1",
-      "resolved": "https://registry.npmjs.org/@upstash/redis/-/redis-1.36.1.tgz",
-      "integrity": "sha512-N6SjDcgXdOcTAF+7uNoY69o7hCspe9BcA7YjQdxVu5d25avljTwyLaHBW3krWjrP0FfocgMk94qyVtQbeDp39A==",
+      "version": "1.36.2",
+      "resolved": "https://registry.npmjs.org/@upstash/redis/-/redis-1.36.2.tgz",
+      "integrity": "sha512-C0Yt8hc12vLaQYRG1fMci8iPrLtnTdbJG0HR5T8vKnvEP/1RdMMblsOJs5/jp0JXZJ1oSzMnQz4J9EVezNpI6A==",
       "license": "MIT",
       "dependencies": {
         "uncrypto": "^0.1.3"
@@ -5277,9 +5281,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001766",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
-      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
+      "version": "1.0.30001767",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
+      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5946,9 +5950,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.283",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.283.tgz",
-      "integrity": "sha512-3vifjt1HgrGW/h76UEeny+adYApveS9dH2h3p57JYzBSXJIKUJAvtmIytDKjcSCt9xHfrNCFJ7gts6vkhuq++w==",
+      "version": "1.5.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -6746,6 +6750,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint-config-prettier": {
+      "version": "10.1.8",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz",
+      "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-config-prettier"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
@@ -7058,6 +7078,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/eslint-plugin-simple-import-sort": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz",
+      "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "eslint": ">=5.0.0"
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
@@ -7487,12 +7517,12 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.2.tgz",
-      "integrity": "sha512-lSNRzBJk4wuIy0emYQ/nfZ7eWhqud2umPKw2QAQki6uKhZPKm2hRQHeQoHTG9MIvfobb+A/LbEWPJU794ZUKrg==",
+      "version": "12.30.1",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.30.1.tgz",
+      "integrity": "sha512-nt3NMBb9wrsC/TlPi6Blg3Zzzf8DkSidCT8dFa3ha3ierU8AF20tqP0eQ3CyGVZdwytVjd4vF/fWE0Uoa+qzdg==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.29.2",
+        "motion-dom": "^12.30.1",
         "motion-utils": "^12.29.2",
         "tslib": "^2.4.0"
       },
@@ -8022,9 +8052,9 @@
       }
     },
     "node_modules/icu-minify": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/icu-minify/-/icu-minify-4.8.1.tgz",
-      "integrity": "sha512-RhXrTA19/PUt5/xs3B/eyx3DCjnMmcfdgqNYBE5vdrEqM4PQK2GWjHa1zdArTxPGgEc4jfuDMH1LkKhmIxwLFw==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/icu-minify/-/icu-minify-4.8.2.tgz",
+      "integrity": "sha512-LHBQV+skKkjZSPd590pZ7ZAHftUgda3eFjeuNwA8/15L8T8loCNBktKQyTlkodAU86KovFXeg/9WntlAo5wA5A==",
       "funding": [
         {
           "type": "individual",
@@ -9492,9 +9522,9 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.29.2.tgz",
-      "integrity": "sha512-/k+NuycVV8pykxyiTCoFzIVLA95Nb1BFIVvfSu9L50/6K6qNeAYtkxXILy/LRutt7AzaYDc2myj0wkCVVYAPPA==",
+      "version": "12.30.1",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.30.1.tgz",
+      "integrity": "sha512-QXB+iFJRzZTqL+Am4a1CRoHdH+0Nq12wLdqQQZZsfHlp9AMt6PA098L/61oVZsDA+Ep3QSGudzpViyRrhYhGcQ==",
       "license": "MIT",
       "dependencies": {
         "motion-utils": "^12.29.2"
@@ -9616,9 +9646,9 @@
       }
     },
     "node_modules/next-intl": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.8.1.tgz",
-      "integrity": "sha512-7V0Ewm6bP12Lgn6cjcKi6NbVy0JeIp1K9EzHfTIsuLAUn4NuH8dhon2WYJywHCyWnxKepm34xF6G1fR2dsNoqA==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/next-intl/-/next-intl-4.8.2.tgz",
+      "integrity": "sha512-GuuwyvyEI49/oehQbBXEoY8KSIYCzmfMLhmIwhMXTb+yeBmly1PnJcpgph3KczQ+HTJMXwXCmkizgtT8jBMf3A==",
       "funding": [
         {
           "type": "individual",
@@ -9630,11 +9660,11 @@
         "@formatjs/intl-localematcher": "^0.5.4",
         "@parcel/watcher": "^2.4.1",
         "@swc/core": "^1.15.2",
-        "icu-minify": "^4.8.1",
+        "icu-minify": "^4.8.2",
         "negotiator": "^1.0.0",
-        "next-intl-swc-plugin-extractor": "^4.8.1",
+        "next-intl-swc-plugin-extractor": "^4.8.2",
         "po-parser": "^2.1.1",
-        "use-intl": "^4.8.1"
+        "use-intl": "^4.8.2"
       },
       "peerDependencies": {
         "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
@@ -9648,9 +9678,9 @@
       }
     },
     "node_modules/next-intl-swc-plugin-extractor": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.8.1.tgz",
-      "integrity": "sha512-4RXyce0ZrQl/6lkfwvDpP8r5B7wbAQakCW9BuMPh+7/DgXFyE+cBXxcmfDkxFDkpXvBFqBZ2HsN4pav49reAZQ==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/next-intl-swc-plugin-extractor/-/next-intl-swc-plugin-extractor-4.8.2.tgz",
+      "integrity": "sha512-sHDs36L1VZmFHj3tPHsD+KZJtnsRudHlNvT0ieIe3iFVn5OpGLTxW3d/Zc/2LXSj5GpGuR6wQeikbhFjU9tMQQ==",
       "license": "MIT"
     },
     "node_modules/next-intl/node_modules/@swc/core": {
@@ -10339,6 +10369,102 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-plugin-tailwindcss": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.7.2.tgz",
+      "integrity": "sha512-LkphyK3Fw+q2HdMOoiEHWf93fNtYJwfamoKPl7UwtjFQdei/iIBoX11G6j706FzN3ymX9mPVi97qIY8328vdnA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.19"
+      },
+      "peerDependencies": {
+        "@ianvs/prettier-plugin-sort-imports": "*",
+        "@prettier/plugin-hermes": "*",
+        "@prettier/plugin-oxc": "*",
+        "@prettier/plugin-pug": "*",
+        "@shopify/prettier-plugin-liquid": "*",
+        "@trivago/prettier-plugin-sort-imports": "*",
+        "@zackad/prettier-plugin-twig": "*",
+        "prettier": "^3.0",
+        "prettier-plugin-astro": "*",
+        "prettier-plugin-css-order": "*",
+        "prettier-plugin-jsdoc": "*",
+        "prettier-plugin-marko": "*",
+        "prettier-plugin-multiline-arrays": "*",
+        "prettier-plugin-organize-attributes": "*",
+        "prettier-plugin-organize-imports": "*",
+        "prettier-plugin-sort-imports": "*",
+        "prettier-plugin-svelte": "*"
+      },
+      "peerDependenciesMeta": {
+        "@ianvs/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@prettier/plugin-hermes": {
+          "optional": true
+        },
+        "@prettier/plugin-oxc": {
+          "optional": true
+        },
+        "@prettier/plugin-pug": {
+          "optional": true
+        },
+        "@shopify/prettier-plugin-liquid": {
+          "optional": true
+        },
+        "@trivago/prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "@zackad/prettier-plugin-twig": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        },
+        "prettier-plugin-css-order": {
+          "optional": true
+        },
+        "prettier-plugin-jsdoc": {
+          "optional": true
+        },
+        "prettier-plugin-marko": {
+          "optional": true
+        },
+        "prettier-plugin-multiline-arrays": {
+          "optional": true
+        },
+        "prettier-plugin-organize-attributes": {
+          "optional": true
+        },
+        "prettier-plugin-organize-imports": {
+          "optional": true
+        },
+        "prettier-plugin-sort-imports": {
+          "optional": true
+        },
+        "prettier-plugin-svelte": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/pretty-format": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
@@ -12032,9 +12158,9 @@
       }
     },
     "node_modules/use-intl": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.8.1.tgz",
-      "integrity": "sha512-wH85ro36JAw9NrtogpEsqHghD21Ul6/zAKxTqHktnO6WTQzqhbcfPkO5iXu3YOnJBA8Anm7IvWSTqSzRE+2PsA==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-4.8.2.tgz",
+      "integrity": "sha512-3VNXZgDnPFqhIYosQ9W1Hc6K5q+ZelMfawNbexdwL/dY7BTHbceLUBX5Eeex9lgogxTp0pf1SjHuhYNAjr9H3g==",
       "funding": [
         {
           "type": "individual",
@@ -12045,7 +12171,7 @@
       "dependencies": {
         "@formatjs/fast-memoize": "^3.1.0",
         "@schummar/icu-type-parser": "1.21.5",
-        "icu-minify": "^4.8.1",
+        "icu-minify": "^4.8.2",
         "intl-messageformat": "^11.1.0"
       },
       "peerDependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 4af0af86..27828b13 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,7 +6,9 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "eslint",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write .",
     "seed:categories": "tsx db/seed-categories.ts",
     "seed:questions": "tsx db/seed-questions.ts",
     "seed:users": "tsx db/seed-users.ts",
@@ -73,7 +75,11 @@
     "drizzle-kit": "^0.18.1",
     "eslint": "^9",
     "eslint-config-next": "16.0.1",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "jsdom": "^27.4.0",
+    "prettier-plugin-tailwindcss": "^0.7.2",
     "tailwindcss": "^4",
     "ts-node": "^1.7.1",
     "tsx": "^4.21.0",
diff --git a/frontend/postcss.config.mjs b/frontend/postcss.config.mjs
index 61e36849..297374d8 100644
--- a/frontend/postcss.config.mjs
+++ b/frontend/postcss.config.mjs
@@ -1,6 +1,6 @@
 const config = {
   plugins: {
-    "@tailwindcss/postcss": {},
+    '@tailwindcss/postcss': {},
   },
 };
 
diff --git a/frontend/proxy.ts b/frontend/proxy.ts
index eeabc246..b53be269 100644
--- a/frontend/proxy.ts
+++ b/frontend/proxy.ts
@@ -1,8 +1,10 @@
 import { NextRequest, NextResponse } from 'next/server';
 import createIntlMiddleware from 'next-intl/middleware';
-import { routing } from './i18n/routing';
+
 import { AuthTokenPayload } from '@/lib/auth';
 
+import { routing } from './i18n/routing';
+
 const AUTH_COOKIE_NAME = 'auth_session';
 
 const AUTH_SECRET = process.env.AUTH_SECRET;
@@ -11,20 +13,23 @@ if (!AUTH_SECRET) {
 }
 
 function decodeAuthToken(token: string): AuthTokenPayload | null {
-  const parts = token.split(".");
+  const parts = token.split('.');
   if (parts.length < 2) return null;
 
-  const base64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-  const padded = base64.padEnd(base64.length + (4 - (base64.length % 4)) % 4, "=");
+  const base64 = parts[1].replace(/-/g, '+').replace(/_/g, '/');
+  const padded = base64.padEnd(
+    base64.length + ((4 - (base64.length % 4)) % 4),
+    '='
+  );
 
   try {
     const json = atob(padded);
     const payload = JSON.parse(json) as Partial<AuthTokenPayload>;
     if (
-      typeof payload.userId !== "string" ||
-      (payload.role !== "user" && payload.role !== "admin") ||
-      typeof payload.email !== "string" ||
-      typeof payload.exp !== "number"
+      typeof payload.userId !== 'string' ||
+      (payload.role !== 'user' && payload.role !== 'admin') ||
+      typeof payload.email !== 'string' ||
+      typeof payload.exp !== 'number'
     ) {
       return null;
     }
@@ -55,11 +60,11 @@ function authMiddleware(req: NextRequest) {
     pathname.replace(/^\/(uk|en|pl)(?=\/|$)/, '') || '/';
 
   if (pathnameWithoutLocale.startsWith('/dashboard')) {
-  if (!authenticated) {
-    const locale = pathname.split('/')[1] || 'en';
-    return NextResponse.redirect(new URL(`/${locale}/login`, req.url));
+    if (!authenticated) {
+      const locale = pathname.split('/')[1] || 'en';
+      return NextResponse.redirect(new URL(`/${locale}/login`, req.url));
+    }
   }
-}
 
   return null;
 }
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 6dfedf18..8cc3cd93 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2017",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -17,19 +13,14 @@
     "isolatedModules": true,
     "jsx": "react-jsx",
     "incremental": true,
-    "types": [
-      "vitest/globals",
-      "@testing-library/jest-dom"
-    ],
+    "types": ["vitest/globals", "@testing-library/jest-dom", "node"],
     "plugins": [
       {
         "name": "next"
       }
     ],
     "paths": {
-      "@/*": [
-        "./*"
-      ]
+      "@/*": ["./*"]
     }
   },
   "include": [
@@ -41,7 +32,5 @@
     "**/*.mts",
     ".next/dev/dev/types/**/*.ts"
   ],
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules"]
 }
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index 385416f4..5c42afa4 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -1,6 +1,7 @@
-import { defineConfig } from 'vitest/config';
-import { fileURLToPath } from 'node:url';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { defineConfig } from 'vitest/config';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -13,7 +14,11 @@ export default defineConfig({
   },
   test: {
     environment: 'node',
-    include: ['lib/tests/**/*.test.ts', 'components/tests/**/*.test.tsx', 'components/quiz/tests/**/*.test.tsx'],
+    include: [
+      'lib/tests/**/*.test.ts',
+      'components/tests/**/*.test.tsx',
+      'components/quiz/tests/**/*.test.tsx',
+    ],
     globals: true,
     setupFiles: ['./vitest.setup.ts'],
     coverage: {
diff --git a/studio/package-lock.json b/studio/package-lock.json
index ae267f6a..17c8340c 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -316,6 +316,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -2045,6 +2046,7 @@
       "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.39.12.tgz",
       "integrity": "sha512-f+/VsHVn/kOA9lltk/GFzuYwVVAKmOnNjxbrhkk3tPHntFqjWeI2TbIXx006YkBkqC10wZ4NsnWXCQiFPeAISQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.5.0",
         "crelt": "^1.0.6",
@@ -2136,6 +2138,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -2158,6 +2161,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -2191,6 +2195,7 @@
       "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
       "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@dnd-kit/accessibility": "^3.1.1",
         "@dnd-kit/utilities": "^3.2.2",
@@ -2246,6 +2251,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
       "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/memoize": "^0.9.0"
       }
@@ -3744,6 +3750,7 @@
       "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
       "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^4.0.0",
         "@octokit/graphql": "^7.1.0",
@@ -3958,6 +3965,7 @@
       "resolved": "https://registry.npmjs.org/@portabletext/editor/-/editor-3.3.18.tgz",
       "integrity": "sha512-K+504jYuodi4b4C+U1SibeHELIBsTDwF30pUZd2IAKp4+avfzpvgX5qKxtPg3aW8z++L3U5Y33ggC9IbJDIVOg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@portabletext/block-tools": "^4.1.11",
         "@portabletext/keyboard-shortcuts": "^2.1.1",
@@ -4128,6 +4136,7 @@
       "resolved": "https://registry.npmjs.org/@portabletext/sanity-bridge/-/sanity-bridge-1.2.14.tgz",
       "integrity": "sha512-Is4ggV86dEMm1XjTJVLswsCeWobJm5E61T9jzm64eyr9d25oVEr9lqskxPuXemap6m9t3lnKDln/Ey/qEaAeCw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@portabletext/schema": "^2.1.0",
         "@sanity/schema": "^4.20.3",
@@ -4204,9 +4213,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.53",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
-      "integrity": "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==",
+      "version": "1.0.0-rc.2",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
+      "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
@@ -4627,6 +4636,7 @@
       "resolved": "https://registry.npmjs.org/@sanity/client/-/client-7.14.1.tgz",
       "integrity": "sha512-lCDx0vuNUgg9FL2E5Hiv1q7u6iHd1Z+jjMZAaYtfzzFPoBKOiyZlaFwqyLVHRyTbwnXQdIGDPmx2AvfBTbGQsQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sanity/eventsource": "^5.0.2",
         "get-it": "^8.7.0",
@@ -5944,6 +5954,7 @@
       "resolved": "https://registry.npmjs.org/@sanity/types/-/types-4.22.0.tgz",
       "integrity": "sha512-VWAUc8Xtj4IipQt99SzudRldJWHfBVnde+g5qnLZ/Nc1MpFjGiRWu/3smRN5mPOqlrtUfrr0ho/fBZnjE1CEMg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sanity/client": "^7.13.2",
         "@sanity/media-library-types": "^1.0.1"
@@ -6576,6 +6587,7 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.0.tgz",
       "integrity": "sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -6597,6 +6609,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
       "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -6713,6 +6726,7 @@
       "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.54.0",
         "@typescript-eslint/types": "8.54.0",
@@ -6997,15 +7011,15 @@
       "license": "Apache-2.0"
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.2.tgz",
-      "integrity": "sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.3.tgz",
+      "integrity": "sha512-NVUnA6gQCl8jfoYqKqQU5Clv0aPw14KkZYCsX6T9Lfu9slI0LOU10OTwFHS/WmptsMMpshNd/1tuWsHQ2Uk+cg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.28.5",
+        "@babel/core": "^7.29.0",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-beta.53",
+        "@rolldown/pluginutils": "1.0.0-rc.2",
         "@types/babel__core": "^7.20.5",
         "react-refresh": "^0.18.0"
       },
@@ -7052,6 +7066,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7682,6 +7697,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -7838,9 +7854,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001766",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
-      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
+      "version": "1.0.30001767",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
+      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -9168,6 +9184,7 @@
       "integrity": "sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -9242,6 +9259,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -10041,9 +10059,9 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.2.tgz",
-      "integrity": "sha512-lSNRzBJk4wuIy0emYQ/nfZ7eWhqud2umPKw2QAQki6uKhZPKm2hRQHeQoHTG9MIvfobb+A/LbEWPJU794ZUKrg==",
+      "version": "12.29.3",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.29.3.tgz",
+      "integrity": "sha512-naVvtFA7IiRTU5n7w7Nj51QFVWu955bU0p9H0gGC4AbhHDQR0TcohoEYwdOZXWEkXrEYNTl95EDOxsjDqn1AvQ==",
       "license": "MIT",
       "dependencies": {
         "motion-dom": "^12.29.2",
@@ -10937,6 +10955,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.23.2"
       }
@@ -12178,6 +12197,7 @@
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.1.0.tgz",
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -12995,12 +13015,12 @@
       "license": "MIT"
     },
     "node_modules/motion": {
-      "version": "12.29.2",
-      "resolved": "https://registry.npmjs.org/motion/-/motion-12.29.2.tgz",
-      "integrity": "sha512-jMpHdAzEDF1QQ055cB+1lOBLdJ6ialVWl6QQzpJI2OvmHequ7zFVHM2mx0HNAy+Tu4omUlApfC+4vnkX0geEOg==",
+      "version": "12.29.3",
+      "resolved": "https://registry.npmjs.org/motion/-/motion-12.29.3.tgz",
+      "integrity": "sha512-susHRkAolcmJQNy7xkV8UJ1DrB2Rg9IDTHnGR2ASXBCzc1L9eC5GVLj08zUU6ZnNLNX6Jb7urD6N0IJjOSGQBQ==",
       "license": "MIT",
       "dependencies": {
-        "framer-motion": "^12.29.2",
+        "framer-motion": "^12.29.3",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
@@ -14226,6 +14246,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14256,6 +14277,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
       "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -14322,7 +14344,8 @@
       "version": "19.2.4",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.4.tgz",
       "integrity": "sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/react-redux": {
       "version": "9.2.0",
@@ -14642,7 +14665,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
@@ -14971,6 +14995,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
       "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -15082,6 +15107,7 @@
       "resolved": "https://registry.npmjs.org/sanity/-/sanity-4.22.0.tgz",
       "integrity": "sha512-wBmr/euVC6Kvni1gKP2qwkEsyxGQlfnPOhjowT7tjm0a0eOvBwS6uHnHtjr24wjhf8PeongurQzMewx2tTP8Wg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@date-fns/tz": "^1.4.1",
         "@dnd-kit/core": "^6.3.1",
@@ -16121,7 +16147,8 @@
       "version": "0.120.0",
       "resolved": "https://registry.npmjs.org/slate/-/slate-0.120.0.tgz",
       "integrity": "sha512-CXK/DADGgMZb4z9RTtXylzIDOxvmNJEF9bXV2bAGkLWhQ3rm7GORY9q0H/W41YJvAGZsLbH7nnrhMYr550hWDQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/slate-dom": {
       "version": "0.119.0",
@@ -16625,6 +16652,7 @@
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.3.8.tgz",
       "integrity": "sha512-Kq/W41AKQloOqKM39zfaMdJ4BcYDw/N5CIq4/GTI0YjU6pKcZ1KKhk6b4du0a+6RA9pIfOP/eu94Ge7cu+PDCA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@emotion/is-prop-valid": "1.4.0",
         "@emotion/unitless": "0.10.0",
@@ -16818,6 +16846,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -17101,6 +17130,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -17457,6 +17487,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -17567,6 +17598,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },