create-nextjs-cms 0.5.55 → 0.5.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextjs-cms",
-  "version": "0.5.55",
+  "version": "0.5.58",
   "private": false,
   "type": "module",
   "bin": {
@@ -15,7 +15,7 @@
     "chalk": "^5.4.1",
     "commander": "^14.0.2",
     "fs-extra": "^11.3.3",
-    "glob": "^11.0.3",
+    "glob": "^10.4.5",
     "gradient-string": "^3.0.0",
     "js-yaml": "^4.1.1"
   },
@@ -26,9 +26,9 @@
     "prettier": "^3.3.3",
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
-    "@lzcms/tsconfig": "0.1.0",
     "@lzcms/eslint-config": "0.3.0",
-    "@lzcms/prettier-config": "0.1.0"
+    "@lzcms/prettier-config": "0.1.0",
+    "@lzcms/tsconfig": "0.1.0"
   },
   "prettier": "@lzcms/prettier-config",
   "scripts": {

package/templates/default/CHANGELOG.md

@@ -1,140 +1,140 @@
-# cms
-
-## 0.5.17
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.17
-
-## 0.5.16
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.16
-
-## 0.5.15
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.15
-
-## 0.5.14
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.14
-
-## 0.5.13
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.13
-
-## 0.5.12
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.12
-
-## 0.5.11
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.11
-
-## 0.5.10
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.10
-
-## 0.5.9
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.9
-
-## 0.5.8
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.8
-
-## 0.5.7
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.7
-
-## 0.5.6
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.6
-
-## 0.5.5
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.5
-
-## 0.5.4
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.4
-
-## 0.5.3
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.3
-
-## 0.5.2
-
-### Patch Changes
-
-- Updated dependencies
-    - nextjs-cms@0.5.2
-
-## 0.5.1
-
-### Patch Changes
-
-- Improved the create package.
-- Updated dependencies
-    - nextjs-cms@0.5.1
-
-## 0.5.0
-
-### Minor Changes
-
-- ff70c26: Refactored the next-cms to be one package.
-
-    Refactored and optimized all modules inside next-cms.
-
-    Added zod schemas to sections and fields classes and helper functions.
-
-    Added some props to the cms config.
-
-    Introduced unit testing and integration testing. (not done yet)
-
-### Patch Changes
-
-- Updated dependencies [ff70c26]
-    - nextjs-cms@0.5.0
+# cms
+
+## 0.5.17
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.17
+
+## 0.5.16
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.16
+
+## 0.5.15
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.15
+
+## 0.5.14
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.14
+
+## 0.5.13
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.13
+
+## 0.5.12
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.12
+
+## 0.5.11
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.11
+
+## 0.5.10
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.10
+
+## 0.5.9
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.9
+
+## 0.5.8
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.8
+
+## 0.5.7
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.7
+
+## 0.5.6
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.6
+
+## 0.5.5
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.5
+
+## 0.5.4
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.4
+
+## 0.5.3
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.3
+
+## 0.5.2
+
+### Patch Changes
+
+- Updated dependencies
+    - nextjs-cms@0.5.2
+
+## 0.5.1
+
+### Patch Changes
+
+- Improved the create package.
+- Updated dependencies
+    - nextjs-cms@0.5.1
+
+## 0.5.0
+
+### Minor Changes
+
+- ff70c26: Refactored the next-cms to be one package.
+
+    Refactored and optimized all modules inside next-cms.
+
+    Added zod schemas to sections and fields classes and helper functions.
+
+    Added some props to the cms config.
+
+    Introduced unit testing and integration testing. (not done yet)
+
+### Patch Changes
+
+- Updated dependencies [ff70c26]
+    - nextjs-cms@0.5.0

package/templates/default/_gitignore

@@ -19,6 +19,7 @@
 
 # next.js
 /.next/
+/.nextjs-cms/
 
 /out/
 

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

@@ -59,7 +59,10 @@ export default function LoginPage() {
     useEffect(() => {
         if (session?.status === 'authenticated') {
             const from = searchParams.get('callbackUrl')
-            if (from) {
+            /**
+             * Prevent redirect to the same page to prevent infinite loop
+             */
+            if (from && !from.includes('auth/login')) {
                 router.push(from)
             } else {
                 router.push('/')
@@ -69,7 +72,7 @@ export default function LoginPage() {
 
     return (
         <>
-            <div className='fixed left-0 top-0 h-full w-full flex-1 flex-col justify-center overflow-auto bg-background px-6 py-12 text-foreground lg:px-8'>
+            <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'>
                     <Button
                         variant='default'
@@ -85,18 +88,18 @@ export default function LoginPage() {
                     </Button>
                 </div>
                 <div className='text-center sm:mx-auto sm:w-full sm:max-w-sm'>
-                    <span className='bg-gray-800 px-2 font-bold tracking-tighter text-amber-200 ring-1 ring-sky-500 transition-all duration-150 hover:bg-transparent hover:font-normal hover:tracking-[1em] hover:text-foreground hover:ring-0'>
-                        LAZEMNI
+                    <span className='hover:text-foreground bg-gray-800 px-2 font-bold tracking-tighter text-amber-200 ring-1 ring-sky-500 transition-all duration-150 hover:bg-transparent hover:font-normal hover:tracking-[1em] hover:ring-0'>
+                        nextjs-cms
                     </span>
-                    <h2 className='mt-10 text-center text-2xl font-bold leading-9 tracking-tight'>
+                    <h2 className='mt-10 text-center text-2xl leading-9 font-bold tracking-tight'>
                         {getString('login_to_your_account')}
                     </h2>
                 </div>
 
-                <div className='mx-auto mt-10 w-full max-w-md rounded-lg bg-linear-to-bl from-sky-50 to-green-50 p-12 shadow-lg ring-2 ring-inset ring-sky-400 dark:from-neutral-950 dark:to-neutral-800'>
+                <div className='mx-auto mt-10 w-full max-w-md rounded-lg bg-linear-to-bl from-sky-50 to-green-50 p-12 shadow-lg ring-2 ring-sky-400 ring-inset dark:from-neutral-950 dark:to-neutral-800'>
                     <form ref={formRef} className='space-y-6'>
                         <div>
-                            <label htmlFor='username' className='block text-sm font-medium leading-6'>
+                            <label htmlFor='username' className='block text-sm leading-6 font-medium'>
                                 {getString('username')}
                             </label>
                             <div>
@@ -106,13 +109,13 @@ export default function LoginPage() {
                                     type='text'
                                     placeholder={getString('username')}
                                     required
-                                    className='block w-full rounded-md border-0 bg-background p-3 text-foreground shadow-xs outline-0 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6'
+                                    className='bg-background text-foreground block w-full rounded-md border-0 p-3 shadow-xs ring-1 ring-gray-300 outline-0 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-indigo-600 focus:ring-inset sm:text-sm sm:leading-6'
                                 />
                             </div>
                         </div>
 
                         <div>
-                            <label htmlFor='password' className='block text-sm font-medium leading-6'>
+                            <label htmlFor='password' className='block text-sm leading-6 font-medium'>
                                 {getString('password')}
                             </label>
                             <div>
@@ -122,7 +125,7 @@ export default function LoginPage() {
                                     type='password'
                                     placeholder={getString('password')}
                                     required
-                                    className='block w-full rounded-md border-0 bg-background p-3 text-foreground shadow-xs outline-0 ring-1 ring-inset ring-sky-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6'
+                                    className='bg-background text-foreground block w-full rounded-md border-0 p-3 shadow-xs ring-1 ring-sky-300 outline-0 ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-indigo-600 focus:ring-inset sm:text-sm sm:leading-6'
                                 />
                             </div>
                             <div className='mt-2 text-end'>
@@ -150,7 +153,7 @@ export default function LoginPage() {
                                 ref={loginButtonRef}
                                 onClick={handleSubmit}
                                 type='submit'
-                                className='flex w-full justify-center rounded-md bg-linear-to-r from-green-400 to-blue-500 font-extrabold hover:to-sky-400 focus-visible:outline-solid focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'
+                                className='flex w-full justify-center rounded-md bg-linear-to-r from-green-400 to-blue-500 font-extrabold hover:to-sky-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 focus-visible:outline-solid'
                             >
                                 {getString('login')}
                             </Button>

package/templates/default/app/(rootLayout)/admins/page.tsx

@@ -1,5 +1,10 @@
 import AdminsPage from '@/components/AdminsPage'
-// export const dynamic = 'force-dynamic'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 export default async function Page() {
-    return <AdminsPage />
+    await api.admins.list.prefetch()
+    return (
+        <HydrateClient>
+            <AdminsPage />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/advanced/page.tsx

@@ -1,5 +1,11 @@
 import AdvancedSettingsPage from '@/components/AdvancedSettingsPage'
-// export const dynamic = 'force-dynamic'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 export default async function Page() {
-    return <AdvancedSettingsPage />
+    await api.cmsSettings.get.prefetch()
+
+    return (
+        <HydrateClient>
+            <AdvancedSettingsPage />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/browse/[section]/[page]/page.tsx

@@ -1,7 +1,21 @@
 import BrowsePage from '@/components/BrowsePage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 type Params = Promise<{ section: string; page: string }>
-
-export default async function Page(props: { params: Params }) {
+type SearchParams = Promise<{ q: string | undefined }>
+export default async function Page(props: { params: Params; searchParams: SearchParams }) {
     const params = await props.params
-    return <BrowsePage page={params.page} section={params.section} />
+    const searchParams = await props.searchParams
+    const { q } = searchParams
+    const { section, page } = params
+    await api.hasItemsSections.listItems.prefetch({
+        sectionName: section,
+        page: parseInt(page) ?? 1,
+        q: q ?? '',
+    })
+
+    return (
+        <HydrateClient>
+            <BrowsePage page={params.page} section={params.section} />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/categorized/[section]/page.tsx

@@ -1,7 +1,15 @@
 import CategorizedSectionPage from '@/components/CategorizedSectionPage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 type Params = Promise<{ section: string }>
 
 export default async function Page(props: { params: Params }) {
     const params = await props.params
-    return <CategorizedSectionPage section={params.section} />
+    await api.categorySections.get.prefetch({
+        sectionName: params.section,
+    })
+    return (
+        <HydrateClient>
+            <CategorizedSectionPage section={params.section} />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/dashboard-new/page.tsx

@@ -0,0 +1,7 @@
+import DashboardNewPage from '@/components/DashboardNewPage'
+
+export const dynamic = 'force-dynamic'
+
+export default async function Page() {
+    return <DashboardNewPage />
+}

package/templates/default/app/(rootLayout)/edit/[section]/[itemId]/page.tsx

@@ -1,7 +1,17 @@
 import ItemEditPage from '@/components/ItemEditPage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 type Params = Promise<{ section: string; itemId: string }>
 
 export default async function Page(props: { params: Params }) {
     const params = await props.params
-    return <ItemEditPage sectionType='has_items' section={params.section} itemId={params.itemId} />
+    await api.hasItemsSections.editItem.prefetch({
+        sectionName: params.section,
+        sectionItemId: params.itemId,
+    })
+
+    return (
+        <HydrateClient>
+            <ItemEditPage sectionType='has_items' section={params.section} itemId={params.itemId} />
+        </HydrateClient>
+    )
 }

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

@@ -1,5 +1,12 @@
 import Layout from '@/components/Layout'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 
 export default async function CMSLayout({ children }: { children: React.ReactNode }) {
-    return <Layout>{children}</Layout>
+    await api.navigation.getSidebar.prefetch()
+
+    return (
+        <HydrateClient>
+            <Layout>{children}</Layout>
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/new/[section]/page.tsx

@@ -1,7 +1,15 @@
 import NewPage from '@/components/NewPage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 type Params = Promise<{ section: string }>
 
 export default async function Page(props: { params: Params }) {
     const params = await props.params
-    return <NewPage sectionType='has_items' section={params.section} />
+    await api.hasItemsSections.newItem.prefetch({
+        sectionName: params.section,
+    })
+    return (
+        <HydrateClient>
+            <NewPage sectionType='has_items' section={params.section} />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/section/[section]/page.tsx

@@ -1,7 +1,16 @@
 import SectionPage from '@/components/SectionPage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 type Params = Promise<{ section: string }>
 
 export default async function Page(props: { params: Params }) {
     const params = await props.params
-    return <SectionPage section={params.section} />
+    await api.simpleSections.create.prefetch({
+        sectionName: params.section,
+    })
+
+    return (
+        <HydrateClient>
+            <SectionPage section={params.section} />
+        </HydrateClient>
+    )
 }

package/templates/default/app/(rootLayout)/settings/page.tsx

@@ -1,7 +1,13 @@
 import SettingsPage from '@/components/SettingsPage'
+import { api, HydrateClient } from 'nextjs-cms/api/trpc/server'
 
 export const dynamic = 'force-dynamic'
 
 export default async function Page() {
-    return <SettingsPage />
+    await api.accountSettings.get.prefetch()
+    return (
+        <HydrateClient>
+            <SettingsPage />
+        </HydrateClient>
+    )
 }

package/templates/default/app/api/trpc/[trpc]/route.ts

@@ -9,7 +9,7 @@ import { NextRequest } from 'next/server'
 
 const context = async (req: NextRequest) => {
     return createTRPCContext({
-        req: req,
+        headers: req.headers,
     })
 }
 

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

@@ -45,7 +45,7 @@ export async function GET(request: NextRequest) {
         )
     }
 
-    const uploadsFolder: string = getCMSConfig().media.upload.path
+    const uploadsFolder: string = (await getCMSConfig()).media.upload.path
 
     // Sanitize the inputs
     const sanitizedFolder = sanitizeFolderOrFileName(sectionName)

package/templates/default/app/layout.tsx

@@ -4,10 +4,11 @@ import type { Metadata } from 'next'
 import { cn } from '@/lib/utils'
 import { ThemeProvider } from '@/components/ThemeProvider'
 import Providers from '@/app/providers'
+import auth from 'nextjs-cms/auth'
 
 export const metadata: Metadata = {
-    title: 'LAZEMNI CMS',
-    description: 'LAZEMNI CMS',
+    title: 'nextjs-cms',
+    description: 'nextjs-cms',
 }
 
 const inter = Inter({
@@ -16,11 +17,12 @@ const inter = Inter({
 })
 
 export default async function RootLayout({ children }: { children: React.ReactNode }) {
+    const session = await auth()
     return (
         <html lang='en' suppressHydrationWarning>
             <body className={cn('bg-background min-h-screen font-sans antialiased', inter.variable)}>
                 <ThemeProvider attribute='class' defaultTheme='dark' enableSystem disableTransitionOnChange>
-                    <Providers>{children}</Providers>
+                    <Providers session={session ?? undefined}>{children}</Providers>
                 </ThemeProvider>
             </body>
         </html>