create-nextjs-cms 0.6.2 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/templates/default/app/(auth)/auth/login/LoginPage.tsx +5 -1
- package/templates/default/cms.config.ts +1 -4
- package/templates/default/components/AdminCard.tsx +2 -3
- package/templates/default/components/AdminPrivilegeCard.tsx +1 -1
- package/templates/default/components/form/helpers/_section-hot-reload.js +1 -1
- package/templates/default/components/login-locale-dropdown.tsx +2 -1
- package/templates/default/components/ui/badge.tsx +1 -0
- package/templates/default/package.json +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "create-nextjs-cms",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"tsx": "^4.20.6",
|
|
30
30
|
"typescript": "^5.9.2",
|
|
31
31
|
"@lzcms/eslint-config": "0.3.0",
|
|
32
|
-
"@lzcms/
|
|
33
|
-
"@lzcms/
|
|
32
|
+
"@lzcms/tsconfig": "0.1.0",
|
|
33
|
+
"@lzcms/prettier-config": "0.1.0"
|
|
34
34
|
},
|
|
35
35
|
"prettier": "@lzcms/prettier-config",
|
|
36
36
|
"scripts": {
|
|
@@ -11,6 +11,7 @@ import { Button } from '@/components/ui/button'
|
|
|
11
11
|
import { MoonIcon, SunIcon } from '@radix-ui/react-icons'
|
|
12
12
|
import { useTheme } from 'next-themes'
|
|
13
13
|
import { login, useSession } from 'nextjs-cms/auth/react'
|
|
14
|
+
import { wasLocaleChangedOnLogin } from 'nextjs-cms/translations'
|
|
14
15
|
import LoginLocaleDropdown from '@/components/login-locale-dropdown'
|
|
15
16
|
import { useAuthLocale } from '../../auth-locale-provider'
|
|
16
17
|
|
|
@@ -38,10 +39,13 @@ export default function LoginPage() {
|
|
|
38
39
|
loginButtonRef.current.innerHTML = t('loading')
|
|
39
40
|
}
|
|
40
41
|
try {
|
|
42
|
+
// Only send locale if user explicitly changed it on login page
|
|
43
|
+
// Otherwise, server will use admin's stored DB preference
|
|
44
|
+
const localeChanged = wasLocaleChangedOnLogin()
|
|
41
45
|
await login({
|
|
42
46
|
username: formRef.current?.username.value,
|
|
43
47
|
password: formRef.current?.password.value,
|
|
44
|
-
locale: initialLocale,
|
|
48
|
+
locale: localeChanged ? initialLocale : undefined,
|
|
45
49
|
})
|
|
46
50
|
} catch (error: any) {
|
|
47
51
|
if (loginButtonRef.current) {
|
|
@@ -4,10 +4,7 @@ import ar from 'nextjs-cms/translations/dictionaries/ar'
|
|
|
4
4
|
import process from 'process'
|
|
5
5
|
import { resolve } from 'path'
|
|
6
6
|
|
|
7
|
-
export const config: CMSConfig = {
|
|
8
|
-
dashboard: {
|
|
9
|
-
override: '/cpanel-dashboard',
|
|
10
|
-
},
|
|
7
|
+
export const config: CMSConfig = {
|
|
11
8
|
title: 'NEXTJS CMS',
|
|
12
9
|
defaultTheme: 'dark',
|
|
13
10
|
},
|
|
@@ -11,13 +11,12 @@ import { Button } from '@/components/ui/button'
|
|
|
11
11
|
import { trpc } from '@/app/_trpc/client'
|
|
12
12
|
import Image from 'next/image'
|
|
13
13
|
import type { RouterOutputs } from 'nextjs-cms/api'
|
|
14
|
-
|
|
15
14
|
export default function AdminCard({
|
|
16
15
|
admin,
|
|
17
16
|
action,
|
|
18
17
|
}: {
|
|
19
|
-
admin: RouterOutputs['admins']['list']['admins'][
|
|
20
|
-
action:
|
|
18
|
+
admin: NonNullable<RouterOutputs['admins']['list']['admins']>[number]
|
|
19
|
+
action: () => void
|
|
21
20
|
}) {
|
|
22
21
|
const t = useI18n()
|
|
23
22
|
const { setModal, modal, modalResponse, setModalResponse } = useModal()
|
|
@@ -16,7 +16,7 @@ export default function AdminRoleCard({
|
|
|
16
16
|
publisher: false,
|
|
17
17
|
}
|
|
18
18
|
}: {
|
|
19
|
-
privilege: RouterOutputs['admins']['list']['privileges'][
|
|
19
|
+
privilege: NonNullable<RouterOutputs['admins']['list']['privileges']>[number]
|
|
20
20
|
allChecked: boolean | 'edited' | null
|
|
21
21
|
setAllChecked: React.Dispatch<React.SetStateAction<boolean | 'edited' | null>>
|
|
22
22
|
defaultValue?: {
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { useCallback } from 'react'
|
|
4
4
|
import { useRouter } from 'next/navigation'
|
|
5
5
|
import { useI18n } from 'nextjs-cms/translations/client'
|
|
6
|
-
import { setLoginPageLocaleCookie } from 'nextjs-cms/translations'
|
|
6
|
+
import { setLoginPageLocaleCookie, markLocaleChangedOnLogin } from 'nextjs-cms/translations'
|
|
7
7
|
import LocalePicker from './locale-picker'
|
|
8
8
|
|
|
9
9
|
export interface LoginLocaleDropdownProps {
|
|
@@ -29,6 +29,7 @@ export default function LoginLocaleDropdown({
|
|
|
29
29
|
(locale: string) => {
|
|
30
30
|
if (locale === currentLocale) return
|
|
31
31
|
setLoginPageLocaleCookie(locale)
|
|
32
|
+
markLocaleChangedOnLogin()
|
|
32
33
|
router.refresh()
|
|
33
34
|
},
|
|
34
35
|
[currentLocale, router],
|
|
@@ -12,6 +12,7 @@ const badgeVariants = cva(
|
|
|
12
12
|
default: 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
|
|
13
13
|
primary: 'border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90',
|
|
14
14
|
secondary: 'border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90',
|
|
15
|
+
success: 'border-transparent bg-green-500 text-white [a&]:hover:bg-green-600',
|
|
15
16
|
destructive:
|
|
16
17
|
'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',
|
|
17
18
|
outline: 'text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground',
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"nanoid": "^5.1.2",
|
|
66
66
|
"next": "16.1.1",
|
|
67
67
|
"next-themes": "^0.4.6",
|
|
68
|
-
"nextjs-cms": "0.6.
|
|
68
|
+
"nextjs-cms": "0.6.3",
|
|
69
69
|
"plaiceholder": "^3.0.0",
|
|
70
70
|
"prettier-plugin-tailwindcss": "^0.7.2",
|
|
71
71
|
"qrcode": "^1.5.4",
|
|
@@ -98,7 +98,7 @@
|
|
|
98
98
|
"eslint-config-prettier": "^10.0.1",
|
|
99
99
|
"eslint-plugin-prettier": "^5.2.3",
|
|
100
100
|
"fs-extra": "^11.3.3",
|
|
101
|
-
"nextjs-cms-kit": "0.6.
|
|
101
|
+
"nextjs-cms-kit": "0.6.3",
|
|
102
102
|
"postcss": "^8.5.1",
|
|
103
103
|
"prettier": "3.5.0",
|
|
104
104
|
"raw-loader": "^4.0.2",
|