Index: backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -113,5 +113,4 @@ public boolean checkEmail(String email) { - System.out.println("Checking if email exists: " + email); return userService.existsUserByEmail(email); } Index: backend/src/main/java/com/shifterwebapp/shifter/auth/RegisterDto.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/auth/RegisterDto.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/auth/RegisterDto.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -29,6 +29,4 @@ private List interests; - private List skills; - private List skillGap; } Index: backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -67,14 +67,15 @@ } - Object detailsObj = authentication.getDetails(); - if (!(detailsObj instanceof CustomAuthDetails details)) { - return ResponseEntity.badRequest().body(new ErrorResponse("Invalid authentication details")); - } - Long userId = details.getUserId(); + if (authentication != null && authentication.isAuthenticated()) { + Object detailsObj = authentication.getDetails(); + if (detailsObj instanceof CustomAuthDetails details) { + Long userId = details.getUserId(); + List enrolledCourseIds = enrollmentService.getCourseIdsByUserEnrollments(userId); - List enrolledCourseIds = enrollmentService.getCourseIdsByUserEnrollments(userId); - - if (enrolledCourseIds != null && !enrolledCourseIds.isEmpty()) { - spec = (spec == null) ? CourseSpecification.idNotIn(enrolledCourseIds) : spec.and(CourseSpecification.idNotIn(enrolledCourseIds)); + if (enrolledCourseIds != null && !enrolledCourseIds.isEmpty()) { + spec = (spec == null) ? CourseSpecification.idNotIn(enrolledCourseIds) + : spec.and(CourseSpecification.idNotIn(enrolledCourseIds)); + } + } } Index: backend/src/main/java/com/shifterwebapp/shifter/user/User.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/User.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/user/User.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -39,5 +39,6 @@ private Boolean isAdmin; - + + @Enumerated(EnumType.STRING) private CompanyType companyType; Index: backend/src/main/java/com/shifterwebapp/shifter/user/UserController.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/UserController.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/user/UserController.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -3,5 +3,4 @@ import com.shifterwebapp.shifter.Validate; import com.shifterwebapp.shifter.auth.CustomAuthDetails; -import com.shifterwebapp.shifter.enums.CompanyType; import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; @@ -34,4 +33,17 @@ } + @PutMapping("/update") + public ResponseEntity updateUser(Authentication authentication, @RequestBody UserInfoDto userInfoDto) { + validate.validateUserIsAuthenticated(authentication); + Object detailsObj = authentication.getDetails(); + if (!(detailsObj instanceof CustomAuthDetails details)) { + return ResponseEntity.badRequest().body(new ErrorResponse("Invalid authentication details")); + } + Long userId = details.getUserId(); + + UserDto userDto = userService.updateUser(userId, userInfoDto); + return ResponseEntity.ok(userDto); + } + @GetMapping("/{userId}") public ResponseEntity getUser(@PathVariable Long userId) { @@ -46,10 +58,4 @@ } - @PutMapping("/{userId}/name") - public ResponseEntity updateName(@PathVariable Long userId, @RequestParam String newName) { - UserDto userDto = userService.updateName(userId, newName); - return ResponseEntity.ok(userDto); - } - @PutMapping("/{userId}/mail") public ResponseEntity updateMail(@PathVariable Long userId, @RequestParam String newMail) { @@ -61,16 +67,4 @@ public ResponseEntity updatePassword(@PathVariable Long userId, @RequestParam String newPassword) { UserDto userDto = userService.updatePassword(userId, newPassword); - return ResponseEntity.ok(userDto); - } - - @PutMapping("/{userId}/work-position") - public ResponseEntity updateWorkPosition(@PathVariable Long userId, @RequestParam String newWorkPosition) { - UserDto userDto = userService.updateWorkPosition(userId, newWorkPosition); - return ResponseEntity.ok(userDto); - } - - @PutMapping("/{userId}/company-type") - public ResponseEntity updateCompanyType(@PathVariable Long userId, @RequestParam CompanyType newCompanyType) { - UserDto userDto = userService.updateCompanyType(userId, newCompanyType); return ResponseEntity.ok(userDto); } Index: backend/src/main/java/com/shifterwebapp/shifter/user/UserInfoDto.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/UserInfoDto.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ backend/src/main/java/com/shifterwebapp/shifter/user/UserInfoDto.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,13 @@ +package com.shifterwebapp.shifter.user; + +import com.shifterwebapp.shifter.enums.CompanyType; +import lombok.Data; + +@Data +public class UserInfoDto { + + public String name; + public String workPosition; + private CompanyType companyType; + +} Index: backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -2,11 +2,10 @@ import com.shifterwebapp.shifter.auth.RegisterDto; +import com.shifterwebapp.shifter.user.UserInfoDto; import com.shifterwebapp.shifter.payment.Payment; import com.shifterwebapp.shifter.user.User; import com.shifterwebapp.shifter.user.UserDto; -import com.shifterwebapp.shifter.enums.CompanyType; import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; -import org.springframework.security.core.Authentication; import java.util.List; @@ -22,9 +21,8 @@ void deleteUser(Long id); - UserDto updateName(Long id, String newName); + UserDto updateUser(Long id, UserInfoDto userInfoDto); + UserDto updateMail(Long id, String newMail); UserDto updatePassword(Long id, String newPassHash); - UserDto updateWorkPosition(Long id, String newWorkPosition); - UserDto updateCompanyType(Long id, CompanyType newCompanyType); UserDto addInterest(Long id, Interests newInterest); Index: backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -3,11 +3,10 @@ import com.shifterwebapp.shifter.Validate; import com.shifterwebapp.shifter.auth.RegisterDto; -import com.shifterwebapp.shifter.enums.CompanyType; import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; +import com.shifterwebapp.shifter.user.UserInfoDto; import com.shifterwebapp.shifter.payment.Payment; import com.shifterwebapp.shifter.user.*; import lombok.RequiredArgsConstructor; -import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -68,5 +67,5 @@ .workPosition(registerDto.getWorkPosition()) .interests(registerDto.getInterests()) - .skills(registerDto.getSkills()) + .skills(List.of()) .skillGap(registerDto.getSkillGap()) .points(0) @@ -84,11 +83,22 @@ @Override - public UserDto updateName(Long userId, String newName) { - validate.validateUserExists(userId); - User user = userRepository.findById(userId).orElseThrow(); - user.setName(newName); - userRepository.save(user); - return userMapper.toDto(user); - } + public UserDto updateUser(Long id, UserInfoDto userInfoDto) { + validate.validateUserExists(id); + User user = userRepository.findById(id).orElseThrow(); + + if (userInfoDto.getName() != null) { + user.setName(userInfoDto.getName()); + } + if (userInfoDto.getCompanyType() != null) { + user.setCompanyType(userInfoDto.getCompanyType()); + } + if (userInfoDto.getWorkPosition() != null) { + user.setWorkPosition(userInfoDto.getWorkPosition()); + } + + userRepository.save(user); + return userMapper.toDto(user); + } + @Override @@ -106,22 +116,4 @@ User user = userRepository.findById(userId).orElseThrow(); user.setPasswordHash(passwordEncoder.encode(newPass)); - userRepository.save(user); - return userMapper.toDto(user); - } - - @Override - public UserDto updateWorkPosition(Long userId, String newWorkPosition) { - validate.validateUserExists(userId); - User user = userRepository.findById(userId).orElseThrow(); - user.setWorkPosition(newWorkPosition); - userRepository.save(user); - return userMapper.toDto(user); - } - - @Override - public UserDto updateCompanyType(Long userId, CompanyType newCompanyType) { - validate.validateUserExists(userId); - User user = userRepository.findById(userId).orElseThrow(); - user.setCompanyType(newCompanyType); userRepository.save(user); return userMapper.toDto(user); Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/App.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -1,3 +1,3 @@ -import { BrowserRouter as Router, Route, Routes, useLocation } from "react-router-dom"; +import { Route, Routes, useLocation } from "react-router-dom"; import Home from "./pages/Home.tsx"; import Navbar from "./layout/Navbar.tsx"; @@ -45,16 +45,7 @@ function App() { - // const {loading} = useGlobalContext(); - // - // if (loading) - // return ( - //
- //
- //
- // ) return ( - + <> @@ -68,5 +59,5 @@ /> - + ); } Index: frontend/src/api/userApi.ts =================================================================== --- frontend/src/api/userApi.ts (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/api/userApi.ts (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -14,2 +14,14 @@ ) } + +export const updateUserApi = async (userInfo: {name: string, workPosition: string, companyType: string}, accessToken: string): Promise => { + await axios.put( + `${backendUrl}/api/users/update`, + userInfo, + { + headers: { + Authorization: `Bearer ${accessToken}`, + } + } + ) +} Index: frontend/src/components/CollaborationSteps.tsx =================================================================== --- frontend/src/components/CollaborationSteps.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/components/CollaborationSteps.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -17,5 +17,5 @@ title: 'Review Your Personalized Plan', description: - 'Receive a tailored roadmap with clear, actionable steps to help you achieve business success.', + 'Receive a tailored roadmap with clear, actionable registerSteps to help you achieve business success.', }, { Index: frontend/src/components/CoursesFilters.tsx =================================================================== --- frontend/src/components/CoursesFilters.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/components/CoursesFilters.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -3,4 +3,5 @@ import {durationToQueryMapper, priceToQueryMapper} from "../utils/mapper.ts"; import type {FilterParams} from "../types/FilterParams.tsx"; +import {useGlobalContext} from "../context/GlobalContext.tsx"; function CoursesFilters({filters, setFilters, topics, skills}: { @@ -10,4 +11,5 @@ skills: string[] | null, }) { + const {user} = useGlobalContext(); const duration = [ "< 3 hours", @@ -86,10 +88,14 @@

Filter by

- {handleShowOnlyFavoritesChange()}} - selectedOptions={filters.showOnlyFavoriteCourses ? ["My favorites"] : []} - /> + { + user && ( + {handleShowOnlyFavoritesChange()}} + selectedOptions={filters.showOnlyFavoriteCourses ? ["My favorites"] : []} + /> + ) + } setShowAll(!showAll)} - className="w-fit underline cursor-pointer hover:bg-dark-blue/10 hover:text-shifter" + className="p-2 rounded-sm w-fit underline cursor-pointer hover:bg-shifter/10 hover:text-shifter" > {showAll ? "Show less" : `Show ${filteredOptions.length - 4} more`} Index: ontend/src/components/HeroProfile.tsx =================================================================== --- frontend/src/components/HeroProfile.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,71 +1,0 @@ -import {useGlobalContext} from "../context/GlobalContext.tsx"; -import {useCourseStorage} from "../context/CourseStorage.ts"; - -function HeroProfile({selectedTab, setSelectedTab} : { - selectedTab: string; - setSelectedTab: (tab: string) => void; -}) { - const {user} = useGlobalContext(); - const {enrollments} = useCourseStorage(); - console.log(user) - console.log(enrollments) - - return ( -
- {/*USER INFO*/} -
-
-
-

{user?.name}

- {user?.workPosition} | {user?.companyType && (user.companyType.charAt(0) + user.companyType.toLowerCase().slice(1))} -
- { - user?.skills.map((skill, index) => ( - - { - skill - .charAt(0).toUpperCase() + skill.slice(1).toLowerCase() - } - - )) - } -
-
-
- - {/*TAB NAVIGATION*/} -
    -
  • setSelectedTab("myCourses")} - className={`${selectedTab === "myCourses" && "border-b-2 border-shifter text-shifter"} - text-lg font-semibold cursor-pointer py-1 px-4 text-black/40 - `} - > - My Courses
    • -
  • setSelectedTab("ratings")} - className={`${selectedTab === "ratings" && "border-b-2 border-shifter text-shifter"} - text-lg font-semibold cursor-pointer py-1 px-4 text-black/40 - `} - >Ratings
    • -
  • setSelectedTab("profile")} - className={`${selectedTab === "profile" && "border-b-2 border-shifter text-shifter"} - text-lg font-semibold cursor-pointer py-1 px-4 text-black/40 - `} - >Profile
    • -
  • setSelectedTab("settings")} - className={`${selectedTab === "settings" && "border-b-2 border-shifter text-shifter"} - text-lg font-semibold cursor-pointer py-1 px-4 text-black/40 - `} - >Settings
    • -
