diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 6a3468f..8b17e54 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -6,12 +6,13 @@ import LoginPage from "./components/authentication/LoginPage"; import SignUpPage from "./components/authentication/SignUpPage"; import NavBar from "./components/navigations/Navbar"; import Home from "./components/Home"; -import ProfileUpdate from "./components/ProfileUpdatePage"; import Calendar from "./components/calendar/calendar"; import KanbanBoard from "./components/kanbanBoard/kanbanBoard"; import IconSideNav from "./components/navigations/IconSideNav"; import Eisenhower from "./components/eisenhowerMatrix/Eisenhower"; import PrivateRoute from "./PrivateRoute"; +import ProfileUpdatePage from "./components/profilePage"; + const App = () => { const location = useLocation(); @@ -30,8 +31,8 @@ const App = () => { } /> } /> - }> - } /> + }> + } /> }> } /> diff --git a/frontend/src/components/ProfileUpdatePage.jsx b/frontend/src/components/ProfileUpdateComponent.jsx similarity index 97% rename from frontend/src/components/ProfileUpdatePage.jsx rename to frontend/src/components/ProfileUpdateComponent.jsx index 6985851..74da41f 100644 --- a/frontend/src/components/ProfileUpdatePage.jsx +++ b/frontend/src/components/ProfileUpdateComponent.jsx @@ -1,7 +1,7 @@ import React, { useState, useRef } from "react"; import { ApiUpdateUserProfile } from "../api/UserProfileApi"; -function ProfileUpdate() { +function ProfileUpdateComponent() { const [file, setFile] = useState(null); const [username, setUsername] = useState(""); const [fullName, setFullName] = useState(""); @@ -101,4 +101,4 @@ function ProfileUpdate() { ); } -export default ProfileUpdate; +export default ProfileUpdateComponent; diff --git a/frontend/src/components/navigations/Navbar.jsx b/frontend/src/components/navigations/Navbar.jsx index 6910405..0c95389 100644 --- a/frontend/src/components/navigations/Navbar.jsx +++ b/frontend/src/components/navigations/Navbar.jsx @@ -4,8 +4,8 @@ import axiosapi from "../../api/AuthenticationApi"; import { useAuth } from "../../hooks/authentication/IsAuthenticated"; const settings = { - Profile: "/update_profile", - Account: "/account", + Profile: '/profile', + Account: '/account', }; function NavBar() { diff --git a/frontend/src/components/profilePage.jsx b/frontend/src/components/profilePage.jsx new file mode 100644 index 0000000..2f00049 --- /dev/null +++ b/frontend/src/components/profilePage.jsx @@ -0,0 +1,146 @@ +import * as React from "react"; +import ProfileUpdateComponent from "./ProfileUpdateComponent"; + +function ProfileUpdatePage() { + return ( +
+
+
+
Username
+
Sirin
+
User ID
+
+
+
+ +
+
+
+
+ +
+
Health
+
+ 234/3213 +
+ + + +
+
+
32% Remain
+ +
+ +
+
Level
+
+ 1 +
+ + + +
+
+
3213/321312321 points
+ +
+ +
+
Gold
+
+ 331412421 +
+ + + +
+
+
Top 12% of Global Ranking
+ +
+
+ +
+
+

About me

+
+ +
+
+ +
+
+
+
+

Overall Statistics

+
+
+
+
+
+
+
+

Achievements

+
+
+
+
+
+
+
+

Friends

+
+
+
+
+
+ + + + {/* Modal */} + +
+
+ + + +
+
+
+ ); +} +export default ProfileUpdatePage;