ORGANISATION-KA-INTERNATIONALE/pawol.nu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add NextTopLoader and fix Footer position

Browse Source
This commit is contained in:
Cédric Famibelle-Pronzola
2023-07-22 23:38:08 +04:00
parent c7223ce6ad
commit c63943c6fe
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/layout.js
+2 -2
View File
@@ -1,4 +1,4 @@
import Footer from '../components/footer' import NextTopLoader from 'nextjs-toploader'
import Navigasyon from '../components/navigasyon' import Navigasyon from '../components/navigasyon'
import AuthProvider from './auth-provider' import AuthProvider from './auth-provider'
import ThemeRegistry from './theme-registy' import ThemeRegistry from './theme-registy'
@@ -55,11 +55,11 @@ export default async function RootLayout({children, Session}) {
return ( return (
<html lang='fr'> <html lang='fr'>
<body> <body>
<NextTopLoader />
<AuthProvider session={Session}> <AuthProvider session={Session}>
<ThemeRegistry> <ThemeRegistry>
<Navigasyon /> <Navigasyon />
{children} {children}
<Footer />
</ThemeRegistry> </ThemeRegistry>
</AuthProvider> </AuthProvider>
<section> <section>
app/paroles/[slug]/page.js
+4 -3
View File
@@ -5,10 +5,10 @@ import {jwennTeksEpiSlug} from '../../../lib/oki-api'
import AnTeks from '../../../components/teks/an-teks' import AnTeks from '../../../components/teks/an-teks'
import {getAlias} from '../../../lib/utils/format' import {getAlias} from '../../../lib/utils/format'
import {formatKuveti} from '../../../lib/kuveti' import {formatKuveti} from '../../../lib/kuveti'
import Footer from '../../../components/footer'
const apiUrl = process.env.NEXT_PUBLIC_API_URL_ROOT || 'http://localhost:1337' const apiUrl = process.env.NEXT_PUBLIC_API_URL_ROOT || 'http://localhost:1337'
const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3000' const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3000'
const drawerWidth = 340
async function jwennAnTeks(slug) { async function jwennAnTeks(slug) {
const teks = await jwennTeksEpiSlug(slug) const teks = await jwennTeksEpiSlug(slug)
@@ -85,13 +85,14 @@ export default async function AnPawolPaj({params}) {
return ( return (
<> <>
<Box sx={{display: 'flex'}}> <Box sx={{display: 'flex', flexDirection: 'column', minHeight: '100vh'}}>
<Box <Box
component='main' component='main'
sx={{flexGrow: 1, p: 2, mt: 2, width: {sm: `calc(100% - ${drawerWidth}px)`}}} sx={{flexGrow: 1, p: 2, mt: 2}}
> >
<AnTeks parole={anTeks.attributes} paroleId={anTeks.id} /> <AnTeks parole={anTeks.attributes} paroleId={anTeks.id} />
</Box> </Box>
<Footer />
</Box> </Box>
<section> <section>
app/paroles/page.js
+4 -4
View File
@@ -3,8 +3,7 @@ import {notFound} from 'next/navigation'
import {jwennDenyeTeks} from '../../lib/oki-api' import {jwennDenyeTeks} from '../../lib/oki-api'
import DenyeTeks from '../../components/teks/denye-teks' import DenyeTeks from '../../components/teks/denye-teks'
import Footer from '../../components/footer'
const drawerWidth = 240
async function jwennDone() { async function jwennDone() {
const denyeTeks = await jwennDenyeTeks() const denyeTeks = await jwennDenyeTeks()
@@ -20,13 +19,14 @@ export default async function PawolPaj() {
const denyeTeks = await jwennDone() const denyeTeks = await jwennDone()
return ( return (
<Box sx={{display: 'flex'}}> <Box sx={{display: 'flex', flexDirection: 'column', minHeight: '100vh'}}>
<Box <Box
component='main' component='main'
sx={{flexGrow: 1, p: 2, mt: 2, width: {sm: `calc(100% - ${drawerWidth}px)`}}} sx={{flexGrow: 1, p: 2, mt: 2}}
> >
<DenyeTeks denyeTeks={denyeTeks} /> <DenyeTeks denyeTeks={denyeTeks} />
</Box> </Box>
<Footer />
</Box> </Box>
) )
} }
package.json
+1
View File
@@ -32,6 +32,7 @@
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"next-plausible": "^3.6.3", "next-plausible": "^3.6.3",
"next-pwa": "5.6.0", "next-pwa": "5.6.0",
"nextjs-toploader": "^1.4.2",
"nodemailer": "^6.7.2", "nodemailer": "^6.7.2",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"react": "^18.2.0", "react": "^18.2.0",
yarn.lock
+14
View File
@@ -2880,6 +2880,11 @@
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
"@types/nprogress@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@types/nprogress/-/nprogress-0.2.0.tgz#86c593682d4199212a0509cc3c4d562bbbd6e45f"
integrity sha512-1cYJrqq9GezNFPsWTZpFut/d4CjpZqA0vhqDUPFWYKF1oIyBz5qnoYMzR+0C/T96t3ebLAC1SSnwrVOm5/j74A==
"@types/parse-json@^4.0.0": "@types/parse-json@^4.0.0":
version "4.0.0" version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
@@ -6059,6 +6064,15 @@ next@^13.4.10:
"@next/swc-win32-ia32-msvc" "13.4.10" "@next/swc-win32-ia32-msvc" "13.4.10"
"@next/swc-win32-x64-msvc" "13.4.10" "@next/swc-win32-x64-msvc" "13.4.10"
nextjs-toploader@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/nextjs-toploader/-/nextjs-toploader-1.4.2.tgz#00c34e0267c05cc678143157ea69032a2e8036b8"
integrity sha512-FS5+zCdNHLq0YA+SijkbDifOMFNayKfxkCLTiM6TIrvSaf6kAzCGlNjwgVpoG3zpampVMQSVf5L/jrWFJgs23g==
dependencies:
"@types/nprogress" "^0.2.0"
nprogress "^0.2.0"
prop-types "^15.8.1"
node-abi@^3.3.0: node-abi@^3.3.0:
version "3.5.0" version "3.5.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248"