Skip to content

Commit

Permalink
Merge pull request #74 from thibaudbrault/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
thibaudbrault committed Jun 14, 2023
2 parents 26d890b + 1c97703 commit 616cf82
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 14 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

<div align="center">

![GitHub repo size](https://img.shields.io/github/repo-size/thibaudbrault/pokeref)
![GitHub branch checks state](https://img.shields.io/github/checks-status/thibaudbrault/pokeref/dev)
![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/thibaudbrault/pokeref/ci.yml)
![GitHub issues](https://img.shields.io/github/issues/thibaudbrault/pokeref)
![GitHub pull requests](https://img.shields.io/github/issues-pr/thibaudbrault/pokeref)

Expand Down Expand Up @@ -60,7 +61,7 @@
✅Responsive

🛠Check how the login with a provider works
🛠Types relations for each pokémon
🛠Second type select in the list of pokémon in a type page

🔜Contest section in a move's page

Expand Down
19 changes: 19 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"fuse.js": "6.6.2",
"hamburger-react": "2.5.0",
"next": "13.0.3",
"next-plausible": "3.7.2",
"next-pwa": "5.6.0",
"next-sitemap": "3.1.54",
"nextjs-progressbar": "0.0.16",
Expand Down
30 changes: 18 additions & 12 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import Header from '@/components/layout/Header/Header';
import Nav from '@/components/layout/Nav/Nav';
import NextNProgress from 'nextjs-progressbar';
import { Toaster } from 'react-hot-toast';
import PlausibleProvider from 'next-plausible';

const ErrorFallback = ({ error, resetErrorBoundary }: FallbackProps) => {
return (
Expand Down Expand Up @@ -60,18 +61,23 @@ function MyApp({ Component, pageProps }: AppProps) {
<ErrorBoundary FallbackComponent={ErrorFallback}>
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme === `dark` ? darkTheme : lightTheme}>
<Toaster />
<NextNProgress />
<Header
navOpen={navOpen}
setNavOpen={setNavOpen}
themeToggler={themeToggler}
theme={theme}
/>
<Nav navOpen={navOpen} setNavOpen={setNavOpen} />
<Reset />
<Component {...pageProps} />
<Footer />
<PlausibleProvider
domain="pokeref.app"
enabled={process.env.NODE_ENV === `production`}
>
<Toaster />
<NextNProgress />
<Header
navOpen={navOpen}
setNavOpen={setNavOpen}
themeToggler={themeToggler}
theme={theme}
/>
<Nav navOpen={navOpen} setNavOpen={setNavOpen} />
<Reset />
<Component {...pageProps} />
<Footer />
</PlausibleProvider>
</ThemeProvider>
</QueryClientProvider>
</ErrorBoundary>
Expand Down

0 comments on commit 616cf82

Please sign in to comment.