mirror of
https://github.com/kevin-DL/breeze-next-template.git
synced 2026-01-11 18:34:27 +00:00
Merge pull request #5 from garethredfern/feature/update-tailwind
Update Tailwind to V3 & type-safe equality operators
This commit is contained in:
6417
package-lock.json
generated
Normal file
6417
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@@ -9,25 +9,25 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@headlessui/react": "^1.4.2",
|
"@headlessui/react": "^1.4.2",
|
||||||
"@tailwindcss/forms": "^0.2.1",
|
|
||||||
"autoprefixer": "^10.1.0",
|
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"next": "^12.0.4",
|
"next": "^12.0.4",
|
||||||
"postcss": "^8.2.2",
|
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2",
|
||||||
"swr": "^0.3.11",
|
"swr": "^0.3.11"
|
||||||
"tailwindcss": "^2.0.2"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/eslint-parser": "^7.12.1",
|
"@babel/eslint-parser": "^7.12.1",
|
||||||
"@next/eslint-plugin-next": "^10.0.4",
|
"@next/eslint-plugin-next": "^10.0.4",
|
||||||
|
"@tailwindcss/forms": "^0.4.0",
|
||||||
|
"autoprefixer": "^10.4.2",
|
||||||
"babel-eslint": "^10.1.0",
|
"babel-eslint": "^10.1.0",
|
||||||
"eslint": "^7.17.0",
|
"eslint": "^7.17.0",
|
||||||
"eslint-config-prettier": "^7.1.0",
|
"eslint-config-prettier": "^7.1.0",
|
||||||
"eslint-plugin-next": "^0.0.0",
|
"eslint-plugin-next": "^0.0.0",
|
||||||
"eslint-plugin-prettier": "^3.3.0",
|
"eslint-plugin-prettier": "^3.3.0",
|
||||||
"eslint-plugin-react": "^7.22.0",
|
"eslint-plugin-react": "^7.22.0",
|
||||||
"prettier": "2.2.1"
|
"postcss": "^8.4.6",
|
||||||
|
"prettier": "2.2.1",
|
||||||
|
"tailwindcss": "^3.0.22"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ const Navigation = ({ user }) => {
|
|||||||
<div className="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
|
<div className="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
|
||||||
<NavLink
|
<NavLink
|
||||||
href="/dashboard"
|
href="/dashboard"
|
||||||
active={router.pathname == '/dashboard'}>
|
active={router.pathname === '/dashboard'}>
|
||||||
Dashboard
|
Dashboard
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
@@ -110,7 +110,7 @@ const Navigation = ({ user }) => {
|
|||||||
<div className="pt-2 pb-3 space-y-1">
|
<div className="pt-2 pb-3 space-y-1">
|
||||||
<ResponsiveNavLink
|
<ResponsiveNavLink
|
||||||
href="/dashboard"
|
href="/dashboard"
|
||||||
active={router.pathname == '/dashboard'}>
|
active={router.pathname === '/dashboard'}>
|
||||||
Dashboard
|
Dashboard
|
||||||
</ResponsiveNavLink>
|
</ResponsiveNavLink>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export const useAuth = ({ middleware, redirectIfAuthenticated } = {}) => {
|
|||||||
.get('/api/user')
|
.get('/api/user')
|
||||||
.then(res => res.data)
|
.then(res => res.data)
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.response.status != 409) throw error
|
if (error.response.status !== 409) throw error
|
||||||
|
|
||||||
router.push('/verify-email')
|
router.push('/verify-email')
|
||||||
}),
|
}),
|
||||||
@@ -28,7 +28,7 @@ export const useAuth = ({ middleware, redirectIfAuthenticated } = {}) => {
|
|||||||
.post('/register', props)
|
.post('/register', props)
|
||||||
.then(() => revalidate())
|
.then(() => revalidate())
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.response.status != 422) throw error
|
if (error.response.status !== 422) throw error
|
||||||
|
|
||||||
setErrors(Object.values(error.response.data.errors).flat())
|
setErrors(Object.values(error.response.data.errors).flat())
|
||||||
})
|
})
|
||||||
@@ -44,7 +44,7 @@ export const useAuth = ({ middleware, redirectIfAuthenticated } = {}) => {
|
|||||||
.post('/login', props)
|
.post('/login', props)
|
||||||
.then(() => revalidate())
|
.then(() => revalidate())
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.response.status != 422) throw error
|
if (error.response.status !== 422) throw error
|
||||||
|
|
||||||
setErrors(Object.values(error.response.data.errors).flat())
|
setErrors(Object.values(error.response.data.errors).flat())
|
||||||
})
|
})
|
||||||
@@ -60,7 +60,7 @@ export const useAuth = ({ middleware, redirectIfAuthenticated } = {}) => {
|
|||||||
.post('/forgot-password', { email })
|
.post('/forgot-password', { email })
|
||||||
.then(response => setStatus(response.data.status))
|
.then(response => setStatus(response.data.status))
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.response.status != 422) throw error
|
if (error.response.status !== 422) throw error
|
||||||
|
|
||||||
setErrors(Object.values(error.response.data.errors).flat())
|
setErrors(Object.values(error.response.data.errors).flat())
|
||||||
})
|
})
|
||||||
@@ -99,8 +99,8 @@ export const useAuth = ({ middleware, redirectIfAuthenticated } = {}) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (middleware == 'guest' && redirectIfAuthenticated && user) router.push(redirectIfAuthenticated)
|
if (middleware === 'guest' && redirectIfAuthenticated && user) router.push(redirectIfAuthenticated)
|
||||||
if (middleware == 'auth' && error) logout()
|
if (middleware === 'auth' && error) logout()
|
||||||
}, [user, error])
|
}, [user, error])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const Login = () => {
|
|||||||
const [status, setStatus] = useState(null)
|
const [status, setStatus] = useState(null)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (router.query.reset?.length > 0 && errors.length == 0) {
|
if (router.query.reset?.length > 0 && errors.length === 0) {
|
||||||
setStatus(atob(router.query.reset))
|
setStatus(atob(router.query.reset))
|
||||||
} else {
|
} else {
|
||||||
setStatus(null)
|
setStatus(null)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const VerifyEmail = () => {
|
|||||||
gladly send you another.
|
gladly send you another.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{status == 'verification-link-sent' && (
|
{status === 'verification-link-sent' && (
|
||||||
<div className="mb-4 font-medium text-sm text-green-600">
|
<div className="mb-4 font-medium text-sm text-green-600">
|
||||||
A new verification link has been sent to the email
|
A new verification link has been sent to the email
|
||||||
address you provided during registration.
|
address you provided during registration.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
const defaultTheme = require('tailwindcss/defaultTheme')
|
const defaultTheme = require('tailwindcss/defaultTheme')
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
purge: ['./src/**/*.js'],
|
content: ['./src/**/*.js'],
|
||||||
darkMode: 'media',
|
darkMode: 'media',
|
||||||
theme: {
|
theme: {
|
||||||
extend: {
|
extend: {
|
||||||
|
|||||||
Reference in New Issue
Block a user