Skip to content
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
33 changes: 11 additions & 22 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,40 +1,29 @@
import { useState } from "react";
import { Routes, Route, Navigate } from "react-router";

import AuthInitializer from "@/hooks/AuthListener";
import AuthLayout from "@/layouts/AuthLayout";
import SignInPage from "@/pages/auth/sign-in/SignInPage";
import SignUpPage from "@/pages/auth/sign-up/SignUpPage";
import BootScreen from "@/pages/os/BootScreen";
import OsMain from "@/pages/os/OsMain";
import ProtectedRoute from "@/router/ProtectedRoute";
import PublicRoute from "@/router/PublicRoute";

export default function App() {
const [isBooting, setIsBooting] = useState(false);
const USE_ENTER_MODE = true;

return (
<>
<AuthInitializer />
{!isBooting ? (
<BootScreen onComplete={() => setIsBooting(true)} useEnterMode={USE_ENTER_MODE} />
) : (
<Routes>
<Route element={<PublicRoute />}>
<Route element={<AuthLayout />}>
<Route path="/signin" element={<SignInPage />} />
<Route path="/signup" element={<SignUpPage />} />
</Route>
</Route>

<Route element={<ProtectedRoute />}>
<Route path="/" element={<OsMain />} />
<Routes>
<Route element={<PublicRoute />}>
<Route element={<AuthLayout />}>
<Route path="/signin" element={<SignInPage />} />
<Route path="/signup" element={<SignUpPage />} />
</Route>

<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
)}
</Route>
<Route element={<ProtectedRoute />}>
<Route path="/" element={<OsMain />} />
</Route>
<Route path="*" element={<Navigate to="/" replace />} />
</Routes>
</>
);
}
9 changes: 0 additions & 9 deletions src/assets/cursors/default.svg

This file was deleted.

4 changes: 0 additions & 4 deletions src/assets/cursors/disabled.svg

This file was deleted.

9 changes: 0 additions & 9 deletions src/assets/cursors/loading.svg

This file was deleted.

9 changes: 0 additions & 9 deletions src/assets/cursors/pointer.svg

This file was deleted.

Binary file removed src/assets/os/bios.png
Binary file not shown.
Binary file removed src/assets/sounds/windows95-startup-sound.mp3
Binary file not shown.
51 changes: 0 additions & 51 deletions src/pages/os/BootScreen.tsx

This file was deleted.

6 changes: 5 additions & 1 deletion src/router/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import { Navigate, Outlet } from "react-router";
import { useAuthUser } from "@/hooks/useAuthUser";

export default function ProtectedRoute() {
const { isLoggedIn } = useAuthUser();
const { isLoggedIn, isLoading } = useAuthUser();

if (isLoading) {
return <div>Loading...</div>;
}

if (!isLoggedIn) {
return <Navigate to="/signin" replace />;
Expand Down
6 changes: 5 additions & 1 deletion src/router/PublicRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import { Navigate, Outlet } from "react-router";
import { useAuthUser } from "@/hooks/useAuthUser";

export default function PublicRoute() {
const { isLoggedIn } = useAuthUser();
const { isLoggedIn, isLoading } = useAuthUser();

if (isLoading) {
return <div>Loading...</div>;
}

if (isLoggedIn) {
return <Navigate to="/" replace />;
Expand Down