Skip to content

Issue 17 migrate pages router to app router #39

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.

Sign up for GitHub

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

Open
Games4Doritos wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Issue 17 migrate pages router to app router #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11926be
Update license year
Jun 27, 2026
e5b28c8
Migrate to app router
Games4Doritos Jul 18, 2026
41c79da
Merge main into branch
Games4Doritos Jul 18, 2026
202967d
Make navbar a client component
Games4Doritos Jul 18, 2026
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: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 Coders for Causes
Copyright (c) 2026 Coders for Causes

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
37 changes: 37 additions & 0 deletions client/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import "@/styles/globals.css";

import type { Metadata } from "next";
import { Montserrat } from "next/font/google";

import Providers from "@/components/main/providers";
import Navbar from "@/components/ui/Navbar";

export const metadata: Metadata = {
title: "Electrify Everything WA",
description: "Home Page",
};

const montserrat = Montserrat({
subsets: ["latin"],
variable: "--font-sans",
weight: ["400", "500", "600", "700", "800"],
});

export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<html lang="en">
<body>
<main className={`${montserrat.variable} font-sans`}>
<Providers>
<Navbar />
{children}
</Providers>
</main>
</body>
</html>
);
}
2 changes: 2 additions & 0 deletions client/src/pages/index.tsx → client/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"use client";

import { Inter as FontSans } from "next/font/google";
import { useState } from "react";

Expand Down
23 changes: 23 additions & 0 deletions client/src/components/main/providers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"use client";

import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { useState } from "react";

export default function Providers({ children }: { children: React.ReactNode }) {
/*const [queryClient] = useState(() => new QueryClient({
defaultOptions: {
queries: {
staleTime: 60 * 1000, // 1 minute
},
},
}))*/
const [queryClient] = useState(() => new QueryClient());

return (
<QueryClientProvider client={queryClient}>
<ReactQueryDevtools initialIsOpen={false} />
{children}
</QueryClientProvider>
);
}
1 change: 1 addition & 0 deletions client/src/components/ui/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"use client";
import { ChevronDown, ChevronRight, Menu } from "lucide-react";
import Image from "next/image";
import Link from "next/link";
Expand Down
27 changes: 0 additions & 27 deletions client/src/pages/_app.tsx
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions client/src/pages/_document.tsx
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "react-jsx",
"jsx": "preserve",
"incremental": true,
"paths": {
"@/*": [
"./src/*"
]
},
"target": "ES2017"
"target": "ES2017",
"plugins": [
{
"name": "next"
}
]
},
"include": [
"next-env.d.ts",
"**/*.d.ts",
"**/*.ts",
"**/*.tsx",
"**/*.d.ts"
"next-env.d.ts",
".next/types/**/*.ts"
],
"exclude": [
"node_modules"
Expand Down
Loading