合并代码
Change-Id: Id5e0dc4f7b448b4ba615243bf1dfa964907f5d68
diff --git a/Merge/front/src/router/App.js b/Merge/front/src/router/App.js
index 4d606f9..3137fd8 100644
--- a/Merge/front/src/router/App.js
+++ b/Merge/front/src/router/App.js
@@ -14,6 +14,7 @@
import PlaceholderPage from '../components/PlaceholderPage'// src/components/PlaceholderPage.jsx
import UploadPage from '../components/UploadPage' // src/components/UploadPage.jsx
+import UserProfile from '../components/UserProfile'; // src/components/UserProfileRoute.jsx
import LoginPage from '../pages/LoginPage/LoginPage';
import RegisterPage from '../pages/RegisterPage/RegisterPage';
@@ -35,7 +36,7 @@
<Route path="/notes" element={<PlaceholderPage pageId="notes" />} />
<Route path="/creator" element={<PlaceholderPage pageId="creator" />} />
<Route path="/journal" element={<PlaceholderPage pageId="journal" />} />
-
+ <Route path="/user/:userId" element={<UserProfile />} />
<Route path="/dashboard/*" element={<UploadPage />} />
{/* 根路径重定向到 dashboard */}