|
|
@@ -1,7 +1,7 @@ |
|
|
|
import axios from 'axios' |
|
|
|
import toCamel from 'camelcase-keys' |
|
|
|
import { useEffect, useState } from 'react' |
|
|
|
import { BrowserRouter as Router, Route, Routes, Navigate } from 'react-router-dom' |
|
|
|
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom' |
|
|
|
|
|
|
|
import TopNav from '@/components/TopNav' |
|
|
|
import { Toaster } from '@/components/ui/toaster' |
|
|
@@ -70,29 +70,27 @@ export default () => { |
|
|
|
|
|
|
|
return ( |
|
|
|
<> |
|
|
|
<Router> |
|
|
|
<div className="flex flex-col h-screen w-screen"> |
|
|
|
<TopNav user={user} /> |
|
|
|
<div className="flex flex-1"> |
|
|
|
<Routes> |
|
|
|
<Route path="/" element={<Navigate to="/posts" replace />} /> |
|
|
|
<Route path="/posts" element={<PostListPage />} /> |
|
|
|
<Route path="/posts/new" element={<PostNewPage user={user} />} /> |
|
|
|
<Route path="/posts/:id" element={<PostDetailPage user={user} />} /> |
|
|
|
<Route path="/tags/nico" element={<NicoTagListPage user={user} />} /> |
|
|
|
<Route path="/wiki" element={<WikiSearchPage />} /> |
|
|
|
<Route path="/wiki/:title" element={<WikiDetailPage />} /> |
|
|
|
<Route path="/wiki/new" element={<WikiNewPage user={user} />} /> |
|
|
|
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user} />} /> |
|
|
|
<Route path="/wiki/:id/diff" element={<WikiDiffPage />} /> |
|
|
|
<Route path="/wiki/changes" element={<WikiHistoryPage />} /> |
|
|
|
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser} />} /> |
|
|
|
<Route path="/settings" element={<Navigate to="/users/settings" replace />} /> |
|
|
|
<Route path="*" element={<NotFound />} /> |
|
|
|
</Routes> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</Router> |
|
|
|
<div className="flex flex-col h-screen w-screen"> |
|
|
|
<TopNav user={user} /> |
|
|
|
<BrowserRouter> |
|
|
|
<Routes> |
|
|
|
<Route path="/" element={<Navigate to="/posts" replace />} /> |
|
|
|
<Route path="/posts" element={<PostListPage />} /> |
|
|
|
<Route path="/posts/new" element={<PostNewPage user={user} />} /> |
|
|
|
<Route path="/posts/:id" element={<PostDetailPage user={user} />} /> |
|
|
|
<Route path="/tags/nico" element={<NicoTagListPage user={user} />} /> |
|
|
|
<Route path="/wiki" element={<WikiSearchPage />} /> |
|
|
|
<Route path="/wiki/:title" element={<WikiDetailPage />} /> |
|
|
|
<Route path="/wiki/new" element={<WikiNewPage user={user} />} /> |
|
|
|
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user} />} /> |
|
|
|
<Route path="/wiki/:id/diff" element={<WikiDiffPage />} /> |
|
|
|
<Route path="/wiki/changes" element={<WikiHistoryPage />} /> |
|
|
|
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser} />} /> |
|
|
|
<Route path="/settings" element={<Navigate to="/users/settings" replace />} /> |
|
|
|
<Route path="*" element={<NotFound />} /> |
|
|
|
</Routes> |
|
|
|
</BrowserRouter> |
|
|
|
</div> |
|
|
|
<Toaster /> |
|
|
|
</>) |
|
|
|
} |