Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dark mode #25

Merged
merged 7 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@ jobs:
- run: pnpm install
- run: pnpm lint
- run: pnpm build
- run: pnpm cypress install
- run: pnpm test
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ This dashboard is built with `Typescript` and [React Bootstrap](https://react-bo

https://nextjs-dashboard-olive.vercel.app

[<img alt="Dashboard" width="400" src="https://user-images.githubusercontent.com/7660346/180629352-f92216e3-7cf4-4fba-92fa-089dd96b4478.png" />](https://nextjs-dashboard-olive.vercel.app)
| Light | Dark |
|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [<img alt="Dashboard" width="400" src="https://private-user-images.githubusercontent.com/7660346/330458105-1885c757-0616-4023-ab51-1ffe162fb019.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTU2OTY3NjAsIm5iZiI6MTcxNTY5NjQ2MCwicGF0aCI6Ii83NjYwMzQ2LzMzMDQ1ODEwNS0xODg1Yzc1Ny0wNjE2LTQwMjMtYWI1MS0xZmZlMTYyZmIwMTkucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDUxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA1MTRUMTQyMTAwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MGYzYTVmYWJkZDFjNWNjMWMxNmE3YWU2ZmU0ZjhlZGQ4YmJiM2YyY2RjMzkwNTQyNGZmZjRjNTg4ODBmZWY1OSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.V3BUd9KPOG_dqP0zyN8ooOmnGA36RzzCTQNYUerOork" />](https://nextjs-dashboard-olive.vercel.app) | [<img alt="Dashboard" width="400" src="https://private-user-images.githubusercontent.com/7660346/330458408-b05459ba-3049-481a-b3a1-5a52bc2c51c0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTU2OTY3NjAsIm5iZiI6MTcxNTY5NjQ2MCwicGF0aCI6Ii83NjYwMzQ2LzMzMDQ1ODQwOC1iMDU0NTliYS0zMDQ5LTQ4MWEtYjNhMS01YTUyYmMyYzUxYzAucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDUxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA1MTRUMTQyMTAwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZmVjZjMwNDUxNTE2YjBlYTQ0ZTU4MGU1OGU2ODM4NTBhNGMyY2IyMDE4NzlhN2E4ZTc4YWEyNjdjYjc3MTM5NSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.EeevKS8-6k1qW1nINO3VeFt2uffRXLhbE5bArXewkBQ" />](https://nextjs-dashboard-olive.vercel.app) |

| Mobile (collapsed) | Mobile (expand) |
|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
Expand All @@ -24,7 +26,12 @@ https://nextjs-dashboard-olive.vercel.app

https://nextjs-dashboard-olive.vercel.app/pokemons

[<img alt="Sample page" width="400" src="https://user-images.githubusercontent.com/7660346/183112188-75ffbd15-e7ef-455f-994b-945df16e5846.png">](https://nextjs-dashboard-olive.vercel.app/pokemons)
#### Multilingual

| English | 日本語 |
|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [<img alt="Sample page" width="400" src="https://private-user-images.githubusercontent.com/7660346/330461274-b0779014-ced2-4755-941b-77349bc6a2ed.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTU2OTY3NjAsIm5iZiI6MTcxNTY5NjQ2MCwicGF0aCI6Ii83NjYwMzQ2LzMzMDQ2MTI3NC1iMDc3OTAxNC1jZWQyLTQ3NTUtOTQxYi03NzM0OWJjNmEyZWQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDUxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA1MTRUMTQyMTAwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YzA0MzYwYThiMTFmZDAzMDM5NThmZmMxMDBhMDZlZDA3ZjNjOGM5NWUzMjE3NmIxM2U2NzEwYzA1MTNjMzQ5OCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.4er_vRXAo6Ylo30eCPrQQ54TkOTCn3oTdWK4jz31kV0">](https://nextjs-dashboard-olive.vercel.app/pokemons) | [<img alt="Sample page" width="400" src="https://private-user-images.githubusercontent.com/7660346/330461591-b2842635-87d1-4d3f-95c2-aeef5cad779c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTU2OTY3NjAsIm5iZiI6MTcxNTY5NjQ2MCwicGF0aCI6Ii83NjYwMzQ2LzMzMDQ2MTU5MS1iMjg0MjYzNS04N2QxLTRkM2YtOTVjMi1hZWVmNWNhZDc3OWMucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDUxNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA1MTRUMTQyMTAwWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MTllZTI2YTA1MjYyMmIxYWZkZmFjMWY4YTViOGQzNjBhZTA2ZDEyOTZhMzZlM2Y4OGU3ZTQzMjhjZjA3NmMzMyZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.nLAwlkNjJHnWQ5dxI-FpE9cDHhpO-RXs2Brp8x2OuSg">](https://nextjs-dashboard-olive.vercel.app/pokemons) |


### Login

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.3.1",
"react-paginate": "^8.2.0",
"react-responsive": "^10.0.0",
"swr": "^2.2.5",
"zod": "^3.23.8",
"zod-i18n-map": "^2.27.0"
Expand Down
39 changes: 39 additions & 0 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion src/app/(authentication)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function Layout({
children: React.ReactNode;
}) {
return (
<div className="bg-light min-vh-100 d-flex flex-row align-items-center dark:bg-transparent">
<div className="bg-light dark:bg-dark min-vh-100 d-flex flex-row align-items-center">
<Container>
{children}
</Container>
Expand Down
4 changes: 2 additions & 2 deletions src/app/(authentication)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export default async function Page({ searchParams }: { searchParams: SearchParam
<Row className="justify-content-center align-items-center px-3">
<Col lg={8}>
<Row>
<Col md={7} className="bg-white border p-5">
<Col md={7} className="bg-white dark:bg-dark border p-5">
<div>
<h1>{dict.login.title}</h1>
<p className="text-black-50">{dict.login.description}</p>
<p className="text-black-50 dark:text-gray-500">{dict.login.description}</p>

<LoginForm callbackUrl={getCallbackUrl()} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/(authentication)/register/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default async function Page() {
<Card className="mb-4 rounded-0">
<CardBody className="p-4">
<h1>{dict.signup.title}</h1>
<p className="text-black-50">{dict.signup.description}</p>
<p className="text-black-50 dark:text-gray-500">{dict.signup.description}</p>
<Register />
</CardBody>
</Card>
Expand Down
2 changes: 1 addition & 1 deletion src/app/(dashboard)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Layout({
<SidebarNav />
</Sidebar>

<div className="wrapper d-flex flex-column min-vh-100 bg-light">
<div className="wrapper d-flex flex-column min-vh-100">
<Header />

<div className="body flex-grow-1 px-sm-2 mb-4">
Expand Down
Loading
Loading