MAJOR UPDATE/FEAT: Overhaul of DashboardPage to include VODs;

REFACTOR: General formatting;
UPDATE: Shrink Logo upon opening sidebar on certain pages
This commit is contained in:
Chris-1010
2025-03-02 14:45:37 +00:00
parent 5a49bc8e7b
commit 0a4bbc73e5
15 changed files with 1333 additions and 1431 deletions

View File

@@ -11,101 +11,77 @@ import CategoriesPage from "./pages/AllCategoriesPage";
import ResultsPage from "./pages/ResultsPage";
import { SidebarProvider } from "./context/SidebarContext";
import { QuickSettingsProvider } from "./context/QuickSettingsContext";
import StreamDashboardPage from "./pages/StreamDashboardPage";
import DashboardPage from "./pages/DashboardPage";
import { Brightness } from "./context/BrightnessContext";
import LoadingScreen from "./components/Layout/LoadingScreen";
import Following from "./pages/Following";
import FollowedCategories from "./pages/FollowedCategories";
function App() {
const [isLoggedIn, setIsLoggedIn] = useState(false);
const [userId, setUserId] = useState<number | null>(null);
const [username, setUsername] = useState<string | null>(null);
const [isLoading, setIsLoading] = useState(true);
const [isLoggedIn, setIsLoggedIn] = useState(false);
const [username, setUsername] = useState<string | null>(null);
const [userId, setUserId] = useState<number | null>(null);
const [isLive, setIsLive] = useState(false);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
fetch("/api/user/login_status")
.then((response) => response.json())
.then((data) => {
setUserId(data.user_id);
setIsLoggedIn(data.status);
setUsername(data.username);
})
.catch((error) => {
console.error("Error fetching login status:", error);
setIsLoggedIn(false);
})
.finally(() => {
setIsLoading(false);
});
}, []);
useEffect(() => {
fetch("/api/user/login_status")
.then((response) => response.json())
.then((data) => {
setUserId(data.user_id);
setIsLoggedIn(data.status);
setUsername(data.username);
})
.catch((error) => {
console.error("Error fetching login status:", error);
setIsLoggedIn(false);
})
.finally(() => {
setIsLoading(false);
});
}, []);
if (isLoading) {
return <LoadingScreen />;
}
if (isLoading) {
return <LoadingScreen />;
}
return (
<Brightness>
<AuthContext.Provider
value={{
isLoggedIn,
username,
userId,
setIsLoggedIn,
setUsername,
setUserId,
}}
>
<SidebarProvider>
<QuickSettingsProvider>
<BrowserRouter>
<Routes>
<Route
path="/"
element={
isLoggedIn ? (
<HomePage variant="personalised" />
) : (
<HomePage />
)
}
/>
<Route
path="/go-live"
element={
isLoggedIn ? (
<StreamDashboardPage />
) : (
<Navigate to="/" replace />
)
}
/>
<Route path="/:streamerName" element={<StreamerRoute />} />
<Route path="/user/:username" element={<UserPage />} />
<Route
path="/reset_password/:token"
element={<ResetPasswordPage />}
></Route>
<Route
path="/category/:categoryName"
element={<CategoryPage />}
></Route>
<Route
path="/categories"
element={<CategoriesPage />}
></Route>
<Route path="/results" element={<ResultsPage />}></Route>
<Route path="/404" element={<NotFoundPage />} />
<Route path="/user/:username/following" element={<Following />} />
<Route path="/user/:username/yourCategories" element={<FollowedCategories />} />
<Route path="*" element={<Navigate to="/404" replace />} />
</Routes>
</BrowserRouter>
</QuickSettingsProvider>
</SidebarProvider>
</AuthContext.Provider>
</Brightness>
);
return (
<Brightness>
<AuthContext.Provider
value={{
isLoggedIn,
username,
userId,
isLive,
setIsLoggedIn,
setUsername,
setUserId,
setIsLive,
}}
>
<SidebarProvider>
<QuickSettingsProvider>
<BrowserRouter>
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="/dashboard" element={isLoggedIn ? <DashboardPage /> : <Navigate to="/" replace />} />
<Route path="/:streamerName" element={<StreamerRoute />} />
<Route path="/user/:username" element={<UserPage />} />
<Route path="/reset_password/:token" element={<ResetPasswordPage />}></Route>
<Route path="/category/:categoryName" element={<CategoryPage />}></Route>
<Route path="/categories" element={<CategoriesPage />}></Route>
<Route path="/results" element={<ResultsPage />}></Route>
<Route path="/404" element={<NotFoundPage />} />
<Route path="/user/:username/following" element={<Following />} />
<Route path="/user/:username/yourCategories" element={<FollowedCategories />} />
<Route path="*" element={<Navigate to="/404" replace />} />
</Routes>
</BrowserRouter>
</QuickSettingsProvider>
</SidebarProvider>
</AuthContext.Provider>
</Brightness>
);
}
export default App;