create-nextjs-cms 0.8.9 → 0.9.0

package/templates/default/components/ui/use-toast.ts

@@ -1,188 +1,188 @@
-// Inspired by react-hot-toast library
-import * as React from 'react'
-
-import type { ToastActionElement, ToastProps } from '@/components/ui/toast'
-
-const TOAST_LIMIT = 1
-const TOAST_REMOVE_DELAY = 1000000
-
-type ToasterToast = ToastProps & {
-    id: string
-    title?: React.ReactNode
-    description?: React.ReactNode
-    action?: ToastActionElement
-}
-
-const actionTypes = {
-    ADD_TOAST: 'ADD_TOAST',
-    UPDATE_TOAST: 'UPDATE_TOAST',
-    DISMISS_TOAST: 'DISMISS_TOAST',
-    REMOVE_TOAST: 'REMOVE_TOAST',
-} as const
-
-let count = 0
-
-function genId() {
-    count = (count + 1) % Number.MAX_SAFE_INTEGER
-    return count.toString()
-}
-
-type ActionType = typeof actionTypes
-
-type Action =
-    | {
-          type: ActionType['ADD_TOAST']
-          toast: ToasterToast
-      }
-    | {
-          type: ActionType['UPDATE_TOAST']
-          toast: Partial<ToasterToast>
-      }
-    | {
-          type: ActionType['DISMISS_TOAST']
-          toastId?: ToasterToast['id']
-      }
-    | {
-          type: ActionType['REMOVE_TOAST']
-          toastId?: ToasterToast['id']
-      }
-
-interface State {
-    toasts: ToasterToast[]
-}
-
-const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
-
-const addToRemoveQueue = (toastId: string) => {
-    if (toastTimeouts.has(toastId)) {
-        return
-    }
-
-    const timeout = setTimeout(() => {
-        // eslint-disable-next-line drizzle/enforce-delete-with-where
-        toastTimeouts.delete(toastId)
-        dispatch({
-            type: 'REMOVE_TOAST',
-            toastId: toastId,
-        })
-    }, TOAST_REMOVE_DELAY)
-
-    toastTimeouts.set(toastId, timeout)
-}
-
-export const reducer = (state: State, action: Action): State => {
-    switch (action.type) {
-        case 'ADD_TOAST':
-            return {
-                ...state,
-                toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
-            }
-
-        case 'UPDATE_TOAST':
-            return {
-                ...state,
-                toasts: state.toasts.map((t) => (t.id === action.toast.id ? { ...t, ...action.toast } : t)),
-            }
-
-        case 'DISMISS_TOAST': {
-            const { toastId } = action
-
-            // ! Side effects ! - This could be extracted into a dismissToast() action,
-            // but I'll keep it here for simplicity
-            if (toastId) {
-                addToRemoveQueue(toastId)
-            } else {
-                state.toasts.forEach((toast) => {
-                    addToRemoveQueue(toast.id)
-                })
-            }
-
-            return {
-                ...state,
-                toasts: state.toasts.map((t) =>
-                    t.id === toastId || toastId === undefined
-                        ? {
-                              ...t,
-                              open: false,
-                          }
-                        : t,
-                ),
-            }
-        }
-        case 'REMOVE_TOAST':
-            if (action.toastId === undefined) {
-                return {
-                    ...state,
-                    toasts: [],
-                }
-            }
-            return {
-                ...state,
-                toasts: state.toasts.filter((t) => t.id !== action.toastId),
-            }
-    }
-}
-
-const listeners: Array<(state: State) => void> = []
-
-let memoryState: State = { toasts: [] }
-
-function dispatch(action: Action) {
-    memoryState = reducer(memoryState, action)
-    listeners.forEach((listener) => {
-        listener(memoryState)
-    })
-}
-
-type Toast = Omit<ToasterToast, 'id'>
-
-function toast({ ...props }: Toast) {
-    const id = genId()
-
-    const update = (props: ToasterToast) =>
-        dispatch({
-            type: 'UPDATE_TOAST',
-            toast: { ...props, id },
-        })
-    const dismiss = () => dispatch({ type: 'DISMISS_TOAST', toastId: id })
-
-    dispatch({
-        type: 'ADD_TOAST',
-        toast: {
-            ...props,
-            id,
-            open: true,
-            onOpenChange: (open) => {
-                if (!open) dismiss()
-            },
-        },
-    })
-
-    return {
-        id: id,
-        dismiss,
-        update,
-    }
-}
-
-function useToast() {
-    const [state, setState] = React.useState<State>(memoryState)
-
-    React.useEffect(() => {
-        listeners.push(setState)
-        return () => {
-            const index = listeners.indexOf(setState)
-            if (index > -1) {
-                listeners.splice(index, 1)
-            }
-        }
-    }, [state])
-
-    return {
-        ...state,
-        toast,
-        dismiss: (toastId?: string) => dispatch({ type: 'DISMISS_TOAST', toastId }),
-    }
-}
-
-export { useToast, toast }
+// Inspired by react-hot-toast library
+import * as React from 'react'
+
+import type { ToastActionElement, ToastProps } from '@/components/ui/toast'
+
+const TOAST_LIMIT = 1
+const TOAST_REMOVE_DELAY = 1000000
+
+type ToasterToast = ToastProps & {
+    id: string
+    title?: React.ReactNode
+    description?: React.ReactNode
+    action?: ToastActionElement
+}
+
+const actionTypes = {
+    ADD_TOAST: 'ADD_TOAST',
+    UPDATE_TOAST: 'UPDATE_TOAST',
+    DISMISS_TOAST: 'DISMISS_TOAST',
+    REMOVE_TOAST: 'REMOVE_TOAST',
+} as const
+
+let count = 0
+
+function genId() {
+    count = (count + 1) % Number.MAX_SAFE_INTEGER
+    return count.toString()
+}
+
+type ActionType = typeof actionTypes
+
+type Action =
+    | {
+          type: ActionType['ADD_TOAST']
+          toast: ToasterToast
+      }
+    | {
+          type: ActionType['UPDATE_TOAST']
+          toast: Partial<ToasterToast>
+      }
+    | {
+          type: ActionType['DISMISS_TOAST']
+          toastId?: ToasterToast['id']
+      }
+    | {
+          type: ActionType['REMOVE_TOAST']
+          toastId?: ToasterToast['id']
+      }
+
+interface State {
+    toasts: ToasterToast[]
+}
+
+const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
+
+const addToRemoveQueue = (toastId: string) => {
+    if (toastTimeouts.has(toastId)) {
+        return
+    }
+
+    const timeout = setTimeout(() => {
+        // eslint-disable-next-line drizzle/enforce-delete-with-where
+        toastTimeouts.delete(toastId)
+        dispatch({
+            type: 'REMOVE_TOAST',
+            toastId: toastId,
+        })
+    }, TOAST_REMOVE_DELAY)
+
+    toastTimeouts.set(toastId, timeout)
+}
+
+export const reducer = (state: State, action: Action): State => {
+    switch (action.type) {
+        case 'ADD_TOAST':
+            return {
+                ...state,
+                toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
+            }
+
+        case 'UPDATE_TOAST':
+            return {
+                ...state,
+                toasts: state.toasts.map((t) => (t.id === action.toast.id ? { ...t, ...action.toast } : t)),
+            }
+
+        case 'DISMISS_TOAST': {
+            const { toastId } = action
+
+            // ! Side effects ! - This could be extracted into a dismissToast() action,
+            // but I'll keep it here for simplicity
+            if (toastId) {
+                addToRemoveQueue(toastId)
+            } else {
+                state.toasts.forEach((toast) => {
+                    addToRemoveQueue(toast.id)
+                })
+            }
+
+            return {
+                ...state,
+                toasts: state.toasts.map((t) =>
+                    t.id === toastId || toastId === undefined
+                        ? {
+                              ...t,
+                              open: false,
+                          }
+                        : t,
+                ),
+            }
+        }
+        case 'REMOVE_TOAST':
+            if (action.toastId === undefined) {
+                return {
+                    ...state,
+                    toasts: [],
+                }
+            }
+            return {
+                ...state,
+                toasts: state.toasts.filter((t) => t.id !== action.toastId),
+            }
+    }
+}
+
+const listeners: Array<(state: State) => void> = []
+
+let memoryState: State = { toasts: [] }
+
+function dispatch(action: Action) {
+    memoryState = reducer(memoryState, action)
+    listeners.forEach((listener) => {
+        listener(memoryState)
+    })
+}
+
+type Toast = Omit<ToasterToast, 'id'>
+
+function toast({ ...props }: Toast) {
+    const id = genId()
+
+    const update = (props: ToasterToast) =>
+        dispatch({
+            type: 'UPDATE_TOAST',
+            toast: { ...props, id },
+        })
+    const dismiss = () => dispatch({ type: 'DISMISS_TOAST', toastId: id })
+
+    dispatch({
+        type: 'ADD_TOAST',
+        toast: {
+            ...props,
+            id,
+            open: true,
+            onOpenChange: (open) => {
+                if (!open) dismiss()
+            },
+        },
+    })
+
+    return {
+        id: id,
+        dismiss,
+        update,
+    }
+}
+
+function useToast() {
+    const [state, setState] = React.useState<State>(memoryState)
+
+    React.useEffect(() => {
+        listeners.push(setState)
+        return () => {
+            const index = listeners.indexOf(setState)
+            if (index > -1) {
+                listeners.splice(index, 1)
+            }
+        }
+    }, [state])
+
+    return {
+        ...state,
+        toast,
+        dismiss: (toastId?: string) => dispatch({ type: 'DISMISS_TOAST', toastId }),
+    }
+}
+
+export { useToast, toast }

