Skip to content
Open
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: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ build
*.sw?

.vscode
.env*
.env*build/
5 changes: 0 additions & 5 deletions example.env.development

This file was deleted.

4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<title>building-U | A Place for Post Secondary Plans</title>
</head>
<body>
<div id="root"><!--ssr-outlet--></div>
<script type="module" src="/src/entry-client"></script>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
3,510 changes: 1,680 additions & 1,830 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,15 @@
},
"packageManager": "^npm@10.0.0",
"scripts": {
"dev": "dotenv -e .env -e .env.development tsx server.js",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"build": "vite build | vite build --outDir build/ssr --ssr src/entry-server",
"start": "dotenv -e .env -e .env.production node server.js",
"start:staging": "dotenv -e .env -e .env.staging node server.js",
"clean": "shx rm -rf node_modules package-lock.json"
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0"
},
"dependencies": {
"dotenv-cli": "^7.4.2",
"express": "^4.19.2",
"morgan": "^1.10.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.24.0",
"sirv": "^2.0.4"
"react-router-dom": "^6.24.0"
},
"devDependencies": {
"@types/react": "^18.3.3",
Expand All @@ -42,8 +35,6 @@
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"shx": "^0.3.4",
"tsx": "^4.15.7",
"vite": "^5.3.1"
}
}
103 changes: 0 additions & 103 deletions server.js

This file was deleted.

17 changes: 11 additions & 6 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Navigate, Outlet } from "react-router-dom";
import { Navigate, Outlet, useRoutes } from "react-router-dom";

import HistoryProvider from "./utils/History";

Expand Down Expand Up @@ -28,6 +28,9 @@ export const routes = [
children: [
{
index: true,
element: <Navigate to="/home" replace />,
},
{
path: "home",
element: <Home />,
},
Expand Down Expand Up @@ -77,10 +80,8 @@ export const routes = [
element: <Error500 />,
},
{
...(typeof window !== "undefined" && {
path: "*",
element: <Navigate to="/error-404" replace />,
}),
path: "*",
element: <Navigate to="/error-404" replace />,
},

{
Expand All @@ -90,8 +91,12 @@ export const routes = [
path: "blog",
element: <AdminBlog />,
},
]
],
},
],
},
];

export default function App() {
return useRoutes(routes);
}
14 changes: 0 additions & 14 deletions src/entry-client.jsx

This file was deleted.

51 changes: 0 additions & 51 deletions src/entry-server.jsx

This file was deleted.

13 changes: 13 additions & 0 deletions src/main.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from "react";
import ReactDOM from "react-dom/client";
import { BrowserRouter } from "react-router-dom";

import App from "./App";

ReactDOM.createRoot(document.getElementById("root")).render(
<React.StrictMode>
<BrowserRouter>
<App />
</BrowserRouter>
</React.StrictMode>
);
2 changes: 0 additions & 2 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";

export default defineConfig({
server: { port: 3000 },
plugins: [react()],
build: { outDir: "build/client" },
});