diff --git a/src/api/loginApi.js b/src/api/loginApi.js index fa9bf41..c3cba83 100644 --- a/src/api/loginApi.js +++ b/src/api/loginApi.js @@ -23,10 +23,13 @@ export const loginApi = { export const userApi = { get_user_profile: async (userId) => { - const reponse = await fetch(`${AUTH_API_BASE_URL}/api/v1/user/profile/${userId}`, { - method: 'GET', - headers: { 'Content-Type': 'application/json' }, - }); + const reponse = await fetch( + `${AUTH_API_BASE_URL}/api/v1/user/profile/${userId}`, + { + method: 'GET', + headers: { 'Content-Type': 'application/json' }, + } + ); if (reponse.ok) { return reponse.json(); diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx index 90beef9..1a44675 100644 --- a/src/components/Dashboard.jsx +++ b/src/components/Dashboard.jsx @@ -41,7 +41,6 @@ const Dashboard = () => { }; const handleNavClick = (view) => { - console.log(view); if (view === 'profile') { navigate('/user/profile'); } else { diff --git a/src/components/ProfileForm.css b/src/components/ProfileForm.css index 8cb6739..31bd471 100644 --- a/src/components/ProfileForm.css +++ b/src/components/ProfileForm.css @@ -5,6 +5,7 @@ border: 1px solid #ccc; border-radius: 8px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); + background-color: #ffffff; } .profile-form h2 { @@ -27,8 +28,8 @@ display: block; } -.profile-form input[type="text"], -.profile-form input[type="tel"] { +.profile-form input[type='text'], +.profile-form input[type='tel'] { width: 100%; padding: 8px; border: 1px solid #ccc; diff --git a/src/components/ProfileForm.jsx b/src/components/ProfileForm.jsx index 886bc50..2ed853e 100644 --- a/src/components/ProfileForm.jsx +++ b/src/components/ProfileForm.jsx @@ -1,4 +1,5 @@ import React, { useState, useEffect } from 'react'; +import { useNavigate } from 'react-router-dom'; import { tokenService } from '../services/TokenService'; import { userApi } from '../api/loginApi'; @@ -6,23 +7,23 @@ import { userApi } from '../api/loginApi'; import './ProfileForm.css'; const ProfileForm = () => { + const navigate = useNavigate(); + const [activeView, setActiveView] = useState('profile'); const [formData, setFormData] = useState({ firstname: '', lastname: '', phone: '', username: '', createdDate: new Date().toISOString().split('T')[0], - lastLoginDate: new Date().toISOString().split('T')[0] + lastLoginDate: new Date().toISOString().split('T')[0], }); useEffect(() => { const fetchData = async () => { - console.log('Getting data'); const userId = tokenService.getUserId(); const response = await userApi.get_user_profile(userId); if (response) { - console.log('Response is good'); const userProfile = response.data[0]; setFormData((prev) => ({ ...prev, @@ -31,15 +32,14 @@ const ProfileForm = () => { phone: userProfile.phone_number, username: userProfile.username, createdDate: userProfile.created, - lastLoginDate: userProfile.last_login + lastLoginDate: userProfile.last_login, })); } else { - console.error("Error getting user profile"); + console.error('Error getting user profile'); } }; fetchData(); - }, []); const handleChange = (e) => { @@ -47,72 +47,113 @@ const ProfileForm = () => { setFormData({ ...formData, [name]: value }); }; + const handleNavClick = (view) => { + if (view === 'profile') { + navigate('/user/profile'); + } else { + navigate(`/${view}`); + } + }; + return ( -