package/templates/default/components.json

@@ -1,21 +1,21 @@
-{
-    "$schema": "https://ui.shadcn.com/schema.json",
-    "style": "new-york",
-    "rsc": true,
-    "tsx": true,
-    "tailwind": {
-        "config": "",
-        "prefix": "",
-        "css": "styles/globals.css",
-        "baseColor": "slate",
-        "cssVariables": true
-    },
-    "aliases": {
-        "components": "@/components",
-        "utils": "@/lib/utils",
-        "ui": "@/components/ui",
-        "lib": "@/lib",
-        "hooks": "@/hooks"
-    },
-    "iconLibrary": "lucide"
-}
+{
+    "$schema": "https://ui.shadcn.com/schema.json",
+    "style": "new-york",
+    "rsc": true,
+    "tsx": true,
+    "tailwind": {
+        "config": "",
+        "prefix": "",
+        "css": "styles/globals.css",
+        "baseColor": "slate",
+        "cssVariables": true
+    },
+    "aliases": {
+        "components": "@/components",
+        "utils": "@/lib/utils",
+        "ui": "@/components/ui",
+        "lib": "@/lib",
+        "hooks": "@/hooks"
+    },
+    "iconLibrary": "lucide"
+}

package/templates/default/context/ModalProvider.tsx

