create-nextjs-cms 0.5.99 → 0.5.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextjs-cms",
-  "version": "0.5.99",
+  "version": "0.5.101",
   "private": false,
   "type": "module",
   "bin": {

package/templates/default/app/(auth)/auth/login/LoginPage.tsx

@@ -11,6 +11,8 @@ import { Button } from '@/components/ui/button'
 import { MoonIcon, SunIcon } from '@radix-ui/react-icons'
 import { useTheme } from 'next-themes'
 import { login, useSession } from 'nextjs-cms/auth/react'
+import LoginLocaleDropdown from '@/components/login-locale-dropdown'
+import { useAuthLocale } from '../../auth-locale-provider'
 
 type fromErrors = {
     username?: string | null
@@ -20,13 +22,14 @@ type fromErrors = {
 }
 
 export default function LoginPage() {
+    const { supportedLanguages, fallbackLanguage, initialLocale } = useAuthLocale()
     const t = useI18n()
     const session = useSession()
     const searchParams = useSearchParams()
     const router = useRouter()
     const loginButtonRef = useRef<HTMLButtonElement>(null)
     const formRef = useRef<HTMLFormElement>(null)
-    const { setTheme } = useTheme()
+    const { theme, setTheme } = useTheme()
 
     const handleSubmit = async (event: React.FormEvent<HTMLButtonElement>) => {
         event.preventDefault()
@@ -38,6 +41,7 @@ export default function LoginPage() {
             await login({
                 username: formRef.current?.username.value,
                 password: formRef.current?.password.value,
+                locale: initialLocale,
             })
         } catch (error: any) {
             if (loginButtonRef.current) {
@@ -74,14 +78,19 @@ export default function LoginPage() {
     return (
         <>
             <div className='bg-background text-foreground fixed top-0 left-0 h-full w-full flex-1 flex-col justify-center overflow-auto px-6 py-12 lg:px-8'>
-                <div className='flex w-full'>
+                <div className='flex w-full items-center justify-end gap-2 absolute end-10 top-10'>
+                    <LoginLocaleDropdown
+                        supportedLanguages={supportedLanguages}
+                        fallbackLanguage={fallbackLanguage}
+                        initialLocale={initialLocale}
+                    />
                     <Button
                         variant='default'
                         onClick={() => {
-                            setTheme((theme) => (theme === 'dark' ? 'light' : 'dark'))
+                            setTheme(theme === 'dark' ? 'light' : 'dark')
                         }}
                         type='button'
-                        className='absolute end-10 top-10 rounded-full p-3 focus:outline-hidden'
+                        className='rounded-full p-3 focus:outline-hidden'
                     >
                         <span className='sr-only'>Theme</span>
                         <SunIcon className='hidden transition-all dark:block' aria-hidden='true' />

package/templates/default/app/(auth)/auth/login/page.tsx

@@ -2,7 +2,6 @@ import LoginPage from './LoginPage'
 import auth from 'nextjs-cms/auth'
 import { redirect } from 'next/navigation'
 
-// export const dynamic = 'force-dynamic'
 export default async function Page() {
     const session = await auth()
     if (session) {

package/templates/default/app/(auth)/auth-locale-provider.tsx

@@ -0,0 +1,34 @@
+'use client'
+
+import { createContext, useContext, type ReactNode } from 'react'
+
+export interface AuthLocaleValue {
+    supportedLanguages: readonly string[]
+    fallbackLanguage: string
+    initialLocale: string
+}
+
+const AuthLocaleContext = createContext<AuthLocaleValue | null>(null)
+
+export function AuthLocaleProvider({
+    supportedLanguages,
+    fallbackLanguage,
+    initialLocale,
+    children,
+}: AuthLocaleValue & { children: ReactNode }) {
+    return (
+        <AuthLocaleContext.Provider
+            value={{ supportedLanguages, fallbackLanguage, initialLocale }}
+        >
+            {children}
+        </AuthLocaleContext.Provider>
+    )
+}
+
+export function useAuthLocale(): AuthLocaleValue {
+    const ctx = useContext(AuthLocaleContext)
+    if (!ctx) {
+        throw new Error('useAuthLocale must be used within AuthLocaleProvider')
+    }
+    return ctx
+}

package/templates/default/app/(auth)/layout.tsx

@@ -1,4 +1,5 @@
 import { Inter, Cairo } from 'next/font/google'
+import { cookies } from 'next/headers'
 import '../globals.css'
 import type { Metadata } from 'next'
 import { cn } from '@/lib/utils'
@@ -7,6 +8,9 @@ import Providers from '@/app/providers'
 import auth from 'nextjs-cms/auth'
 import { getCMSConfig } from 'nextjs-cms/core'
 import { I18nProviderClient } from 'nextjs-cms/translations/client'
+import { resolveLocale, RTL_LOCALES, LOCALE_COOKIE_NAME } from 'nextjs-cms/translations'
+import { redirect } from 'next/navigation'
+import { AuthLocaleProvider } from './auth-locale-provider'
 
 const inter = Inter({
     subsets: ['latin'],
@@ -28,9 +32,15 @@ export async function generateMetadata(): Promise<Metadata> {
 
 export default async function RootLayout({ children }: { children: React.ReactNode }) {
     const session = await auth()
+    if (session) {
+        redirect('/')
+    }
     const cmsConfig = await getCMSConfig()
-    const locale = session?.user?.locale ?? 'en'
-    const isRTL = locale === 'ar'
+    const { supportedLanguages, fallbackLanguage } = cmsConfig.i18n
+    const cookieStore = await cookies()
+    const cookieLocale = cookieStore.get(LOCALE_COOKIE_NAME)?.value
+    const locale = resolveLocale(cookieLocale, supportedLanguages, fallbackLanguage)
+    const isRTL = RTL_LOCALES.has(locale)
 
     return (
         <html lang={locale} dir={isRTL ? 'rtl' : 'ltr'} suppressHydrationWarning>
@@ -47,7 +57,13 @@ export default async function RootLayout({ children }: { children: React.ReactNo
                         enableSystem
                         disableTransitionOnChange
                     >
-                        <Providers session={session ?? undefined}>{children}</Providers>
+                        <AuthLocaleProvider
+                            supportedLanguages={supportedLanguages}
+                            fallbackLanguage={fallbackLanguage}
+                            initialLocale={locale}
+                        >
+                            <Providers session={undefined}>{children}</Providers>
+                        </AuthLocaleProvider>
                     </ThemeProvider>
                 </I18nProviderClient>
             </body>

package/templates/default/app/(rootLayout)/layout.tsx

@@ -7,6 +7,7 @@ import Providers from '@/app/providers'
 import auth from 'nextjs-cms/auth'
 import { getCMSConfig } from 'nextjs-cms/core'
 import { I18nProviderClient } from 'nextjs-cms/translations/client'
+import { resolveLocale, RTL_LOCALES } from 'nextjs-cms/translations'
 import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 import Layout from '@/components/Layout'
 
@@ -31,8 +32,9 @@ export async function generateMetadata(): Promise<Metadata> {
 export default async function CMSLayout({ children }: { children: React.ReactNode }) {
     const session = await auth()
     const cmsConfig = await getCMSConfig()
-    const locale = session?.user?.locale ?? 'en'
-    const isRTL = locale === 'ar'
+    const { supportedLanguages, fallbackLanguage } = cmsConfig.i18n
+    const locale = resolveLocale(session?.user?.locale, supportedLanguages, fallbackLanguage)
+    const isRTL = RTL_LOCALES.has(locale)
     await api.navigation.getSidebar.prefetch()
 
     return (

package/templates/default/app/api/auth/route.ts

@@ -4,9 +4,9 @@ import { deleteSession, login } from 'nextjs-cms/auth/actions'
 import { getRequestMetadataFromHeaders, recordLog } from 'nextjs-cms/logging'
 
 export async function POST(request: NextRequest) {
-    const { username, password } = await request.json()
+    const { username, password, locale } = await request.json()
     try {
-        const loginResult = await login({ username, password })
+        const loginResult = await login({ username, password, locale })
         const requestMetadata = getRequestMetadataFromHeaders(request.headers)
 
         await recordLog({

package/templates/default/app/api/submit/section/item/[slug]/route.ts

@@ -1,7 +1,7 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { EditSubmit } from 'nextjs-cms/core/submit'
-import auth from 'nextjs-cms/auth'
-import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
+import { NextRequest, NextResponse } from 'next/server'
+import { EditSubmit } from 'nextjs-cms/core/submit'
+import auth from 'nextjs-cms/auth'
+import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
 
 export async function PUT(request: NextRequest, { params }: { params: Promise<{ slug: string }> }) {
     const session = await auth()
@@ -25,10 +25,10 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
         )
     }
 
-    const user = session.user
-    const formData = await request.formData()
-    const sectionName = formData.get('sectionName') as string | null
-    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
+    const user = session.user
+    const formData = await request.formData()
+    const sectionName = formData.get('sectionName') as string | null
+    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
 
     if (!sectionName) {
         return NextResponse.json(
@@ -39,13 +39,13 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
         )
     }
 
-    const submit = new EditSubmit({
-        itemId: itemId as string,
-        sectionName,
-        user,
-        postData: formData,
-        requestMetadata,
-    })
+    const submit = new EditSubmit({
+        itemId: itemId as string,
+        sectionName,
+        user,
+        postData: formData,
+        requestMetadata,
+    })
 
     await submit.initialize()
     await submit.submit()

package/templates/default/app/api/submit/section/item/route.ts

@@ -1,7 +1,7 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { NewSubmit } from 'nextjs-cms/core/submit'
-import auth from 'nextjs-cms/auth'
-import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
+import { NextRequest, NextResponse } from 'next/server'
+import { NewSubmit } from 'nextjs-cms/core/submit'
+import auth from 'nextjs-cms/auth'
+import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
 
 export async function POST(request: NextRequest) {
     const session = await auth()
@@ -15,10 +15,10 @@ export async function POST(request: NextRequest) {
         )
     }
 
-    const user = session.user
-    const formData = await request.formData()
-    const sectionName = formData.get('sectionName') as string | null
-    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
+    const user = session.user
+    const formData = await request.formData()
+    const sectionName = formData.get('sectionName') as string | null
+    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
 
     if (!sectionName) {
         return NextResponse.json(
@@ -29,12 +29,12 @@ export async function POST(request: NextRequest) {
         )
     }
 
-    const submit = new NewSubmit({
-        sectionName,
-        user,
-        postData: formData,
-        requestMetadata,
-    })
+    const submit = new NewSubmit({
+        sectionName,
+        user,
+        postData: formData,
+        requestMetadata,
+    })
 
     await submit.initialize()
     await submit.submit()

package/templates/default/app/api/submit/section/simple/route.ts

@@ -1,7 +1,7 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { SimpleSectionSubmit } from 'nextjs-cms/core/submit'
-import auth from 'nextjs-cms/auth'
-import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
+import { NextRequest, NextResponse } from 'next/server'
+import { SimpleSectionSubmit } from 'nextjs-cms/core/submit'
+import auth from 'nextjs-cms/auth'
+import { getRequestMetadataFromHeaders } from 'nextjs-cms/logging'
 
 export async function PUT(request: NextRequest) {
     const session = await auth()
@@ -15,10 +15,10 @@ export async function PUT(request: NextRequest) {
         )
     }
 
-    const user = session.user
-    const formData = await request.formData()
-    const sectionName = formData.get('sectionName') as string | null
-    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
+    const user = session.user
+    const formData = await request.formData()
+    const sectionName = formData.get('sectionName') as string | null
+    const requestMetadata = getRequestMetadataFromHeaders(request.headers)
 
     if (!sectionName) {
         return NextResponse.json(
@@ -29,13 +29,13 @@ export async function PUT(request: NextRequest) {
         )
     }
 
-    const submit = new SimpleSectionSubmit({
-        itemId: '1',
-        sectionName,
-        user,
-        postData: formData,
-        requestMetadata,
-    })
+    const submit = new SimpleSectionSubmit({
+        itemId: '1',
+        sectionName,
+        user,
+        postData: formData,
+        requestMetadata,
+    })
 
     await submit.initialize()
     await submit.submit()

package/templates/default/cms.config.ts

@@ -1,4 +1,6 @@
 import type { CMSConfig } from 'nextjs-cms/core/config'
+import en from 'nextjs-cms/translations/dictionaries/en'
+import ar from 'nextjs-cms/translations/dictionaries/ar'
 import process from 'process'
 import { resolve } from 'path'
 
@@ -43,4 +45,8 @@ export const config: CMSConfig = {
             },
         },
     },
+    i18n: {
+        supportedLanguages: { en, ar },
+        fallbackLanguage: 'en',
+    },
 }

package/templates/default/components/Modal.tsx

@@ -1,12 +1,20 @@
 'use client'
 
-import { useEffect, useRef, useState } from 'react'
+import { Suspense, useEffect, useRef, useState } from 'react'
 import useModal from '@/hooks/useModal'
 import classNames from 'classnames'
-import { X } from 'lucide-react'
+import { X, Loader2 } from 'lucide-react'
 
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/custom-dialog'
 
+function ModalLoadingFallback() {
+    return (
+        <div className='flex min-h-[200px] items-center justify-center p-8'>
+            <Loader2 className='h-8 w-8 animate-spin text-muted-foreground' />
+        </div>
+    )
+}
+
 function Modal() {
     const { setModal, modal, modalResponse, setModalResponse } = useModal()
     const [open, setOpen] = useState(false)
@@ -52,9 +60,7 @@ function Modal() {
                     >
                         <div>{modal?.title || ''}</div>
                         <X
-                            className={`absolute ${
-                                modal?.lang === 'ar' ? 'left-5' : 'right-5'
-                            } size-4 cursor-pointer rounded bg-white text-gray-500 hover:opacity-90 md:block lg:size-6`}
+                            className={`absolute end-5 size-6 cursor-pointer rounded bg-white text-gray-500 hover:opacity-90 md:block`}
                             onClick={handleClose}
                             ref={cancelButtonRef}
                         />
@@ -64,7 +70,11 @@ function Modal() {
                     <div className='flex flex-col gap-1'>
                         <div className='w-full overflow-hidden'>
                             <div className='flex w-full flex-col font-semibold'>
-                                <div className='text-foreground w-full'>{modal?.body}</div>
+                                <div className='text-foreground w-full'>
+                                    <Suspense fallback={<ModalLoadingFallback />}>
+                                        {modal?.body}
+                                    </Suspense>
+                                </div>
                                 <div className='w-full'>
                                     {modalResponse && <div className={`w-full p-3`}>{modalResponse.message}</div>}
                                 </div>

package/templates/default/components/Navbar.tsx

@@ -4,6 +4,7 @@ import { MoonIcon, SunIcon, BellIcon, HamburgerMenuIcon } from '@radix-ui/react-
 import { useTheme } from 'next-themes'
 import Link from 'next/link'
 import { useI18n } from 'nextjs-cms/translations/client'
+import { RTL_LOCALES } from 'nextjs-cms/translations'
 import { trpc } from '@/app/_trpc/client'
 import ProtectedImage from '@/components/ProtectedImage'
 import { Spinner } from '@/components/ui/spinner'
@@ -23,6 +24,7 @@ import {
 import { useToast } from '@/components/ui/use-toast'
 import { logout, useSession } from 'nextjs-cms/auth/react'
 import ThemeToggle from './theme-toggle'
+import LocaleDropdown from './locale-dropdown'
 type Props = {
     /**
      * Allows the parent component to modify the state when the
@@ -43,6 +45,8 @@ export default function Navbar(props: Props) {
     const { theme, setTheme } = useTheme()
     const session = useSession()
     const { toast } = useToast()
+    const locale = session?.data?.user?.locale ?? 'en'
+    const isRTL = RTL_LOCALES.has(locale)
     const logsQuery = trpc.logs.list.useQuery(
         {
             limit: 20,
@@ -117,13 +121,20 @@ export default function Navbar(props: Props) {
                                             asChild
                                             className='text-foreground hover:text-foreground/90 cursor-pointer'
                                         >
-                                            <BellIcon className='h-6 w-6' />
+                                            <button
+                                                type='button'
+                                                className='relative flex h-10 items-center justify-center rounded-full focus:outline-hidden'
+                                                aria-label='Notifications'
+                                            >
+                                                <span className='absolute -inset-1.5' />
+                                                <BellIcon className='h-6 w-6' />
+                                            </button>
                                         </DropdownMenuTrigger>
                                         <DropdownMenuContent
-                                            sideOffset={20}
-                                            align='end'
+                                            sideOffset={12}
+                                            align={isRTL ? 'start' : 'end'}
                                             side='bottom'
-                                            alignOffset={-20}
+                                            alignOffset={isRTL ? 20 : -20}
                                             className='w-[400px] max-w-full ring-1 ring-sky-400/80 dark:ring-amber-900'
                                         >
                                             <DropdownMenuLabel>{t('notifications')}</DropdownMenuLabel>
@@ -176,6 +187,7 @@ export default function Navbar(props: Props) {
                                             </Link>
                                         </DropdownMenuContent>
                                     </DropdownMenu>
+                                    <LocaleDropdown />
                                     <ThemeToggle />
                                     {/* Profile dropdown */}
                                     <DropdownMenu>
@@ -183,7 +195,10 @@ export default function Navbar(props: Props) {
                                             asChild
                                             className='relative ms-2 flex max-w-xs cursor-pointer items-center rounded-full bg-gray-800 text-sm hover:ring-3 focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-gray-800 focus:outline-hidden'
                                         >
-                                            <div>
+                                            <button
+                                                type='button'
+                                                className='relative flex h-10 items-center justify-center rounded-full'
+                                            >
                                                 <span className='absolute -inset-1.5' />
                                                 <span className='sr-only'>Open user menu</span>
                                                 {session?.data?.user.image ? (
@@ -200,19 +215,19 @@ export default function Navbar(props: Props) {
                                                 ) : (
                                                     <Image
                                                         src='/blank_avatar.png'
-                                                        height={36}
-                                                        width={36}
+                                                        height={40}
+                                                        width={40}
                                                         alt='profile image'
                                                         className='rounded-full ring-2 ring-amber-300 ring-inset'
                                                     />
                                                 )}
-                                            </div>
+                                            </button>
                                         </DropdownMenuTrigger>
                                         <DropdownMenuContent
                                             sideOffset={12}
-                                            align='end'
+                                            align={isRTL ? 'start' : 'end'}
                                             side='bottom'
-                                            alignOffset={-10}
+                                            alignOffset={isRTL ? 10 : -10}
                                             className='w-56 max-w-full ring-1 ring-sky-400/80 dark:ring-amber-900'
                                         >
                                             <DropdownMenuLabel>{session.data?.user.name}</DropdownMenuLabel>

package/templates/default/components/SelectBox.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import { Check, ChevronsUpDown } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
@@ -28,6 +28,20 @@ export default function SelectBox({
     )
     const [open, setOpen] = useState(false)
 
+    // Update selected item when items or defaultValue changes (e.g., on language change)
+    useEffect(() => {
+        if (defaultValue !== undefined && defaultValue !== null) {
+            const foundItem = items.find((item) => item.value?.toString() === defaultValue.toString())
+            if (foundItem) {
+                setSelected(foundItem)
+            }
+        } else {
+            // If no value is selected, update to the first item (placeholder)
+            // This ensures the placeholder label is updated when language changes
+            setSelected(items[0])
+        }
+    }, [items, defaultValue])
+
     return (
         <div className={cn('relative', classname)}>
             <Popover open={open} onOpenChange={setOpen}>

package/templates/default/components/form/helpers/_section-hot-reload.js

@@ -8,4 +8,4 @@ export const revalidate = 0
 
 // @refresh reset
 
-export const configLastUpdated = 1768909879581
+export const configLastUpdated = 1769510501212

package/templates/default/components/form/inputs/SelectFormInput.tsx

@@ -1,9 +1,10 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, useMemo } from 'react'
 import FormInputElement from '@/components/form/FormInputElement'
 import SelectBox from '@/components/SelectBox'
 import LoadingSpinners from '@/components/LoadingSpinners'
 import { useAutoAnimate } from '@formkit/auto-animate/react'
 import { useI18n } from 'nextjs-cms/translations/client'
+import { useSession } from 'nextjs-cms/auth/react'
 import { trpc } from '@/app/_trpc/client'
 import { SelectFieldClientConfig, SelectOption } from 'nextjs-cms/core/fields'
 import { ConditionalFields } from '@/components/ConditionalFields'
@@ -21,16 +22,23 @@ export default function SelectFormInput({
     level?: number
 }) {
     const t = useI18n()
+    const session = useSession()
+    const locale = session?.data?.user?.locale
+    
     /**
-     * Check and add the select option if it does not exist, the select option has a value of undefined
+     * Create options array with translated placeholder option.
+     * This ensures the placeholder is always up-to-date when the language changes.
      */
-    const exists = input.options?.filter((option) => option.value === undefined)
-    if (!exists || exists.length === 0) {
-        if (input.options) {
-            // @ts-ignore - This is a type-hack to add the placeholder `select` option to the options array
-            input.options.unshift({ value: undefined, label: t('select') })
-        }
-    }
+    const optionsWithPlaceholder = useMemo(() => {
+        if (!input.options) return []
+        
+        // Filter out any existing placeholder options (value === undefined)
+        const optionsWithoutPlaceholder = input.options.filter((option) => option.value !== undefined)
+        
+        // Add the translated placeholder option at the beginning
+        // @ts-ignore - This is a type-hack to add the placeholder `select` option with undefined value
+        return [{ value: undefined, label: t('select') as string }, ...optionsWithoutPlaceholder]
+    }, [input.options, t, locale])
 
     const depth = input.section ? input.section.depth : 1
     const [parent] = useAutoAnimate(/* optional config */)
@@ -127,7 +135,8 @@ export default function SelectFormInput({
                 />
                 <SelectBox
                     defaultValue={value?.value ? value?.value.toString() : undefined}
-                    items={input.options ? input.options : []}
+                    // @ts-ignore - optionsWithPlaceholder includes placeholder with undefined value
+                    items={optionsWithPlaceholder}
                     onChange={(value: SelectOption) => {
                         field.onChange(value.value)
                         if (value) setValue(value)

package/templates/default/components/locale-dropdown.tsx

@@ -0,0 +1,74 @@
+'use client'
+
+import { useCallback, useState } from 'react'
+import { useRouter } from 'next/navigation'
+import { trpc } from '@/app/_trpc/client'
+import { useSession, refreshSession } from 'nextjs-cms/auth/react'
+import { useI18n } from 'nextjs-cms/translations/client'
+import { setLoginPageLocaleCookie } from 'nextjs-cms/translations'
+import { useToast } from '@/components/ui/use-toast'
+import LocalePicker from './locale-picker'
+
+/**
+ * Locale dropdown for the app Navbar (authenticated).
+ * Persists via accountSettings.updateLocale → admins table → auth refresh.
+ * Also writes nextjs-cms-locale cookie so the login page shows the same locale after logout.
+ */
+export default function LocaleDropdown() {
+    const t = useI18n()
+    const router = useRouter()
+    const { toast } = useToast()
+    const { data: session } = useSession()
+    const i18nQuery = trpc.config.getI18n.useQuery()
+    const updateLocale = trpc.accountSettings.updateLocale.useMutation({
+        onSuccess: async (_data, variables) => {
+            setLoginPageLocaleCookie(variables.locale)
+            try {
+                const res = await fetch('/api/auth/refresh', { credentials: 'include' })
+                const data = await res.json()
+                if (res.ok && data.session) {
+                    await refreshSession(data.session)
+                    router.refresh()
+                } else {
+                    router.refresh()
+                }
+            } catch {
+                router.refresh()
+            } finally {
+                setPendingLocale(null)
+            }
+        },
+        onError: () => {
+            setPendingLocale(null)
+            toast({
+                variant: 'destructive',
+                title: t('error'),
+                description: t('somethingWentWrong'),
+            })
+        },
+    })
+    const [pendingLocale, setPendingLocale] = useState<string | null>(null)
+
+    const supported = i18nQuery.data?.supportedLanguages ?? []
+    const currentLocale = session?.user?.locale ?? i18nQuery.data?.fallbackLanguage ?? 'en'
+
+    const handleSelect = useCallback(
+        (locale: string) => {
+            if (locale === currentLocale) return
+            setPendingLocale(locale)
+            updateLocale.mutate({ locale })
+        },
+        [currentLocale, updateLocale],
+    )
+
+    return (
+        <LocalePicker
+            supportedLanguages={supported}
+            currentLocale={currentLocale}
+            onLocaleChange={handleSelect}
+            disabled={updateLocale.isPending}
+            loading={updateLocale.isPending && pendingLocale != null}
+            ariaLabel={t('language')}
+        />
+    )
+}

package/templates/default/components/locale-picker.tsx

@@ -0,0 +1,85 @@
+'use client'
+
+import { Languages } from 'lucide-react'
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { Spinner } from '@/components/ui/spinner'
+import { RTL_LOCALES } from 'nextjs-cms/translations'
+
+const LOCALE_DISPLAY_NAMES: Record<string, string> = {
+    en: 'English',
+    ar: 'العربية',
+}
+
+function displayName(code: string): string {
+    return LOCALE_DISPLAY_NAMES[code] ?? code
+}
+
+export interface LocalePickerProps {
+    supportedLanguages: readonly string[]
+    currentLocale: string
+    onLocaleChange: (locale: string) => void
+    disabled?: boolean
+    loading?: boolean
+    ariaLabel: string
+}
+
+/**
+ * Shared locale dropdown UI. Use in Navbar (app) or Login page.
+ * Parent controls data source and onSelect behavior (tRPC + refresh vs cookie + refresh).
+ */
+export default function LocalePicker({
+    supportedLanguages,
+    currentLocale,
+    onLocaleChange,
+    disabled = false,
+    loading = false,
+    ariaLabel,
+}: LocalePickerProps) {
+    if (supportedLanguages.length < 2) return null
+
+    const isRTL = RTL_LOCALES.has(currentLocale)
+
+    return (
+        <DropdownMenu>
+            <DropdownMenuTrigger
+                asChild
+                className='text-foreground hover:text-foreground/90 relative rounded-full focus:outline-hidden cursor-pointer'
+            >
+                <button
+                    type='button'
+                    className='flex h-10 items-center justify-center'
+                    aria-label={ariaLabel}
+                    disabled={disabled}
+                >
+                    {loading ? (
+                        <Spinner className='size-5' />
+                    ) : (
+                        <Languages className='h-5 w-5' aria-hidden='true' />
+                    )}
+                </button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent
+                align={isRTL ? 'start' : 'end'}
+                sideOffset={12}
+                className='ring-1 ring-sky-400/80 dark:ring-amber-900'
+            >
+                {supportedLanguages.map((code) => (
+                    <DropdownMenuItem
+                        key={code}
+                        onClick={() => onLocaleChange(code)}
+                        disabled={disabled}
+                        className='cursor-pointer'
+                    >
+                        {displayName(code)}
+                        {code === currentLocale ? ' ✓' : ''}
+                    </DropdownMenuItem>
+                ))}
+            </DropdownMenuContent>
+        </DropdownMenu>
+    )
+}

package/templates/default/components/login-locale-dropdown.tsx

@@ -0,0 +1,45 @@
+'use client'
+
+import { useCallback } from 'react'
+import { useRouter } from 'next/navigation'
+import { useI18n } from 'nextjs-cms/translations/client'
+import { setLoginPageLocaleCookie } from 'nextjs-cms/translations'
+import LocalePicker from './locale-picker'
+
+export interface LoginLocaleDropdownProps {
+    supportedLanguages: readonly string[]
+    fallbackLanguage: string
+    initialLocale: string
+}
+
+/**
+ * Locale dropdown for the login page (unauthenticated).
+ * Persists via nextjs-cms-locale cookie; auth layout reads it when no session.
+ */
+export default function LoginLocaleDropdown({
+    supportedLanguages,
+    fallbackLanguage,
+    initialLocale,
+}: LoginLocaleDropdownProps) {
+    const t = useI18n()
+    const router = useRouter()
+    const currentLocale = initialLocale || fallbackLanguage
+
+    const handleSelect = useCallback(
+        (locale: string) => {
+            if (locale === currentLocale) return
+            setLoginPageLocaleCookie(locale)
+            router.refresh()
+        },
+        [currentLocale, router],
+    )
+
+    return (
+        <LocalePicker
+            supportedLanguages={supportedLanguages}
+            currentLocale={currentLocale}
+            onLocaleChange={handleSelect}
+            ariaLabel={t('language')}
+        />
+    )
+}

package/templates/default/components/theme-toggle.tsx

@@ -21,7 +21,7 @@ const ThemeToggle = () => {
                 setTheme(theme === 'dark' ? 'light' : 'dark')
             }}
             type='button'
-            className='text-foreground hover:text-foreground/90 relative rounded-full p-1 focus:outline-hidden'
+            className='text-foreground hover:text-foreground/90 relative flex h-10 items-center justify-center rounded-full focus:outline-hidden cursor-pointer'
         >
             <span className='absolute -inset-1.5' />
             <span className='sr-only'>Theme</span>

package/templates/default/package.json

@@ -24,6 +24,7 @@
     "@radix-ui/react-aspect-ratio": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.1.4",
     "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-direction": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-label": "^2.1.2",
@@ -64,7 +65,7 @@
     "nanoid": "^5.1.2",
     "next": "16.1.1",
     "next-themes": "^0.4.6",
-    "nextjs-cms": "0.5.99",
+    "nextjs-cms": "0.5.101",
     "plaiceholder": "^3.0.0",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "qrcode": "^1.5.4",
@@ -97,7 +98,7 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "fs-extra": "^11.3.3",
-    "nextjs-cms-kit": "0.5.99",
+    "nextjs-cms-kit": "0.5.101",
     "postcss": "^8.5.1",
     "prettier": "3.5.0",
     "raw-loader": "^4.0.2",

package/templates/default/dynamic-schemas/schema.ts

@@ -1,381 +0,0 @@
-import {mysqlTable,int,longtext,mysqlEnum,varchar,boolean,double,timestamp} from 'drizzle-orm/mysql-core'
-
-export const AppInfoTable = mysqlTable('app_info', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    aboutEn: longtext('about_en').notNull(),
-    aboutAr: longtext('about_ar').notNull(),
-    aboutTr: longtext('about_tr').notNull(),
-    privacyEn: longtext('privacy_en').notNull(),
-    privacyAr: longtext('privacy_ar').notNull(),
-    privacyTr: longtext('privacy_tr').notNull()
-});
-
-
-export const UserReportsTable = mysqlTable('user_reports', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    contentType: mysqlEnum('content_type', ['ad', 'user']).notNull(),
-    reportType: mysqlEnum('report_type', ['explicit_content', 'wrong_information', 'no_longer_available', 'user_not_responsive', 'other']).notNull(),
-    contentId: int('content_id').notNull(),
-    catId: int('cat_id').notNull(),
-    userId: int('user_id'),
-    appId: varchar('app_id', { length: 36 }).notNull()
-});
-
-
-export const FeaturedSliderTable = mysqlTable('featured_slider', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    image: varchar('image', { length: 255 }).notNull(),
-    titleEn: varchar('title_en', { length: 255 }).notNull(),
-    titleAr: varchar('title_ar', { length: 255 }).notNull(),
-    titleTr: varchar('title_tr', { length: 255 }).notNull(),
-    descEn: longtext('desc_en').notNull(),
-    descAr: longtext('desc_ar').notNull(),
-    descTr: longtext('desc_tr').notNull()
-});
-
-
-export const MenuSettingsTable = mysqlTable('menu_settings', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    taxRate: varchar('tax_rate', { length: 255 }),
-    hideSlider: boolean('hide_slider')
-});
-
-
-export const ServicesTable = mysqlTable('services', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    price: int('price'),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const RealestateTable = mysqlTable('realestate', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    catId: int('cat_id').notNull(),
-    title: varchar('title', { length: 255 }).notNull(),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    spaceGross: int('space_gross').notNull(),
-    spaceNet: int('space_net').notNull(),
-    latitude: double('latitude').notNull(),
-    longitude: double('longitude').notNull(),
-    roomCount: varchar('room_count', { length: 255 }),
-    buildingAge: varchar('building_age', { length: 255 }),
-    floorCount: varchar('floor_count', { length: 255 }),
-    bathroomCount: varchar('bathroom_count', { length: 255 }),
-    floorLocation: varchar('floor_location', { length: 255 }),
-    heatingType: varchar('heating_type', { length: 255 }),
-    kitchenType: varchar('kitchen_type', { length: 255 }),
-    balcony: boolean('balcony'),
-    lift: boolean('lift'),
-    parkingType: varchar('parking_type', { length: 255 }),
-    furnished: boolean('furnished'),
-    belongsToSite: boolean('belongs_to_site'),
-    siteName: varchar('site_name', { length: 255 }),
-    installments: boolean('installments'),
-    exchangeable: boolean('exchangeable'),
-    fromWhom: varchar('from_whom', { length: 255 }),
-    buildingMembershipFees: int('building_membership_fees'),
-    deposit: int('deposit'),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const HomepageSliderTable = mysqlTable('homepage_slider', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    titleEn: varchar('title_en', { length: 255 }).notNull(),
-    titleAr: varchar('title_ar', { length: 255 }).notNull(),
-    titleTr: varchar('title_tr', { length: 255 }).notNull(),
-    subtitleEn: varchar('subtitle_en', { length: 255 }).notNull(),
-    subtitleAr: varchar('subtitle_ar', { length: 255 }).notNull(),
-    subtitleTr: varchar('subtitle_tr', { length: 255 }).notNull(),
-    photo: varchar('photo', { length: 255 }).notNull(),
-    buttonUrl: varchar('button_url', { length: 255 }),
-    buttonTextEn: varchar('button_text_en', { length: 255 }),
-    buttonTextAr: varchar('button_text_ar', { length: 255 }),
-    buttonTextTr: varchar('button_text_tr', { length: 255 }),
-    buttonUrlTarget: mysqlEnum('button_url_target', ['_blank', '_self'])
-});
-
-
-export const ContestSubscribersTable = mysqlTable('contest_subscribers', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    userId: int('user_id').notNull(),
-    contestId: varchar('contest_id', { length: 255 }).notNull()
-});
-
-
-export const ContestsTable = mysqlTable('contests', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    date: timestamp('date').notNull(),
-    prize: varchar('prize', { length: 255 }).notNull(),
-    winnerId: int('winner_id'),
-    tags: varchar('tags', { length: 255 })
-});
-
-
-export const NotificationsTable = mysqlTable('notifications', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    type: mysqlEnum('type', ['ad_price_updated', 'ad_updated', 'ad_activated', 'ad_pending_review', 'ad_expired', 'ad_rejected', 'ad_viewed', 'ad_favorited', 'ad_shared', 'ad_reported', 'ad_deleted', 'ad_created', 'contest_winner', 'contest_reminder', 'contest_created', 'custom']).notNull(),
-    contentId: int('content_id'),
-    contentCatId: int('content_cat_id'),
-    userId: int('user_id'),
-    message: varchar('message', { length: 255 })
-});
-
-
-export const ModerationTable = mysqlTable('moderation', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    contentType: mysqlEnum('content_type', ['ad', 'user']).notNull(),
-    contentId: int('content_id').notNull(),
-    catId: int('cat_id'),
-    userId: int('user_id').notNull(),
-    flagged: int('flagged').notNull(),
-    result: varchar('result', { length: 255 }).notNull()
-});
-
-
-export const JobsTable = mysqlTable('jobs', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    salary: int('salary'),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    workMethod: varchar('work_method', { length: 255 }).notNull(),
-    minimumEducation: varchar('minimum_education', { length: 255 }).notNull(),
-    experienceLevel: varchar('experience_level', { length: 255 }).notNull(),
-    remote: boolean('remote'),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const FurnitureTable = mysqlTable('furniture', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    condition: varchar('condition', { length: 255 }).notNull(),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    exchangeable: boolean('exchangeable'),
-    fromWhom: varchar('from_whom', { length: 255 }).notNull(),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const FiltersTable = mysqlTable('filters', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    Key: varchar('_key', { length: 255 }).notNull(),
-    fieldName: varchar('field_name', { length: 255 }).notNull(),
-    type: mysqlEnum('type', ['checkbox', 'select', 'text', 'finance', 'number', 'point']).notNull(),
-    tableName: varchar('table_name', { length: 255 }),
-    isMandatory: boolean('is_mandatory')
-});
-
-
-export const FaqTable = mysqlTable('faq', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    qEn: varchar('q_en', { length: 255 }).notNull(),
-    qAr: varchar('q_ar', { length: 255 }).notNull(),
-    qTr: varchar('q_tr', { length: 255 }),
-    aEn: longtext('a_en').notNull(),
-    aAr: longtext('a_ar'),
-    aTr: longtext('a_tr')
-});
-
-
-export const ErrorsTable = mysqlTable('errors', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    caseId: varchar('case_id', { length: 255 }).notNull(),
-    userId: int('user_id'),
-    itemSlug: varchar('item_slug', { length: 255 }),
-    desc: longtext('desc'),
-    isResolved: boolean('is_resolved')
-});
-
-
-export const ElectronicsTable = mysqlTable('electronics', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    condition: varchar('condition', { length: 255 }).notNull(),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    exchangeable: boolean('exchangeable'),
-    installments: boolean('installments'),
-    fromWhom: varchar('from_whom', { length: 255 }).notNull(),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const ClothesTable = mysqlTable('clothes', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    condition: varchar('condition', { length: 255 }).notNull(),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    exchangeable: boolean('exchangeable'),
-    fromWhom: varchar('from_whom', { length: 255 }).notNull(),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const CatsTable = mysqlTable('cats', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    catOrder: int('cat_order').notNull(),
-    slug: varchar('slug', { length: 255 }).notNull(),
-    titleEn: varchar('title_en', { length: 255 }).notNull(),
-    titleAr: varchar('title_ar', { length: 255 }).notNull(),
-    titleTr: varchar('title_tr', { length: 255 }).notNull(),
-    fullTitleEn: varchar('full_title_en', { length: 255 }),
-    fullTitleAr: varchar('full_title_ar', { length: 255 }),
-    fullTitleTr: varchar('full_title_tr', { length: 255 }),
-    image: varchar('image', { length: 255 }),
-    metaDescEn: varchar('meta_desc_en', { length: 255 }),
-    metaDescAr: varchar('meta_desc_ar', { length: 255 }),
-    metaDescTr: varchar('meta_desc_tr', { length: 255 }),
-    filters: varchar('filters', { length: 255 }),
-    tableName: varchar('table_name', { length: 255 }).notNull(),
-    adCount: int('ad_count'),
-    parentId: int('parent_id'),
-    level: int('level')
-});
-
-
-export const CarsTable = mysqlTable('cars', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    modelYear: int('model_year').notNull(),
-    model: varchar('model', { length: 255 }).notNull(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id'),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    condition: varchar('condition', { length: 255 }).notNull(),
-    fromWhom: varchar('from_whom', { length: 255 }).notNull(),
-    engineCapacity: varchar('engine_capacity', { length: 255 }).notNull(),
-    enginePower: varchar('engine_power', { length: 255 }).notNull(),
-    tractionType: varchar('traction_type', { length: 255 }).notNull(),
-    bodyType: varchar('body_type', { length: 255 }).notNull(),
-    gearType: varchar('gear_type', { length: 255 }).notNull(),
-    fuelType: varchar('fuel_type', { length: 255 }).notNull(),
-    exchangeable: boolean('exchangeable'),
-    installments: boolean('installments'),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired'])
-});
-
-
-export const CarsDbTable = mysqlTable('cars_db', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    name: varchar('name', { length: 255 }).notNull(),
-    parentId: int('parent_id'),
-    level: int('level')
-});
-
-
-export const BooksTable = mysqlTable('books', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    title: varchar('title', { length: 255 }).notNull(),
-    catId: int('cat_id').notNull(),
-    condition: varchar('condition', { length: 255 }).notNull(),
-    price: int('price').notNull(),
-    currency: mysqlEnum('currency', ['USD', 'TRY', 'SYP']).notNull(),
-    exchangeable: boolean('exchangeable'),
-    fromWhom: varchar('from_whom', { length: 255 }).notNull(),
-    coverphoto: varchar('coverphoto', { length: 255 }).notNull(),
-    coverphotoPlaceholder: varchar('coverphoto_placeholder', { length: 255 }),
-    desc: longtext('desc'),
-    latitude: double('latitude'),
-    longitude: double('longitude'),
-    viewCount: int('view_count'),
-    status: mysqlEnum('status', ['pending_creation', 'active', 'pending_review', 'rejected', 'expired']),
-    govId: int('gov_id').notNull(),
-    districtId: int('district_id').notNull(),
-    subDistrictId: int('sub_district_id'),
-    townId: int('town_id')
-});
-
-
-export const AddressTable = mysqlTable('address', {
-    id: int('id').autoincrement().notNull().primaryKey(),
-    catOrder: int('cat_order').notNull(),
-    titleEn: varchar('title_en', { length: 255 }).notNull(),
-    titleAr: varchar('title_ar', { length: 255 }).notNull(),
-    titleTr: varchar('title_tr', { length: 255 }).notNull(),
-    image: varchar('image', { length: 255 }),
-    path: varchar('path', { length: 255 }),
-    parentId: int('parent_id'),
-    level: int('level')
-});
-