dylan/gander
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

FIX: solved merge conflicts

Browse Source
This commit is contained in:
white
2025-03-03 15:37:39 +00:00
parent 4d9afb77f1
commit 138379bcf1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/App.tsx
View File

@@ -15,12 +15,7 @@ import DashboardPage from "./pages/DashboardPage";
import { Brightness } from "./context/BrightnessContext";
import LoadingScreen from "./components/Layout/LoadingScreen";
import Following from "./pages/Following";
<<<<<<< HEAD
import FollowedCategories from "./pages/FollowedCategories";
import UnsubscribeForm from "./components/Auth/UnsubscribeForm";
import UnsubscribePage from "./pages/UnsubscribePage";
=======
>>>>>>> 2494e40ffd09ee704397c812f63d03bb7ec156f1
function App() {
const [isLoggedIn, setIsLoggedIn] = useState(false);
@@ -76,7 +71,7 @@ function App() {
<Route path="/:streamerName" element={<StreamerRoute />} />
<Route path="/user/:username" element={<UserPage />} />
<Route path="/reset_password/:token" element={<ResetPasswordPage />}></Route>
<Route path="user/unsubscribe/:token" element={<UnsubscribePage />}></Route>
<Route path="/user/unsubscribe/:token" element={<UnsubscribePage />}></Route>
<Route path="/category/:categoryName" element={<CategoryPage />}></Route>
<Route path="/categories" element={<CategoriesPage />}></Route>
<Route path="/results" element={<ResultsPage />}></Route>