@@ -1,53 +1,53 @@
-'use client'
-
-import React, { createContext, useState } from 'react'
-
-export type ModalResponse = {
-    message: React.ReactNode | string
-    messageColor?: string
-    borderColor?: string
-    bgColor?: string
-}
-
-export type Modal = {
-    title: string
-    titleColor: string
-    headerColor: string
-    body: React.ReactNode
-    lang: string
-    size?: 'sm' | 'md' | 'lg' | 'xl'
-}
-
-const ModalContext = createContext<{
-    modal: Modal | null
-    setModal: React.Dispatch<React.SetStateAction<Modal | null>>
-    modalResponse: ModalResponse | null
-    setModalResponse: React.Dispatch<React.SetStateAction<ModalResponse | null>>
-}>(
-    {} as {
-        modal: Modal | null
-        setModal: React.Dispatch<React.SetStateAction<Modal | null>>
-        modalResponse: ModalResponse | null
-        setModalResponse: React.Dispatch<React.SetStateAction<ModalResponse | null>>
-    },
-)
-
-export const ModalProvider = ({ children }: { children: React.ReactNode }) => {
-    const [modal, setModal] = useState<Modal | null>(null)
-    const [modalResponse, setModalResponse] = useState<ModalResponse | null>(null)
-
-    return (
-        <ModalContext.Provider
-            value={{
-                modal,
-                setModal,
-                modalResponse,
-                setModalResponse,
-            }}
-        >
-            {children}
-        </ModalContext.Provider>
-    )
-}
-
-export default ModalContext
+'use client'
+
+import React, { createContext, useState } from 'react'
+
+export type ModalResponse = {
+    message: React.ReactNode | string
+    messageColor?: string
+    borderColor?: string
+    bgColor?: string
+}
+
+export type Modal = {
+    title: string
+    titleColor: string
+    headerColor: string
+    body: React.ReactNode
+    lang: string
+    size?: 'sm' | 'md' | 'lg' | 'xl'
+}
+
+const ModalContext = createContext<{
+    modal: Modal | null
+    setModal: React.Dispatch<React.SetStateAction<Modal | null>>
+    modalResponse: ModalResponse | null
+    setModalResponse: React.Dispatch<React.SetStateAction<ModalResponse | null>>
+}>(
+    {} as {
+        modal: Modal | null
+        setModal: React.Dispatch<React.SetStateAction<Modal | null>>
+        modalResponse: ModalResponse | null
+        setModalResponse: React.Dispatch<React.SetStateAction<ModalResponse | null>>
+    },
+)
+
+export const ModalProvider = ({ children }: { children: React.ReactNode }) => {
+    const [modal, setModal] = useState<Modal | null>(null)
+    const [modalResponse, setModalResponse] = useState<ModalResponse | null>(null)
+
+    return (
+        <ModalContext.Provider
+            value={{
+                modal,
+                setModal,
+                modalResponse,
+                setModalResponse,
+            }}
+        >
+            {children}
+        </ModalContext.Provider>
+    )
+}
+
+export default ModalContext

