create-nextjs-cms 0.6.2 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextjs-cms",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "private": false,
   "type": "module",
   "bin": {
@@ -29,8 +29,8 @@
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
     "@lzcms/eslint-config": "0.3.0",
-    "@lzcms/prettier-config": "0.1.0",
-    "@lzcms/tsconfig": "0.1.0"
+    "@lzcms/tsconfig": "0.1.0",
+    "@lzcms/prettier-config": "0.1.0"
   },
   "prettier": "@lzcms/prettier-config",
   "scripts": {

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

@@ -11,6 +11,7 @@ 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 { wasLocaleChangedOnLogin } from 'nextjs-cms/translations'
 import LoginLocaleDropdown from '@/components/login-locale-dropdown'
 import { useAuthLocale } from '../../auth-locale-provider'
 
@@ -38,10 +39,13 @@ export default function LoginPage() {
             loginButtonRef.current.innerHTML = t('loading')
         }
         try {
+            // Only send locale if user explicitly changed it on login page
+            // Otherwise, server will use admin's stored DB preference
+            const localeChanged = wasLocaleChangedOnLogin()
             await login({
                 username: formRef.current?.username.value,
                 password: formRef.current?.password.value,
-                locale: initialLocale,
+                locale: localeChanged ? initialLocale : undefined,
             })
         } catch (error: any) {
             if (loginButtonRef.current) {

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

@@ -54,7 +54,7 @@ export default async function CMSLayout({ children }: { children: React.ReactNod
                     >
                         <Providers session={session ?? undefined}>
                         <HydrateClient>
-                            <Layout logoUrlPath={cmsConfig.ui.logo} logoText={cmsConfig.ui.logoText}>
+                            <Layout logoUrlPath={cmsConfig.ui.logo} logoText={cmsConfig.ui.logoText} isRTL={isRTL}>
                                 {children}
                             </Layout>
                         </HydrateClient>

package/templates/default/cms.config.ts

@@ -4,10 +4,7 @@ import ar from 'nextjs-cms/translations/dictionaries/ar'
 import process from 'process'
 import { resolve } from 'path'
 
-export const config: CMSConfig = {
-    dashboard: {
-        override: '/cpanel-dashboard',
-    },
+export const config: CMSConfig = {
         title: 'NEXTJS CMS',
         defaultTheme: 'dark',
     },

package/templates/default/components/AdminCard.tsx

@@ -11,13 +11,12 @@ import { Button } from '@/components/ui/button'
 import { trpc } from '@/app/_trpc/client'
 import Image from 'next/image'
 import type { RouterOutputs } from 'nextjs-cms/api'
-
 export default function AdminCard({
     admin,
     action,
 }: {
-    admin: RouterOutputs['admins']['list']['admins'][0]
-    action: any
+    admin: NonNullable<RouterOutputs['admins']['list']['admins']>[number]
+    action: () => void
 }) {
     const t = useI18n()
     const { setModal, modal, modalResponse, setModalResponse } = useModal()

package/templates/default/components/AdminPrivilegeCard.tsx

@@ -16,7 +16,7 @@ export default function AdminRoleCard({
         publisher: false,
     }
 }: {
-    privilege: RouterOutputs['admins']['list']['privileges'][0]
+    privilege: NonNullable<RouterOutputs['admins']['list']['privileges']>[number]
     allChecked: boolean | 'edited' | null
     setAllChecked: React.Dispatch<React.SetStateAction<boolean | 'edited' | null>>
     defaultValue?: {

package/templates/default/components/Layout.tsx

@@ -13,10 +13,12 @@ function Layout({
     children,
     logoUrlPath,
     logoText,
+    isRTL,
 }: {
     children: React.ReactNode
     logoUrlPath: string
     logoText: string
+    isRTL: boolean
 }) {
     const [showMobileSidebar, setShowMobileSidebar] = useState(false)
     const session = useSession({
@@ -44,6 +46,7 @@ function Layout({
                             mobileSidebar={showMobileSidebar}
                             logoUrlPath={logoUrlPath}
                             logoText={logoText}
+                            isRTL={isRTL}
                         />
                         {showMobileSidebar && (
                             // Display a black transparent div to close the sidebar when clicked outside
@@ -55,7 +58,8 @@ function Layout({
                         <div
                             className={classNames({
                                 'transition-all duration-100 ease-in-out': true,
-                                'float-right rtl:float-left': true,
+                                'float-right': !isRTL,
+                                'float-left': isRTL,
                                 'w-full md:w-[calc(100%-275px)]': true,
                             })}
                         >

package/templates/default/components/Sidebar.tsx

@@ -12,7 +12,7 @@ import { trpc } from '@/app/_trpc/client'
 import { useToast } from '@/components/ui/use-toast'
 import { logout, useSession } from 'nextjs-cms/auth/react'
 
-const Sidebar = (props: SidebarProps & { logoUrlPath: string; logoText: string }) => {
+const Sidebar = (props: SidebarProps & { logoUrlPath: string; logoText: string; isRTL: boolean }) => {
     const t = useI18n()
     const session = useSession()
     const [navItems] = trpc.navigation.getSidebar.useSuspenseQuery()
@@ -30,7 +30,6 @@ const Sidebar = (props: SidebarProps & { logoUrlPath: string; logoText: string }
             })
         }
     }
-    const isRTL = session?.data?.user?.locale === 'ar'
     return (
         <div
             className={classNames({
@@ -39,12 +38,14 @@ const Sidebar = (props: SidebarProps & { logoUrlPath: string; logoText: string }
                 'transition-all duration-100 ease-in-out': true,
                 'w-[300px] md:w-[275px]': true,
                 // LTR: sidebar on left, slides in from left
-                'left-0 md:translate-x-0': true,
-                '-translate-x-full': !props.mobileSidebar,
+                'left-0': !props.isRTL,
+                'md:translate-x-0': !props.isRTL,
+                '-translate-x-full': !props.isRTL && !props.mobileSidebar,
                 // RTL: sidebar on right, slides in from right
-                'rtl:left-auto rtl:right-0': true,
-                'rtl:translate-x-full rtl:md:translate-x-0': !props.mobileSidebar,
-                'rtl:translate-x-0': props.mobileSidebar,
+                'right-0': props.isRTL,
+                'translate-x-full md:translate-x-0': props.isRTL && !props.mobileSidebar,
+                // Mobile sidebar shown (both LTR and RTL)
+                'translate-x-0': props.mobileSidebar,
             })}
         >
             <div
@@ -64,7 +65,7 @@ const Sidebar = (props: SidebarProps & { logoUrlPath: string; logoText: string }
                         {props.logoText}
                     </span>
                 </div>
-                <ScrollArea dir={isRTL ? 'rtl' : 'ltr'} type='always' className='grow'>
+                <ScrollArea dir={props.isRTL ? 'rtl' : 'ltr'} type='always' className='grow'>
                     <ul
                         className={classNames({
                             'my-2 flex flex-col items-stretch gap-2': true,

package/templates/default/components/SidebarDropdownItem.tsx

@@ -28,7 +28,7 @@ export default function SidebarDropdownItem({ item, closeSideBar }: SidebarItemP
                         {open ? (
                             <ChevronUpIcon className='h-5 w-5' />
                         ) : (
-                            <ChevronDownIcon className='h-5 w-5 rtl:rotate-0' />
+                            <ChevronDownIcon className='h-5 w-5' />
                         )}
                     </span>
                 </li>

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

@@ -8,4 +8,4 @@ export const revalidate = 0
 
 // @refresh reset
 
-export const configLastUpdated = 1769812496863
+export const configLastUpdated = 1769902638411

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

@@ -3,7 +3,7 @@
 import { useCallback } from 'react'
 import { useRouter } from 'next/navigation'
 import { useI18n } from 'nextjs-cms/translations/client'
-import { setLoginPageLocaleCookie } from 'nextjs-cms/translations'
+import { setLoginPageLocaleCookie, markLocaleChangedOnLogin } from 'nextjs-cms/translations'
 import LocalePicker from './locale-picker'
 
 export interface LoginLocaleDropdownProps {
@@ -29,6 +29,7 @@ export default function LoginLocaleDropdown({
         (locale: string) => {
             if (locale === currentLocale) return
             setLoginPageLocaleCookie(locale)
+            markLocaleChangedOnLogin()
             router.refresh()
         },
         [currentLocale, router],

package/templates/default/components/ui/badge.tsx

@@ -12,6 +12,7 @@ const badgeVariants = cva(
                 default: 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
                 primary: 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
                 secondary: 'border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90',
+                success: 'border-transparent bg-green-500 text-white [a&]:hover:bg-green-600',
                 destructive:
                     'border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60',
                 outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground',

package/templates/default/package.json

@@ -65,7 +65,7 @@
     "nanoid": "^5.1.2",
     "next": "16.1.1",
     "next-themes": "^0.4.6",
-    "nextjs-cms": "0.6.2",
+    "nextjs-cms": "0.6.4",
     "plaiceholder": "^3.0.0",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "qrcode": "^1.5.4",
@@ -98,7 +98,7 @@
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "fs-extra": "^11.3.3",
-    "nextjs-cms-kit": "0.6.2",
+    "nextjs-cms-kit": "0.6.4",
     "postcss": "^8.5.1",
     "prettier": "3.5.0",
     "raw-loader": "^4.0.2",