-
- ) -} - -export default HeroProfile; Index: frontend/src/components/ProfileInfo.tsx =================================================================== --- frontend/src/components/ProfileInfo.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/ProfileInfo.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,31 @@ +import {useGlobalContext} from "../context/GlobalContext.tsx"; + +function ProfileInfo() { + const {user} = useGlobalContext(); + console.log(user) + + return ( +
+ +
+ {user?.name + ?.split(/[\s_]+/) + .map(word => word[0]?.toUpperCase()) + .join('') + } +
+ +
+

{user?.name}

+

{user?.email}

+
+ + +
+ ) +} + +export default ProfileInfo; Index: frontend/src/components/ProfileMyProfile.tsx =================================================================== --- frontend/src/components/ProfileMyProfile.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/ProfileMyProfile.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,97 @@ +import {useGlobalContext} from "../context/GlobalContext.tsx"; +import React, {useState} from "react"; +import {updateUserApi} from "../api/userApi.ts"; + +function ProfileMyProfile() { + const [loading, setLoading] = useState(false); + const {user, setUser, accessToken} = useGlobalContext(); + + const [formData, setFormData] = useState({ + name: user?.name || "", + workPosition: user?.workPosition || "", + companyType: user?.companyType || "" + }); + + const handleSubmit = (e: React.FormEvent) => { + e.preventDefault(); + + setLoading(true); + updateUserApi(formData, accessToken || "") + .then(() => { + console.log("User updated successfully:"); + setUser(prev => { + if (!prev) return prev; + return { + ...prev, + name: formData.name, + workPosition: formData.workPosition, + companyType: formData.companyType + }; + }); + + }) + .catch(error => { + console.error("Error updating user:", error); + }) + .finally(() => { + setLoading(false); + }) + }; + + return ( +
+

My Profile

+
+ + + +
+ + { + loading && ( +
+ ) + } +
+
+
+ ) +} + +function Input({name, value, func}: { + name: string; + value: string; + func: React.Dispatch>; +}) { + + return ( + func(prev => ({...prev, [name]: e.target.value}))} + name={name} + /> + ) +} + +export default ProfileMyProfile; Index: frontend/src/components/ProfileSkills&Interests.tsx =================================================================== --- frontend/src/components/ProfileSkills&Interests.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/ProfileSkills&Interests.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,43 @@ +import React from "react"; + +function ProfileSkillsInterests({ title, pills }: { + title: string; + pills: string[]; +}) { + const [showAll, setShowAll] = React.useState(false); + + const visiblePills = showAll ? pills : pills.slice(0, 4); // Show 6 by default + + return ( +
+

{title}

+
+ { + visiblePills.map((pill, index) => ( + + {pill + .toLowerCase() + .replace(/_/g, " ") + .replace(/\b\w/g, char => char.toUpperCase()) + } + + )) + } + + {pills.length > 4 && ( + + )} +
+
+ ); +} + +export default ProfileSkillsInterests; Index: frontend/src/components/registerSteps/RegisterStepFour.tsx =================================================================== --- frontend/src/components/registerSteps/RegisterStepFour.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/registerSteps/RegisterStepFour.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,52 @@ +import React, {useEffect} from "react"; +import type {UserRegister} from "../../types/UserRegister.tsx"; +import RegisterSlider from "../inputs/RegisterSlider.tsx"; +import {fetchCoursesSkillsApi} from "../../api/courseApi.ts"; + +function RegisterStepFour({setUser, user, setError}: { + setUser: React.Dispatch>, + user: UserRegister, + setError: React.Dispatch>, +}){ + const [skills, setSkills] = React.useState([]); + + useEffect(() => { + const fetchSkills = async () => { + try { + const skillsData = await fetchCoursesSkillsApi(); + setSkills(skillsData); + } catch (err) { + console.error("Failed to fetch skills", err); + } + }; + + fetchSkills(); + }, []); + + useEffect(() => { + if (user.skillGap.length === 0) { + setError("We’d love to support your growth — select at least one skill you'd like to improve"); + } else { + setError(""); + } + }, [user.skillGap]); + + return ( +
+ { + skills.length > 0 && + + } +
+ ) +} + +export default RegisterStepFour; Index: frontend/src/components/registerSteps/RegisterStepOne.tsx =================================================================== --- frontend/src/components/registerSteps/RegisterStepOne.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/registerSteps/RegisterStepOne.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,70 @@ +import React, {useEffect} from "react"; +import type {UserRegister} from "../../types/UserRegister.tsx"; +import RegisterInput from "../inputs/RegisterInput.tsx"; +import {isValidEmail, hasUppercase, hasDigit, hasSpecialChar} from "../../utils/validation.ts"; + +function RegisterStepOne({setUser, user, setError}: { + setUser: React.Dispatch>, + user: UserRegister, + setError: React.Dispatch>, +}) { + const [showPassword, setShowPassword] = React.useState(false); + + useEffect(() => { + if (!user.email || !user.password || !user.passwordConfirmation) { + setError("Please ensure all inputs are completed."); + } else if (user.email && !isValidEmail(user.email)) { + setError("Email must be valid"); + } else if (user.password && user.passwordConfirmation && user.password !== user.passwordConfirmation) { + setError("Passwords do not match"); + } else if (!hasUppercase(user.password)) { + setError("Password must contain at least one uppercase letter"); + } else if (!hasDigit(user.password)) { + setError("Password must contain at least one digit"); + } else if (!hasSpecialChar(user.password)) { + setError("Password must contain at least one special character"); + } else { + setError(""); + } + + }, [user.email, user.password, user.passwordConfirmation]) + + return ( +
+ + + +
+ ); +} + +export default RegisterStepOne; Index: frontend/src/components/registerSteps/RegisterStepThree.tsx =================================================================== --- frontend/src/components/registerSteps/RegisterStepThree.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/registerSteps/RegisterStepThree.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,53 @@ +import React, {useEffect} from "react"; +import type {UserRegister} from "../../types/UserRegister.tsx"; +import RegisterSlider from "../inputs/RegisterSlider.tsx"; +import {fetchCoursesTopicsApi} from "../../api/courseApi.ts"; + +function RegisterStepThree({setUser, user, setError}: { + setUser: React.Dispatch>, + user: UserRegister, + setError: React.Dispatch>, +}) { + const [interests, setInterests] = React.useState([]); + + useEffect(() => { + const fetchCourseTopics = async () => { + try { + const topicsData = await fetchCoursesTopicsApi(); + setInterests(topicsData); + } catch (err) { + console.error("Failed to fetch course topics (user interests)", err); + } + }; + + fetchCourseTopics(); + }, []); + + useEffect(() => { + if (user.interests.length === 0) { + setError("Help us understand you better — pick at least one preference"); + } else { + setError(""); + } + }, [user.interests]); + + + return ( +
+ { + interests.length > 0 && + + } +
+ ) +} + +export default RegisterStepThree; Index: frontend/src/components/registerSteps/RegisterStepTwo.tsx =================================================================== --- frontend/src/components/registerSteps/RegisterStepTwo.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/registerSteps/RegisterStepTwo.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,53 @@ +import React, {useEffect} from "react"; +import type {UserRegister} from "../../types/UserRegister.tsx"; +import RegisterInput from "../inputs/RegisterInput.tsx"; +import RegisterSelect from "../inputs/RegisterSelect.tsx"; + +function RegisterStepTwo({setUser, user, setError}: { + setUser: React.Dispatch>, + user: UserRegister, + setError: React.Dispatch>, +}) { + + useEffect(() => { + if (!user.name || !user.workPosition || !user.companyType) { + setError("Please ensure all inputs are completed."); + } else { + setError(""); + } + }, [user.name, user.workPosition, user.companyType]); + + return ( +
+ + + +
+ ); +} + +export default RegisterStepTwo; Index: frontend/src/components/skeletons/ProfileSkeleton.tsx =================================================================== --- frontend/src/components/skeletons/ProfileSkeleton.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) +++ frontend/src/components/skeletons/ProfileSkeleton.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -0,0 +1,52 @@ + +function ProfileSkeleton() { + return ( +
+
+ {/* ProfileInfo Skeleton */} +
+ {/* Avatar skeleton */} +
+ + {/* Name and email skeleton */} +
+
+
+
+
+ + {/* ProfileSkillsInterests Skeletons - 3 sections */} + {["Learned Skills", "Desired Skills", "Interests"].map((_, index) => ( +
+
+
+ {/* Skills pills skeleton */} + {[...Array(4)].map((_, pillIndex) => ( +
+ ))} + {/* Show more button skeleton */} +
+
+
+ ))} +
+ +
+ {/* ProfileMyProfile Skeleton */} +
+
+
+ {/* Form inputs skeleton */} + {[...Array(3)].map((_, index) => ( +
+ ))} + {/* Submit button skeleton */} +
+
+
+
+
+ ); +} + +export default ProfileSkeleton; Index: ontend/src/components/steps/RegisterStepFive.tsx =================================================================== --- frontend/src/components/steps/RegisterStepFive.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,52 +1,0 @@ -import React, {useEffect} from "react"; -import type {UserRegister} from "../../types/UserRegister.tsx"; -import RegisterSlider from "../inputs/RegisterSlider.tsx"; -import {fetchCoursesSkillsApi} from "../../api/courseApi.ts"; - -function RegisterStepFive({setUser, user, setError}: { - setUser: React.Dispatch>, - user: UserRegister, - setError: React.Dispatch>, -}){ - const [skills, setSkills] = React.useState([]); - - useEffect(() => { - const fetchSkills = async () => { - try { - const skillsData = await fetchCoursesSkillsApi(); - setSkills(skillsData); - } catch (err) { - console.error("Failed to fetch skills", err); - } - }; - - fetchSkills(); - }, []); - - useEffect(() => { - if (user.skillsGap.length === 0) { - setError("We’d love to support your growth — select at least one skill you'd like to improve"); - } else { - setError(""); - } - }, [user.skillsGap]); - - return ( -
- { - skills.length > 0 && - - } -
- ) -} - -export default RegisterStepFive; Index: ontend/src/components/steps/RegisterStepFour.tsx =================================================================== --- frontend/src/components/steps/RegisterStepFour.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,53 +1,0 @@ -import React, {useEffect} from "react"; -import type {UserRegister} from "../../types/UserRegister.tsx"; -import RegisterSlider from "../inputs/RegisterSlider.tsx"; -import {fetchCoursesSkillsApi} from "../../api/courseApi.ts"; - -function RegisterStepFour({setUser, user, setError}: { - setUser: React.Dispatch>, - user: UserRegister, - setError: React.Dispatch>, -}) { - const [skills, setSkills] = React.useState([]); - - useEffect(() => { - const fetchSkills = async () => { - try { - const skillsData = await fetchCoursesSkillsApi(); - setSkills(skillsData); - } catch (err) { - console.error("Failed to fetch skills", err); - } - }; - - fetchSkills(); - }, []); - - useEffect(() => { - if (user.skills.length === 0) { - setError("Tell us what you're great at — choose at least one strength"); - } else { - setError(""); - } - }, [user.skills]); - - - return ( -
- { - skills.length > 0 && - - } -
- ) -} - -export default RegisterStepFour; Index: ontend/src/components/steps/RegisterStepOne.tsx =================================================================== --- frontend/src/components/steps/RegisterStepOne.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,70 +1,0 @@ -import React, {useEffect} from "react"; -import type {UserRegister} from "../../types/UserRegister.tsx"; -import RegisterInput from "../inputs/RegisterInput.tsx"; -import {isValidEmail, hasUppercase, hasDigit, hasSpecialChar} from "../../utils/validation.ts"; - -function RegisterStepOne({setUser, user, setError}: { - setUser: React.Dispatch>, - user: UserRegister, - setError: React.Dispatch>, -}) { - const [showPassword, setShowPassword] = React.useState(false); - - useEffect(() => { - if (!user.email || !user.password || !user.passwordConfirmation) { - setError("Please ensure all inputs are completed."); - } else if (user.email && !isValidEmail(user.email)) { - setError("Email must be valid"); - } else if (user.password && user.passwordConfirmation && user.password !== user.passwordConfirmation) { - setError("Passwords do not match"); - } else if (!hasUppercase(user.password)) { - setError("Password must contain at least one uppercase letter"); - } else if (!hasDigit(user.password)) { - setError("Password must contain at least one digit"); - } else if (!hasSpecialChar(user.password)) { - setError("Password must contain at least one special character"); - } else { - setError(""); - } - - }, [user.email, user.password, user.passwordConfirmation]) - - return ( -
- - - -
- ); -} - -export default RegisterStepOne; Index: ontend/src/components/steps/RegisterStepThree.tsx =================================================================== --- frontend/src/components/steps/RegisterStepThree.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,53 +1,0 @@ -import React, {useEffect} from "react"; -import type {UserRegister} from "../../types/UserRegister.tsx"; -import RegisterSlider from "../inputs/RegisterSlider.tsx"; -import {fetchCoursesTopicsApi} from "../../api/courseApi.ts"; - -function RegisterStepThree({setUser, user, setError}: { - setUser: React.Dispatch>, - user: UserRegister, - setError: React.Dispatch>, -}) { - const [interests, setInterests] = React.useState([]); - - useEffect(() => { - const fetchCourseTopics = async () => { - try { - const topicsData = await fetchCoursesTopicsApi(); - setInterests(topicsData); - } catch (err) { - console.error("Failed to fetch course topics (user interests)", err); - } - }; - - fetchCourseTopics(); - }, []); - - useEffect(() => { - if (user.interests.length === 0) { - setError("Help us understand you better — pick at least one preference"); - } else { - setError(""); - } - }, [user.interests]); - - - return ( -
- { - interests.length > 0 && - - } -
- ) -} - -export default RegisterStepThree; Index: ontend/src/components/steps/RegisterStepTwo.tsx =================================================================== --- frontend/src/components/steps/RegisterStepTwo.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ (revision ) @@ -1,53 +1,0 @@ -import React, {useEffect} from "react"; -import type {UserRegister} from "../../types/UserRegister.tsx"; -import RegisterInput from "../inputs/RegisterInput.tsx"; -import RegisterSelect from "../inputs/RegisterSelect.tsx"; - -function RegisterStepTwo({setUser, user, setError}: { - setUser: React.Dispatch>, - user: UserRegister, - setError: React.Dispatch>, -}) { - - useEffect(() => { - if (!user.name || !user.workPosition || !user.companyType) { - setError("Please ensure all inputs are completed."); - } else { - setError(""); - } - }, [user.name, user.workPosition, user.companyType]); - - return ( -
- - - -
- ); -} - -export default RegisterStepTwo; Index: frontend/src/context/GlobalContext.tsx =================================================================== --- frontend/src/context/GlobalContext.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/context/GlobalContext.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -10,4 +10,5 @@ import type {UserRegister} from "../types/UserRegister.tsx"; import {loginApi, logoutApi, refreshAccessTokenApi, registerApi} from "../api/auth.ts"; +import {useNavigate} from "react-router-dom"; interface GlobalContextType { @@ -31,4 +32,5 @@ const [accessToken, setAccessToken] = useState(null); const [loading, setLoading] = useState(true); + const navigate = useNavigate(); const register = async (user: UserRegister) => { @@ -65,4 +67,5 @@ setAccessToken(null); setUser(null); + navigate("/"); }) .catch(err => { Index: frontend/src/layout/Footer.tsx =================================================================== --- frontend/src/layout/Footer.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/layout/Footer.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -2,10 +2,9 @@ import {Link} from "react-router-dom"; import {useGlobalContext} from "../context/GlobalContext.tsx"; -import ShifterRocket from "../../public/Rocket-Blue.png" import LinkedIn from "../assets/icons/LinkedIn.tsx"; import Instagram from "../assets/icons/Instagram.tsx"; function Footer() { - const {user} = useGlobalContext(); + const {user, logout} = useGlobalContext(); return ( @@ -80,12 +79,8 @@
- Favorite Courses -
-
-
- My Courses +
@@ -101,5 +96,26 @@ - {/*CONTAXT*/} + {/*DASHBOARD*/} + { + user && +
+

Dashboard

+ +
+ My Courses +
+
+
+ Favorite Courses +
+
+
+ } + + {/*CONTACT*/}

Contact

Index: frontend/src/layout/Navbar.tsx =================================================================== --- frontend/src/layout/Navbar.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/layout/Navbar.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -43,7 +43,5 @@ {/* Right side icons and button */} -
- {/**/} - {/**/} +
@@ -57,20 +55,29 @@ <>
- Profile + Dashboard
+ rounded-full transition-all duration-300 ease-in-out"/>
-
Free Consultation
+
+ + {user.name.split(" ")[0].charAt(0).toUpperCase()} + +
Free Consultation +
+
) : ( Login / Register ) Index: frontend/src/main.tsx =================================================================== --- frontend/src/main.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/main.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -4,10 +4,13 @@ import App from './App.tsx' import {GlobalProvider} from "./context/GlobalContext.tsx"; +import {BrowserRouter} from "react-router-dom"; createRoot(document.getElementById('root')!).render( - - - + + + + + , ) Index: frontend/src/pages/Profile.tsx =================================================================== --- frontend/src/pages/Profile.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/pages/Profile.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -1,11 +1,27 @@ -import HeroProfile from "../components/HeroProfile.tsx"; -import {useState} from "react"; +import ProfileInfo from "../components/ProfileInfo.tsx"; +import ProfileSkillsInterests from "../components/ProfileSkills&Interests.tsx"; +import {useGlobalContext} from "../context/GlobalContext.tsx"; +import ProfileMyProfile from "../components/ProfileMyProfile.tsx"; +import ProfileSkeleton from "../components/skeletons/ProfileSkeleton.tsx"; function Profile() { - const [selectedTab, setSelectedTab] = useState("myCourses"); + const {user, loading} = useGlobalContext(); + + if (loading) { + return ; + } return ( -
- +
+
+ + {user?.skills && user.skills.length > 0 && ()} + + +
+ +
+ +
) Index: frontend/src/pages/Register.tsx =================================================================== --- frontend/src/pages/Register.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/pages/Register.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -12,9 +12,8 @@ import {motion, AnimatePresence} from "framer-motion"; import type {UserRegister} from "../types/UserRegister.tsx"; -import RegisterStepOne from "../components/steps/RegisterStepOne.tsx"; -import RegisterStepTwo from "../components/steps/RegisterStepTwo.tsx"; -import RegisterStepThree from "../components/steps/RegisterStepThree.tsx"; -import RegisterStepFour from "../components/steps/RegisterStepFour.tsx"; -import RegisterStepFive from "../components/steps/RegisterStepFive.tsx"; +import RegisterStepOne from "../components/registerSteps/RegisterStepOne.tsx"; +import RegisterStepTwo from "../components/registerSteps/RegisterStepTwo.tsx"; +import RegisterStepThree from "../components/registerSteps/RegisterStepThree.tsx"; +import RegisterStepFour from "../components/registerSteps/RegisterStepFour.tsx"; import {useGlobalContext} from "../context/GlobalContext.tsx"; import {isValidEmail} from "../utils/validation.ts"; @@ -37,6 +36,5 @@ companyType: "", interests: [], - skills: [], - skillsGap: [], + skillGap: [], }); const navigate = useNavigate(); @@ -123,6 +121,5 @@ , , - , - + ]; Index: frontend/src/types/SliderProps.tsx =================================================================== --- frontend/src/types/SliderProps.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/types/SliderProps.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -2,5 +2,5 @@ import type {UserRegister} from "./UserRegister.tsx"; -type UserArrayFields = 'interests' | 'skills' | 'skillsGap'; +type UserArrayFields = 'interests' | 'skills' | 'skillGap'; export interface SliderProps { label: string; Index: frontend/src/types/User.tsx =================================================================== --- frontend/src/types/User.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/types/User.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -7,5 +7,5 @@ interests: string[]; skills: string[]; - skillsGap: string[]; + skillGap: string[]; points: number; favoriteCourses: number[]; Index: frontend/src/types/UserRegister.tsx =================================================================== --- frontend/src/types/UserRegister.tsx (revision 3b9a2ae4985b4a733b21f6ff291fc8f9b242deaa) +++ frontend/src/types/UserRegister.tsx (revision 53ff2668ca572fbec7428abacd1ec28b5173f7fc) @@ -7,5 +7,4 @@ companyType: string; interests: string[]; - skills: string[]; - skillsGap: string[]; + skillGap: string[]; }