small improvements

This commit is contained in:
keyan 2021-06-03 16:36:02 -04:00
parent b6d9c65392
commit f535dc134c
5 changed files with 12 additions and 12 deletions

View File

@ -1,7 +1,7 @@
import { PrismaClient } from '@prisma/client' import { PrismaClient } from '@prisma/client'
if (!global.prisma) { const prisma = global.prisma || new PrismaClient()
global.prisma = new PrismaClient()
}
export default global.prisma if (process.env.NODE_ENV === 'development') global.prisma = prisma
export default prisma

View File

@ -1,10 +1,10 @@
import Layout from './layout' import Layout from './layout'
import styles from './layout-center.module.css' import styles from './layout-center.module.css'
export default function LayoutCenter ({ children }) { export default function LayoutCenter ({ children, ...props }) {
return ( return (
<div className={styles.page}> <div className={styles.page}>
<Layout noContain> <Layout noContain {...props}>
<div className={styles.content}> <div className={styles.content}>
{children} {children}
</div> </div>

View File

@ -5,7 +5,7 @@ import { LightningProvider } from './lightning'
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import Footer from './footer' import Footer from './footer'
export default function Layout ({ noContain, children }) { export default function Layout ({ noContain, noFooter, children }) {
const router = useRouter() const router = useRouter()
const defaultTitle = router.asPath.split('?')[0].slice(1) const defaultTitle = router.asPath.split('?')[0].slice(1)
return ( return (
@ -23,7 +23,7 @@ export default function Layout ({ noContain, children }) {
{children} {children}
</Container> </Container>
)} )}
<Footer /> {!noFooter && <Footer />}
</LightningProvider> </LightningProvider>
</> </>
) )

View File

@ -25,7 +25,8 @@
"react-dom": "17.0.1", "react-dom": "17.0.1",
"sass": "^1.32.8", "sass": "^1.32.8",
"swr": "^0.5.4", "swr": "^0.5.4",
"yup": "^0.32.9" "yup": "^0.32.9",
"prisma": "^2.23.0"
}, },
"standard": { "standard": {
"parser": "babel-eslint", "parser": "babel-eslint",
@ -44,7 +45,6 @@
"babel-plugin-inline-react-svg": "^2.0.1", "babel-plugin-inline-react-svg": "^2.0.1",
"eslint": "^7.22.0", "eslint": "^7.22.0",
"eslint-plugin-compat": "^3.9.0", "eslint-plugin-compat": "^3.9.0",
"prisma": "^2.23.0",
"standard": "^16.0.3" "standard": "^16.0.3"
} }
} }

View File

@ -50,7 +50,7 @@ export default function login ({ providers, csrfToken, error }) {
const [errorMessage, setErrorMessage] = useState(error && (errors[error] ?? errors.default)) const [errorMessage, setErrorMessage] = useState(error && (errors[error] ?? errors.default))
return ( return (
<LayoutCenter> <LayoutCenter noFooter>
<div className={styles.login}> <div className={styles.login}>
{errorMessage && {errorMessage &&
<Alert variant='danger' onClose={() => setErrorMessage(undefined)} dismissible>{errorMessage}</Alert>} <Alert variant='danger' onClose={() => setErrorMessage(undefined)} dismissible>{errorMessage}</Alert>}