Index: .idea/.gitignore =================================================================== --- .idea/.gitignore (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ .idea/.gitignore (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ Index: .idea/Shifter.iml =================================================================== --- .idea/Shifter.iml (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ .idea/Shifter.iml (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,12 @@ + + + + + + + + + + + + Index: .idea/inspectionProfiles/Project_Default.xml =================================================================== --- .idea/inspectionProfiles/Project_Default.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ .idea/inspectionProfiles/Project_Default.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,6 @@ + + + + Index: .idea/modules.xml =================================================================== --- .idea/modules.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ .idea/modules.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,8 @@ + + + + + + + + Index: .idea/vcs.xml =================================================================== --- .idea/vcs.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ .idea/vcs.xml (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,6 @@ + + + + + + Index: backend/src/main/java/com/shifterwebapp/shifter/auth/AuthController.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/auth/AuthController.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/auth/AuthController.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,4 +2,6 @@ import com.shifterwebapp.shifter.user.service.UserService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -7,4 +9,5 @@ import org.springframework.web.bind.annotation.*; +import java.io.IOException; import java.util.Map; @@ -19,23 +22,34 @@ @PostMapping("/register") - public ResponseEntity register(@RequestBody RegisterDto request) { - return ResponseEntity.ok(authService.register(request)); + public void register(@RequestBody RegisterDto request, HttpServletResponse response) throws IOException { + authService.register(request, response); } @PostMapping("/authenticate") - public ResponseEntity authenticate(@RequestBody LoginDto request) { - return ResponseEntity.ok(authService.authenticate(request)); + public void authenticate(@RequestBody LoginDto request, HttpServletResponse response) throws IOException { + authService.authenticate(request, response); } @PostMapping("/refresh") - public ResponseEntity refreshToken(@RequestBody TokenRefreshDto request) { - AuthResponse response = authService.refreshToken(request.getRefreshToken()); + public ResponseEntity refreshToken(HttpServletRequest request) { + AuthResponse response = authService.refreshToken(request); return ResponseEntity.ok(response); } + @PostMapping("/logout") + public void logout(HttpServletResponse response) { + authService.logout(response); + } + + @GetMapping("/check-email") + public ResponseEntity checkEmail(@RequestParam String email) { + boolean exists = authService.checkEmail(email); + return ResponseEntity.ok(exists); + } + @PostMapping("/delete") - public ResponseEntity deleteAll(@RequestParam Long accountId) { + public ResponseEntity delete(@RequestParam Long accountId) { userService.deleteUser(accountId); - return ResponseEntity.ok("User registered successfully"); + return ResponseEntity.ok("User deleted successfully"); } } Index: backend/src/main/java/com/shifterwebapp/shifter/auth/AuthResponse.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/auth/AuthResponse.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/auth/AuthResponse.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -11,5 +11,4 @@ public class AuthResponse { private String accessToken; - private String refreshToken; private UserDto user; Index: backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/auth/AuthService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -1,12 +1,21 @@ package com.shifterwebapp.shifter.auth; +import com.fasterxml.jackson.databind.ObjectMapper; import com.shifterwebapp.shifter.config.JwtService; import com.shifterwebapp.shifter.user.User; import com.shifterwebapp.shifter.user.UserMapper; import com.shifterwebapp.shifter.user.service.UserService; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.time.Duration; @Service @@ -19,25 +28,36 @@ private final AuthenticationManager authenticationManager; - public AuthResponse register(RegisterDto request) { - // Create user in the database - User user = userService.createUser(request); - - // Generate token + private void sendTokens(HttpServletResponse response, User user) throws IOException { String accessToken = jwtService.generateToken(user); String refreshToken = jwtService.generateRefreshToken(user); - System.out.println("Generated access token: " + accessToken); - System.out.println("Generated refresh token: " + refreshToken); + // Create secure HTTP-only cookie for refresh token + ResponseCookie cookie = ResponseCookie.from("refreshToken", refreshToken) + .httpOnly(true) + .secure(true) // true if using HTTPS + .path("/") + .maxAge(Duration.ofDays(7)) + .sameSite("Strict") + .build(); + response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString()); - // Return response with tokens and user details - return AuthResponse.builder() + AuthResponse authResponse = AuthResponse.builder() .accessToken(accessToken) - .refreshToken(refreshToken) .user(userMapper.toDto(user)) .build(); + + ObjectMapper mapper = new ObjectMapper(); + response.setContentType("application/json"); + mapper.writeValue(response.getOutputStream(), authResponse); } - public AuthResponse authenticate(LoginDto request) { - // Authenticate credentials + + public void register(RegisterDto request, HttpServletResponse response) throws IOException { + User user = userService.createUser(request); + sendTokens(response, user); + } + + + public void authenticate(LoginDto request, HttpServletResponse response) throws IOException { authenticationManager.authenticate( new UsernamePasswordAuthenticationToken( @@ -46,33 +66,28 @@ ) ); - - // Load userDetails and generate token User user = userService.getUserByEmail(request.getEmail()); - String accessToken = jwtService.generateToken(user); - String refreshToken = jwtService.generateRefreshToken(user); - - System.out.println(user); - System.out.println("------------------------------------------"); - System.out.println(userMapper.toDto(user)); - - // Return response with tokens and user details - return AuthResponse.builder() - .accessToken(accessToken) - .refreshToken(refreshToken) - .user(userMapper.toDto(user)) - .build(); + sendTokens(response, user); } - public AuthResponse refreshToken(String refreshToken) { - String userEmail = jwtService.extractUsername(refreshToken); - if (userEmail == null) { - throw new RuntimeException("Invalid refresh token"); + public AuthResponse refreshToken(HttpServletRequest request) { + String refreshToken = null; + if (request.getCookies() != null) { + for (Cookie cookie : request.getCookies()) { + if ("refreshToken".equals(cookie.getName())) { + refreshToken = cookie.getValue(); + } + } } + if (refreshToken == null) { + throw new RuntimeException("Refresh token missing"); + } + + String userEmail = jwtService.extractUsername(refreshToken); User user = userService.getUserByEmail(userEmail); if (!jwtService.isTokenValid(refreshToken, user)) { - throw new RuntimeException("Expired or invalid refresh token"); + throw new RuntimeException("Invalid refresh token"); } @@ -81,8 +96,24 @@ return AuthResponse.builder() .accessToken(newAccessToken) - .refreshToken(refreshToken) // Keep same refresh token or rotate .user(userMapper.toDto(user)) .build(); } + public void logout(HttpServletResponse response) { + ResponseCookie cookie = ResponseCookie.from("refreshToken", "") + .httpOnly(true) + .secure(true) + .path("/") + .maxAge(0) + .sameSite("Strict") + .build(); + + response.setHeader(HttpHeaders.SET_COOKIE, cookie.toString()); + } + + 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/config/AppConfig.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/config/AppConfig.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/config/AppConfig.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,4 +2,5 @@ import com.shifterwebapp.shifter.user.UserRepository; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -13,4 +14,5 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.AuthenticationEntryPoint; @Configuration @@ -42,3 +44,8 @@ return new BCryptPasswordEncoder(12); } + + @Bean + public AuthenticationEntryPoint authenticationEntryPoint() { + return (request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); + } } Index: backend/src/main/java/com/shifterwebapp/shifter/config/SecurityConfig.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/config/SecurityConfig.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/config/SecurityConfig.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -9,4 +9,5 @@ import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -24,4 +25,5 @@ private final AuthenticationProvider authenticationProvider; private final JwtAuthFilter jwtAuthFilter; + private final AuthenticationEntryPoint authenticationEntryPoint; @Bean @@ -33,12 +35,12 @@ .authorizeHttpRequests(request -> request .requestMatchers("/api/auth/**").permitAll() + .requestMatchers("/api/courses/**").permitAll() .anyRequest().authenticated() + ) + .exceptionHandling(exception -> exception + .authenticationEntryPoint(authenticationEntryPoint) ) .authenticationProvider(authenticationProvider) .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); - -// .httpBasic(AbstractHttpConfigurer::disable) // Disable basic auth for stateless -// .formLogin(AbstractHttpConfigurer::disable) // Disable form login -// .logout(AbstractHttpConfigurer::disable); return http.build(); Index: backend/src/main/java/com/shifterwebapp/shifter/course/Course.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/Course.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/Course.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -4,4 +4,5 @@ import com.shifterwebapp.shifter.coursecontent.CourseContent; import com.shifterwebapp.shifter.enrollment.Enrollment; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; import jakarta.persistence.*; @@ -23,10 +24,13 @@ private Long id; + @Column(columnDefinition = "text") private String imageUrl; private String color; + private String titleShort; + private String title; - + private String topic; @@ -34,7 +38,7 @@ private Difficulty difficulty; - private Float durationHours; + private Double durationHours; - private Float price; + private Double price; private Integer rating; @@ -55,6 +59,7 @@ private List skillsGained; - @ElementCollection - private List whatWillBeLearned; + @ElementCollection(targetClass = Interests.class) + @Enumerated(EnumType.STRING) + private List whatWillBeLearned; @OneToMany(mappedBy = "course", orphanRemoval = true) // IS THIS GOOD BUSINESS LOGIC? SHOULD I HAVE CASCADES? Index: backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/CourseController.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -1,4 +1,7 @@ package com.shifterwebapp.shifter.course; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.shifterwebapp.shifter.course.service.CourseService; import com.shifterwebapp.shifter.enums.Difficulty; @@ -14,5 +17,6 @@ @RestController @RequiredArgsConstructor -@RequestMapping("${api.base.path}/course") +@RequestMapping("${api.base.path}/courses") +@CrossOrigin public class CourseController { @@ -21,21 +25,16 @@ @GetMapping public ResponseEntity getCourses( - @RequestParam(required = false) String title, - @RequestParam(required = false) String topic, - @RequestParam(required = false) List difficulties, - @RequestParam(required = false) Float floorPrice, - @RequestParam(required = false) Float ceilPrice, - @RequestParam(required = false) Float floorHours, - @RequestParam(required = false) Float ceilHours, - @RequestParam(required = false) List skills - ) { + @RequestParam(required = false) String search, + @RequestParam(required = false, name = "difficulty") List difficulties, + @RequestParam(required = false, name = "price") List prices, + @RequestParam(required = false, name = "duration") List durations, + @RequestParam(required = false, name = "skill") List skills, + @RequestParam(required = false, name = "topic") List topics + ) throws JsonProcessingException { Specification spec = null; - if (title != null && !title.isEmpty()) { - spec = (spec == null) ? CourseSpecification.hasTitleLike(title) : spec.and(CourseSpecification.hasTitleLike(title)); - } - if (topic != null && !topic.isEmpty()) { - spec = (spec == null) ? CourseSpecification.hasTopicLike(topic) : spec.and(CourseSpecification.hasTopicLike(topic)); + if (search != null && !search.isEmpty()) { + spec = CourseSpecification.hasSearchLike(search); } @@ -44,14 +43,18 @@ } - if (floorPrice != null || ceilPrice != null) { - spec = (spec == null) ? CourseSpecification.hasPriceBetween(floorPrice, ceilPrice) : spec.and(CourseSpecification.hasPriceBetween(floorPrice, ceilPrice)); + if (prices != null && !prices.isEmpty()) { + spec = (spec == null) ? CourseSpecification.hasPricesBetween(prices) : spec.and(CourseSpecification.hasPricesBetween(prices)); } - if (floorHours != null || ceilHours != null) { - spec = (spec == null) ? CourseSpecification.hasHoursBetween(floorHours, ceilHours) : spec.and(CourseSpecification.hasHoursBetween(floorHours, ceilHours)); + if (durations != null && !durations.isEmpty()) { + spec = (spec == null) ? CourseSpecification.hasDurationBetween(durations) : spec.and(CourseSpecification.hasDurationBetween(durations)); } if (skills != null && !skills.isEmpty()) { spec = (spec == null) ? CourseSpecification.hasSkills(skills) : spec.and(CourseSpecification.hasSkills(skills)); + } + + if (topics != null && !topics.isEmpty()) { + spec = (spec == null) ? CourseSpecification.hasTopics(topics) : spec.and(CourseSpecification.hasTopics(topics)); } @@ -67,3 +70,12 @@ } + @GetMapping("/topics") + public ResponseEntity> getAllTopics() { + return ResponseEntity.ok(courseService.getAllTopics()); + } + + @GetMapping("/skills") + public ResponseEntity> getAllSkills() { + return ResponseEntity.ok(courseService.getAllSkills()); + } } Index: backend/src/main/java/com/shifterwebapp/shifter/course/CourseDto.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/CourseDto.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/CourseDto.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -3,4 +3,5 @@ import com.shifterwebapp.shifter.enums.Difficulty; import com.shifterwebapp.shifter.coursecontent.CourseContentDto; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; import lombok.AllArgsConstructor; @@ -17,4 +18,10 @@ private Long id; + private String imageUrl; + + private String color; + + private String titleShort; + private String title; @@ -23,7 +30,7 @@ private Difficulty difficulty; - private Float durationHours; + private Double durationHours; - private Float price; + private Double price; private Integer rating; @@ -39,8 +46,8 @@ private List skillsGained; - private List whatWillBeLearned; + private List whatWillBeLearned; // DO I NEED THIS ??? - private List courseContents; +// private List courseContents; } Index: backend/src/main/java/com/shifterwebapp/shifter/course/CourseRepository.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/CourseRepository.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/CourseRepository.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,4 +2,5 @@ import com.shifterwebapp.shifter.enums.Difficulty; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; import org.springframework.data.jpa.repository.JpaRepository; @@ -26,3 +27,9 @@ List findCoursesByDifficultyIn(List searchDifficulties); + + @Query("select distinct c.whatWillBeLearned from Course c") + List getCourseTopics(); + + @Query("select distinct c.skillsGained from Course c") + List getCourseSkills(); } Index: backend/src/main/java/com/shifterwebapp/shifter/course/CourseSpecification.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/CourseSpecification.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/CourseSpecification.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,8 +2,14 @@ import com.shifterwebapp.shifter.enums.Difficulty; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; import org.springframework.data.jpa.domain.Specification; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class CourseSpecification { @@ -14,4 +20,22 @@ } + public static Specification hasSearchLike(String search) { + return (root, query, cb) -> { + query.distinct(true); + Join skillsJoin = root.join("skillsGained", JoinType.LEFT); + Join topicsJoin = root.join("whatWillBeLearned", JoinType.LEFT); + + return cb.or( + cb.like(cb.lower(root.get("title")), "%" + search.toLowerCase() + "%"), + cb.like(cb.lower(root.get("topic")), "%" + search.toLowerCase() + "%"), + cb.like(cb.lower(root.get("descriptionShort")), "%" + search.toLowerCase() + "%"), + cb.like(cb.lower(root.get("description")), "%" + search.toLowerCase() + "%"), + cb.like(cb.lower(root.get("descriptionLong")), "%" + search.toLowerCase() + "%"), + cb.like(cb.lower(skillsJoin.as(String.class)), "%" + search.toLowerCase().replaceAll("\\s", "_") + "%"), + cb.like(cb.lower(topicsJoin.as(String.class)), "%" + search.toLowerCase().replaceAll("\\s", "_") + "%") + ); + }; + } + public static Specification hasTopicLike(String topic) { return (root, query, cb) -> @@ -20,30 +44,72 @@ public static Specification hasDifficulties(List difficulties) { - return (root, query, cb) -> difficulties == null || difficulties.isEmpty() - ? null - : root.get("difficulty").in(difficulties); + return (root, query, cb) -> root.get("difficulty").in(difficulties); } public static Specification hasSkills(List skills) { - return (root, query, cb) -> skills == null || skills.isEmpty() - ? null - : root.join("skillsGained").in(skills); + return (root, query, cb) -> root.join("skillsGained").in(skills); } - public static Specification hasPriceBetween(Float min, Float max) { + public static Specification hasTopics(List topics) { + return (root, query, cb) -> root.join("whatWillBeLearned").in(topics); + } + + public static Specification hasPricesBetween(List prices) { return (root, query, cb) -> { - if (min == null && max == null) return null; - if (min != null && max != null) return cb.between(root.get("price"), min, max); - if (min != null) return cb.greaterThanOrEqualTo(root.get("price"), min); - return cb.lessThanOrEqualTo(root.get("price"), max); + List predicates = new ArrayList<>(); + + + for (String price : prices) { + switch (price) { + case "free": + predicates.add(cb.lessThanOrEqualTo(root.get("price"), 0.0)); + break; + case "low": + predicates.add(cb.between(root.get("price"), 0.0, 20.0)); + break; + case "medium": + predicates.add(cb.between(root.get("price"), 20.0, 50.0)); + break; + case "high": + predicates.add(cb.greaterThanOrEqualTo(root.get("price"), 50.0)); + break; + } + } + + if (predicates.isEmpty()) { + return null; + } + + return cb.or(predicates.toArray(new Predicate[0])); }; } - public static Specification hasHoursBetween(Float min, Float max) { + public static Specification hasDurationBetween(List durations) { return (root, query, cb) -> { - if (min == null && max == null) return null; - if (min != null && max != null) return cb.between(root.get("durationInHours"), min, max); - if (min != null) return cb.greaterThanOrEqualTo(root.get("durationInHours"), min); - return cb.lessThanOrEqualTo(root.get("durationInHours"), max); + List predicates = new ArrayList<>(); + + + for (String duration : durations) { + switch (duration) { + case "extraShort": + predicates.add(cb.lessThanOrEqualTo(root.get("durationHours"), 3.0)); + break; + case "short": + predicates.add(cb.between(root.get("durationHours"), 3.0, 6.0)); + break; + case "medium": + predicates.add(cb.between(root.get("durationHours"), 6.0, 10.0)); + break; + case "long": + predicates.add(cb.greaterThanOrEqualTo(root.get("durationHours"), 10.0)); + break; + } + } + + if (predicates.isEmpty()) { + return null; + } + + return cb.or(predicates.toArray(new Predicate[0])); }; } Index: backend/src/main/java/com/shifterwebapp/shifter/course/RangeDto.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/RangeDto.java (revision ac698c06f48d7402e976360fc460366f860e58eb) +++ backend/src/main/java/com/shifterwebapp/shifter/course/RangeDto.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -0,0 +1,15 @@ +package com.shifterwebapp.shifter.course; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +public class RangeDto { + private Double floor; + private Double ceil; +} Index: backend/src/main/java/com/shifterwebapp/shifter/course/service/CourseService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/service/CourseService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/service/CourseService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,10 +2,8 @@ import com.shifterwebapp.shifter.Validate; -import com.shifterwebapp.shifter.course.Course; -import com.shifterwebapp.shifter.course.CourseDto; -import com.shifterwebapp.shifter.course.CourseMapper; -import com.shifterwebapp.shifter.course.CourseRepository; +import com.shifterwebapp.shifter.course.*; import com.shifterwebapp.shifter.coursecontent.CourseContentMapper; import com.shifterwebapp.shifter.enums.Difficulty; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; import lombok.RequiredArgsConstructor; @@ -40,4 +38,14 @@ @Override + public List getAllTopics() { + return courseRepository.getCourseTopics(); + } + + @Override + public List getAllSkills() { + return courseRepository.getCourseSkills(); + } + + @Override public CourseDto createCourse(CourseDto request) { Course course = Course.builder() @@ -54,5 +62,5 @@ .skillsGained(request.getSkillsGained()) .whatWillBeLearned(request.getWhatWillBeLearned()) - .courseContents(courseContentMapper.toEntity(request.getCourseContents())) // ?????? +// .courseContents(courseContentMapper.toEntity(request.getCourseContents())) // ?????? .build(); @@ -79,10 +87,4 @@ @Override - public List searchCoursesByPrice(Float floorPrice, Float ceilPrice) { - List courses = courseRepository.findCoursesByPriceRange(floorPrice, ceilPrice); - return courseMapper.toDto(courses); - } - - @Override public List searchCoursesByDurationHours(Float floorHours, Float ceilHours) { List courses = courseRepository.findCoursesByDurationHoursRange(floorHours, ceilHours); Index: backend/src/main/java/com/shifterwebapp/shifter/course/service/ImplCourseService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/course/service/ImplCourseService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/course/service/ImplCourseService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -4,4 +4,5 @@ import com.shifterwebapp.shifter.course.CourseDto; import com.shifterwebapp.shifter.enums.Difficulty; +import com.shifterwebapp.shifter.enums.Interests; import com.shifterwebapp.shifter.enums.Skills; import org.springframework.data.jpa.domain.Specification; @@ -13,4 +14,7 @@ CourseDto getCourseById(Long id); + List getAllTopics(); + List getAllSkills(); + CourseDto createCourse(CourseDto request); @@ -18,5 +22,4 @@ List searchCoursesByTopic(String searchTopic); List searchCoursesByDifficulties(List searchDifficulty); - List searchCoursesByPrice(Float floorPrice, Float ceilPrice); List searchCoursesByDurationHours(Float floorHours, Float ceilHours); List searchCoursesBySkillsGained(List searchSkills); Index: backend/src/main/java/com/shifterwebapp/shifter/enums/Interests.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/enums/Interests.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/enums/Interests.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -2,14 +2,34 @@ public enum Interests { - SALES_STRATEGIES, - MARKETING, LEADERSHIP, MANAGEMENT, + COMMUNICATION, + TEAM_DEVELOPMENT, + DECISION_MAKING, + BUSINESS_TRANSFORMATION, DIGITAL_TRANSFORMATION, - BUSINESS_TRANSFORMATION, + CHANGE_MANAGEMENT, + STRATEGIC_PLANNING, + AGILITY, ENTREPRENEURSHIP, - STARTUP, + STARTUP_METHODS, + OPERATIONAL_EXCELLENCE, SALES, + SALES_STRATEGIES, NEGOTIATION, - FINANCE_FOR_BUSINESS + CLIENT_RELATIONSHIPS, + PERSONAL_GROWTH, + TIME_MANAGEMENT, + GO_TO_MARKET_STRATEGY, + MARKETING, + CLIENT_TARGETING, + VALUE_CREATION, + BUSINESS_INNOVATION, + HR, + CULTURE_INTEGRATION, + SELF_AWARENESS, + PERFORMANCE_IMPROVEMENT, + CONTINUOUS_IMPROVEMENT, + TEAM_OPTIMIZATION, + SYSTEM_DESIGN } Index: backend/src/main/java/com/shifterwebapp/shifter/enums/Skills.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/enums/Skills.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/enums/Skills.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -35,5 +35,5 @@ DECISION_MAKING, PERFORMANCE_EVALUATION, - CHANGE_MANAGEMENT, + CHANGE_MANAGEMENT, // Added missing // SOFT SKILLS / PERSONAL EFFECTIVENESS @@ -45,4 +45,5 @@ CREATIVITY, PROBLEM_SOLVING, + NEGOTIATION, // ENTREPRENEURSHIP Index: backend/src/main/java/com/shifterwebapp/shifter/payment/Payment.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/payment/Payment.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/payment/Payment.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -23,5 +23,5 @@ private Long id; - private Float amount; + private Double amount; private Date date; Index: backend/src/main/java/com/shifterwebapp/shifter/payment/PaymentDto.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/payment/PaymentDto.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/payment/PaymentDto.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -16,5 +16,5 @@ private Long id; - private Float amount; + private Double amount; private Date date; Index: backend/src/main/java/com/shifterwebapp/shifter/review/ReviewRepository.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/review/ReviewRepository.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/review/ReviewRepository.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -10,5 +10,5 @@ @Query("select AVG(r.rating) from Review r where r.enrollment.course.id = :courseId") - Float findAverageRatingByCourse(@Param("courseId") Long courseId); + Double findAverageRatingByCourse(@Param("courseId") Long courseId); @Query("select r from Review r where r.enrollment.course.id = :courseId") Index: backend/src/main/java/com/shifterwebapp/shifter/review/service/ImplReviewService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/review/service/ImplReviewService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/review/service/ImplReviewService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -9,5 +9,5 @@ List getReviewsByCourse(Long courseId); List getReviewsByUser(Long userId); - Float getAverageRatingByCourse(Long courseId); + Double getAverageRatingByCourse(Long courseId); ReviewDto writeReview(Long enrollmentId, ReviewDto reviewDto); Index: backend/src/main/java/com/shifterwebapp/shifter/review/service/ReviewService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/review/service/ReviewService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/review/service/ReviewService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -46,7 +46,7 @@ @Override - public Float getAverageRatingByCourse(Long courseId) { + public Double getAverageRatingByCourse(Long courseId) { validate.validateCourseExists(courseId); - Float avgRating = reviewRepository.findAverageRatingByCourse(courseId); + Double avgRating = reviewRepository.findAverageRatingByCourse(courseId); return avgRating != null ? avgRating : 0f; } Index: backend/src/main/java/com/shifterwebapp/shifter/sql/courseInitialize.sql =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/sql/courseInitialize.sql (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/sql/courseInitialize.sql (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -1,3 +1,4 @@ -INSERT INTO course (title, +INSERT INTO course (title_short, + title, description_short, description, @@ -8,6 +9,26 @@ rating, rating_count, - topic) -VALUES ('From Manager to Leader: Empowering People, Managing Processes', + topic, + image_url, + color) +VALUES + ( + 'Foundations for a Successful Business & Career', + 'Building New Paradigm / Perception & Perspective as Foundations for a Successful Business and Professional Career', + 'Understand how paradigms, perception, and perspective shape your business and career success.', + 'Explore the concept of paradigms and how perception and perspective influence your progress in business and professional life. Learn why incorrect use of perception and perspective can hinder your growth.', + 'This course delves into the foundational concepts of paradigms, perception, and perspective as critical factors in business and career development. You will learn what a paradigm is, how perception and perspective are interconnected, and why changing one requires changing the other. Understand the potential negative consequences of misused perception and perspective and how to harness them effectively for success.', + 'BEGINNER', + 3, + 0, + 47, + 10, + 'Business & Career Development', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751286550/Foundations_for_a_Successful_Business_Career_k8vcuu.jpg', + '#02C2FF' + ), + ( + 'From Manager to Leader', + 'From Manager to Leader: Empowering People, Managing Processes', 'Transform your managerial skills into effective leadership.', 'Learn to lead people and manage processes with proven leadership tools and models.', @@ -18,6 +39,11 @@ 48, 10, - 'Leadership & Management'), - ('Business Transformation Blueprint: Crafting the Path to Success', + 'Leadership & Management', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/From_Manager_to_Leader_-_Empowering_People_Managing_Processes_vgoyoh.webp', + '#19C6D6' + ), + ( + 'Business Transformation Blueprint', + 'Business Transformation Blueprint: Crafting the Path to Success', 'Design and implement successful business transformations.', 'Master the framework for guiding organizations through structured, sustainable transformation.', @@ -28,6 +54,10 @@ 49, 10, - 'Business Strategy & Transformation'), - ('Business Roadmap for SME’s: A Step-by-Step Guide for Establishing Core Business Foundations for Sustainable Growth', + 'Business Strategy & Transformation', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Business_Transformation_Blueprint_-_Crafting_the_Path_to_Success_aimssk.jpg', + '#1FB0C3'), + ( + 'SME Business Roadmap', + 'Business Roadmap for SME’s: A Step-by-Step Guide for Establishing Core Business Foundations for Sustainable Growth', 'Step-by-step guidance for SMEs to build solid business foundations.', 'Cut through the noise and build sustainable business foundations with clarity and confidence.', @@ -38,6 +68,10 @@ 49, 10, - 'Entrepreneurship & SME Growth'), - ('Sales Masterclass: Leadership, Communication, and Modern Sales Process', + 'Entrepreneurship & SME Growth', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Business_Roadmap_for_SME_s_-_A_Step-by-Step_Guide_for_Establishing_Core_Business_Foundations_for_Sustainable_Growth_qeejox.jpg', + '#002E5D'), + ( + 'Sales Masterclass', + 'Sales Masterclass: Leadership, Communication, and Modern Sales Process', 'Master modern sales strategies, leadership, and communication.', 'A complete guide to building elite sales skills, behaviors, and mindset.', @@ -48,6 +82,10 @@ 47, 10, - 'Sales & Communication'), - ('From Good to Extraordinary: Mastering Skills for Success', + 'Sales & Communication', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Sales_Masterclass_-_Leadership_Communication_and_Modern_Sales_Process_v74qdh.webp', + '#034D4C'), + ( + 'Mastering Success Skills', + 'From Good to Extraordinary: Mastering Skills for Success', 'Unlock your full potential with practical skills for extraordinary success.', 'A holistic course for professionals aiming to elevate their effectiveness and mindset.', @@ -58,6 +96,10 @@ 48, 10, - 'Personal Development & Productivity'), - ('Winning Markets in 3 Steps: Building a Clear Go-to-Market Strategy', + 'Personal Development & Productivity', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751032528/From_Good_to_Extraordinary_-_Mastering_Skills_for_Success_fm0io9.webp', + '#D0B8A3'), + ( + 'Winning Markets in 3 Steps', + 'Winning Markets in 3 Steps: Building a Clear Go-to-Market Strategy', 'Build a clear, effective go-to-market strategy in just 3 steps.', 'Learn to target the right clients and approach the market with clarity and confidence.', @@ -68,6 +110,10 @@ 49, 10, - 'Marketing & Sales Strategy'), - ('Creating Added Value: How to Offer Solutions/Concepts, Instead of Services', + 'Market Strategy', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Winning_Markets_in_3_Steps_-_Building_a_Clear_Go-to-Market_Strategy_vayg15.png', + '#FF6F61'), + ( + 'How to Create Added Value', + 'Creating Added Value: How to Offer Solutions/Concepts, Instead of Services', 'Shift from selling services to offering impactful solutions and concepts.', 'Learn how to transition from offering services to delivering real value through solutions and long-term concepts.', @@ -78,6 +124,10 @@ 49, 10, - 'Value Creation & Strategic Marketing'), - ('Onboarding Fundamentals: How to Successfully Incorporate New Employees', + 'Value Creation & Strategic Marketing', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Creating_Added_Value_-_How_to_Offer_SolutionsConcepts_Instead_of_Services_z9fs3c.png', + '#F5AD01'), + ( + 'Seamless Onboarding Strategy', + 'Onboarding Fundamentals: How to Successfully Incorporate New Employees', 'Master the essentials of onboarding to boost retention and employee satisfaction.', 'Learn how to create a structured onboarding experience that accelerates productivity and ensures long-term success.', @@ -88,6 +138,10 @@ 48, 10, - 'HR & Talent Development'), - ('Professional Self-Assessment: Identify Barriers Holding You Back & Areas for Improvement', + 'HR & Talent Development', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Onboarding_Fundamentals_-_How_to_Successfully_Incorporate_New_Employees_bksbad.png', + '#008CC2'), + ( + 'Growth Through Self-Assessment', + 'Professional Self-Assessment: Identify Barriers Holding You Back & Areas for Improvement', 'Use self-assessment tools to unlock growth and overcome personal barriers.', 'Gain insight into your professional strengths, weaknesses, and areas for growth using proven self-assessment techniques.', @@ -98,6 +152,10 @@ 47, 10, - 'Personal Growth & Career Development'), - ('Establishing Continuous Business Excellence in Your Company', + 'Personal Growth & Career Development', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/Professional_Self-Assessment_-_Identify_Barriers_Holding_You_Back_Areas_for_Improvement_tiyydc.jpg', + '#CC6232'), + ( + 'Business Excellence Blueprint', + 'Establishing Continuous Business Excellence in Your Company', 'Create a high-performance culture through proven excellence frameworks.', 'Learn how to implement continuous improvement models to optimize operations, team alignment, and long-term success.', @@ -108,6 +166,10 @@ 49, 10, - 'Operational Excellence & Leadership'), - ('High-Performing Teams and Systems: Organizational Success Through Structure', + 'Operational Excellence & Leadership', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028998/Establishing_Continuous_Business_Excellence_in_Your_Company_g3yvao.png', + '#18898D'), + ( + 'Organizational Success Through Structure', + 'High-Performing Teams and Systems: Organizational Success Through Structure', 'Build efficient, structured teams and systems that drive sustainable organizational success.', 'Explore how to structure your teams and systems to optimize performance, efficiency, and collaboration across your organization.', @@ -118,3 +180,142 @@ 48, 10, - 'Team Management & Organizational Structure'); + 'Team Management & Organizational Structure', + 'https://res.cloudinary.com/dwlevfwtt/image/upload/v1751028999/High-Performing_Teams_and_Systems_-_Organizational_Success_Through_Structure_b6jvm5.jpg', + '#FF9503'); + +INSERT INTO course_skills_gained (course_id, skills_gained) VALUES +-- 1. From Manager to Leader +(1, 'LEADERSHIP'), +(1, 'DELEGATION'), +(1, 'DECISION_MAKING'), +(1, 'PEOPLE_MANAGEMENT'), + +-- 2. Business Transformation Blueprint +(2, 'STRATEGIC_PLANNING'), +(2, 'CHANGE_MANAGEMENT'), +(2, 'PROJECT_MANAGEMENT'), +(2, 'RISK_MANAGEMENT'), + +-- 3. Business Roadmap for SME’s +(3, 'BUSINESS_MODEL_CREATION'), +(3, 'STRATEGIC_THINKING'), +(3, 'OPERATION_MANAGEMENT'), + +-- 4. Sales Masterclass +(4, 'SALES'), +(4, 'COMMUNICATION'), +(4, 'NEGOTIATION'), +(4, 'LEADERSHIP'), + +-- 5. From Good to Extraordinary +(5, 'COMMUNICATION'), +(5, 'DECISION_MAKING'), +(5, 'CRITICAL_THINKING'), +(5, 'EMOTIONAL_INTELLIGENCE'), + +-- 6. Winning Markets in 3 Steps +(6, 'MARKETING'), +(6, 'SALES'), +(6, 'STRATEGIC_THINKING'), + +-- 7. Creating Added Value +(7, 'OPPORTUNITY_IDENTIFICATION'), +(7, 'INNOVATION_MANAGEMENT'), +(7, 'MARKETING'), + +-- 8. Onboarding Fundamentals +(8, 'PEOPLE_MANAGEMENT'), +(8, 'TEAM_BUILDING'), +(8, 'COMMUNICATION'), + +-- 9. Professional Self-Assessment +(9, 'EMOTIONAL_INTELLIGENCE'), +(9, 'CRITICAL_THINKING'), +(9, 'COMMUNICATION'), + +-- 10. Establishing Continuous Business Excellence +(10, 'PROJECT_MANAGEMENT'), +(10, 'PERFORMANCE_EVALUATION'), +(10, 'CHANGE_MANAGEMENT'), +(10, 'STRATEGIC_PLANNING'), + +-- 11. High-Performing Teams and Systems +(11, 'TEAM_BUILDING'), +(11, 'OPERATION_MANAGEMENT'), +(11, 'PEOPLE_MANAGEMENT'), +(11, 'PERFORMANCE_EVALUATION'); + + +INSERT INTO course_what_will_be_learned (course_id, what_will_be_learned) VALUES +-- 1. From Manager to Leader +(1, 'LEADERSHIP'), +(1, 'MANAGEMENT'), +(1, 'COMMUNICATION'), +(1, 'TEAM_DEVELOPMENT'), +(1, 'DECISION_MAKING'), + +-- 2. Business Transformation Blueprint +(2, 'BUSINESS_TRANSFORMATION'), +(2, 'DIGITAL_TRANSFORMATION'), +(2, 'CHANGE_MANAGEMENT'), +(2, 'STRATEGIC_PLANNING'), +(2, 'AGILITY'), + +-- 3. Business Roadmap for SME’s +(3, 'ENTREPRENEURSHIP'), +(3, 'STARTUP_METHODS'), +(3, 'BUSINESS_TRANSFORMATION'), +(3, 'STRATEGIC_PLANNING'), +(3, 'OPERATIONAL_EXCELLENCE'), + +-- 4. Sales Masterclass +(4, 'SALES_STRATEGIES'), +(4, 'NEGOTIATION'), +(4, 'LEADERSHIP'), +(4, 'COMMUNICATION'), +(4, 'CLIENT_RELATIONSHIPS'), + +-- 5. From Good to Extraordinary +(5, 'PERSONAL_GROWTH'), +(5, 'LEADERSHIP'), +(5, 'COMMUNICATION'), +(5, 'TIME_MANAGEMENT'), +(5, 'DECISION_MAKING'), + +-- 6. Winning Markets in 3 Steps +(6, 'SALES_STRATEGIES'), +(6, 'MARKETING'), +(6, 'GO_TO_MARKET_STRATEGY'), +(6, 'CLIENT_TARGETING'), + +-- 7. Creating Added Value +(7, 'MARKETING'), +(7, 'SALES'), +(7, 'VALUE_CREATION'), +(7, 'BUSINESS_INNOVATION'), + +-- 8. Onboarding Fundamentals +(8, 'HR'), +(8, 'MANAGEMENT'), +(8, 'LEADERSHIP'), +(8, 'CULTURE_INTEGRATION'), + +-- 9. Professional Self-Assessment +(9, 'PERSONAL_GROWTH'), +(9, 'LEADERSHIP'), +(9, 'SELF_AWARENESS'), +(9, 'PERFORMANCE_IMPROVEMENT'), + +-- 10. Establishing Continuous Business Excellence +(10, 'MANAGEMENT'), +(10, 'BUSINESS_TRANSFORMATION'), +(10, 'CONTINUOUS_IMPROVEMENT'), +(10, 'STRATEGIC_PLANNING'), +(10, 'AGILITY'), + +-- 11. High-Performing Teams and Systems +(11, 'MANAGEMENT'), +(11, 'LEADERSHIP'), +(11, 'BUSINESS_TRANSFORMATION'), +(11, 'TEAM_OPTIMIZATION'), +(11, 'SYSTEM_DESIGN'); Index: backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/user/service/ImplUserService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -15,4 +15,5 @@ UserDto getUserById(Long id); User getUserByEmail(String email); + Boolean existsUserByEmail(String email); User createUser(RegisterDto registerDto); Index: backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java =================================================================== --- backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/main/java/com/shifterwebapp/shifter/user/service/UserService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -41,4 +41,9 @@ User user = userRepository.findByEmail(email).orElseThrow(); return user; + } + + @Override + public Boolean existsUserByEmail(String email) { + return userRepository.existsUserByEmail(email); } Index: backend/src/test/java/com/shifterwebapp/shifter/unittests/TestReviewService.java =================================================================== --- backend/src/test/java/com/shifterwebapp/shifter/unittests/TestReviewService.java (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ backend/src/test/java/com/shifterwebapp/shifter/unittests/TestReviewService.java (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -72,5 +72,5 @@ Mockito.doNothing().when(validate).validateCourseExists(courseId); - Float result = reviewService.getAverageRatingByCourse(courseId); + Double result = reviewService.getAverageRatingByCourse(courseId); Assertions.assertEquals(result, 5F); } Index: frontend/index.html =================================================================== --- frontend/index.html (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ frontend/index.html (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -3,5 +3,6 @@ - + + Shifter Index: frontend/package-lock.json =================================================================== --- frontend/package-lock.json (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ frontend/package-lock.json (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -13,4 +13,5 @@ "@headlessui/react": "^2.2.4", "@heroicons/react": "^2.2.0", + "@lottiefiles/dotlottie-react": "^0.14.2", "@mui/icons-material": "^7.1.2", "@mui/material": "^7.1.2", @@ -19,5 +20,7 @@ "axios": "^1.10.0", "framer-motion": "^12.19.1", + "lottie-react": "^2.4.1", "lucide-react": "^0.515.0", + "qs": "^6.14.0", "react": "^19.1.0", "react-dom": "^19.1.0", @@ -1249,4 +1252,22 @@ } }, + "node_modules/@lottiefiles/dotlottie-react": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-react/-/dotlottie-react-0.14.2.tgz", + "integrity": "sha512-RR4r0HrKQbOAw6iS6C3mRARS2iu+yI+G1vICoUsRMHzlUUk1/26l3WyAjhcG+KoaGoKmORx8FgHjTNr4Sr/2Ug==", + "license": "MIT", + "dependencies": { + "@lottiefiles/dotlottie-web": "0.47.0" + }, + "peerDependencies": { + "react": "^17 || ^18 || ^19" + } + }, + "node_modules/@lottiefiles/dotlottie-web": { + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-web/-/dotlottie-web-0.47.0.tgz", + "integrity": "sha512-YN6wSB4iYZBYEAFKEs/taufrPH3rfNlUA632Ib61WoR58TALAJ1ZX8yDIGUBT28byMJhZR4+xdpRX4v7X8OeBQ==", + "license": "MIT" + }, "node_modules/@mui/core-downloads-tracker": { "version": "7.1.2", @@ -2825,4 +2846,20 @@ "engines": { "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, @@ -4286,4 +4323,23 @@ } }, + "node_modules/lottie-react": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/lottie-react/-/lottie-react-2.4.1.tgz", + "integrity": "sha512-LQrH7jlkigIIv++wIyrOYFLHSKQpEY4zehPicL9bQsrt1rnoKRYCYgpCUe5maqylNtacy58/sQDZTkwMcTRxZw==", + "license": "MIT", + "dependencies": { + "lottie-web": "^5.10.2" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/lottie-web": { + "version": "5.13.0", + "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.13.0.tgz", + "integrity": "sha512-+gfBXl6sxXMPe8tKQm7qzLnUy5DUPJPKIyRHwtpCpyUEYjHYRJC/5gjUvdkuO2c3JllrPtHXH5UJJK8LRYl5yQ==", + "license": "MIT" + }, "node_modules/lru-cache": { "version": "5.1.1", @@ -4487,4 +4543,16 @@ "engines": { "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, @@ -4712,4 +4780,19 @@ "engines": { "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, @@ -5031,4 +5114,76 @@ "engines": { "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, Index: frontend/package.json =================================================================== --- frontend/package.json (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ frontend/package.json (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -15,4 +15,5 @@ "@headlessui/react": "^2.2.4", "@heroicons/react": "^2.2.0", + "@lottiefiles/dotlottie-react": "^0.14.2", "@mui/icons-material": "^7.1.2", "@mui/material": "^7.1.2", @@ -21,5 +22,7 @@ "axios": "^1.10.0", "framer-motion": "^12.19.1", + "lottie-react": "^2.4.1", "lucide-react": "^0.515.0", + "qs": "^6.14.0", "react": "^19.1.0", "react-dom": "^19.1.0", Index: frontend/src/App.tsx =================================================================== --- frontend/src/App.tsx (revision 1c1f32c44018e7dc8338fb2c8fc396baf0604223) +++ frontend/src/App.tsx (revision ac698c06f48d7402e976360fc460366f860e58eb) @@ -5,4 +5,7 @@ import Login from "./pages/Login.tsx"; import Register from "./pages/Register.tsx"; +import Courses from "./pages/Courses.tsx"; +import {useGlobalContext} from "./GlobalContext.tsx"; +import React from "react"; function LayoutWrapper() { @@ -14,7 +17,9 @@ {!hideLayout && } - } /> } /> } /> + + } /> + } /> {!hideLayout &&