package/templates/default/drizzle.config.ts

@@ -1,4 +1,4 @@
-import { drizzleConfig } from 'nextjs-cms/db/drizzle-config'
-import { defineConfig } from 'drizzle-kit'
-import '@/envConfig'
-export default defineConfig(drizzleConfig)
+import { drizzleConfig } from 'nextjs-cms/db/drizzle-config'
+import { defineConfig } from 'drizzle-kit'
+import '@/envConfig'
+export default defineConfig(drizzleConfig)

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

@@ -1,4 +1,4 @@
-import {mysqlTable,int,longtext,mysqlEnum,varchar,index,unique,boolean,double,timestamp} from 'drizzle-orm/mysql-core'
+import {mysqlTable,int,longtext,mysqlEnum,varchar,index,unique,primaryKey,boolean,double,timestamp} from 'drizzle-orm/mysql-core'
 
 export const AppInfoTable = mysqlTable('app_info', {
     id: int('id').autoincrement().notNull().primaryKey(),
@@ -33,7 +33,9 @@ export const TestSectionTable = mysqlTable('test_section', {
     contentType: mysqlEnum('content_type', ['ad', 'user']).notNull(),
     price: int('price'),
     appId: varchar('app_id', { length: 36 }).notNull(),
-    title: varchar('title', { length: 255 }).notNull()
+    title: varchar('title', { length: 255 }).notNull(),
+    photo: varchar('photo', { length: 255 }),
+    category: varchar('category', { length: 255 })
 }, (table) => [
     index('unique_user_report_index').on(table.contentType, table.price, table.appId),
     unique('unique_user_report').on(table.contentType, table.price, table.appId),
@@ -41,6 +43,30 @@ export const TestSectionTable = mysqlTable('test_section', {
 ]);
 
 
+export const TestTagsTable = mysqlTable('test_tags', {
+    testId: varchar('test_id', { length: 255 }).notNull(),
+    tagName: varchar('tag_name', { length: 255 }).notNull(),
+    locale: varchar('locale', { length: 255 })
+}, (table) => [
+    primaryKey({ columns: [table.testId, table.tagName, table.locale] })
+]);
+
+
+export const TestSectionLocalesTable = mysqlTable('test_section_locales', {
+    id: int('id').autoincrement().notNull().primaryKey(),
+    parentId: int('parent_id').notNull(),
+    locale: varchar('locale', { length: 10 }).notNull(),
+    contentType: mysqlEnum('content_type', ['ad', 'user']).notNull(),
+    price: int('price'),
+    appId: varchar('app_id', { length: 36 }).notNull(),
+    title: varchar('title', { length: 255 }).notNull(),
+    photo: varchar('photo', { length: 255 }),
+    category: varchar('category', { length: 255 })
+}, (table) => [
+    unique('test_section_locales_parent_id_locale_unique').on(table.parentId, table.locale)
+]);
+
+
 export const FeaturedSliderTable = mysqlTable('featured_slider', {
     id: int('id').autoincrement().notNull().primaryKey(),
     image: varchar('image', { length: 255 }).notNull(),