Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/JwtAuthFilter.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/JwtAuthFilter.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/JwtAuthFilter.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -44,8 +44,4 @@ token.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); -// SecurityContext securityContext = SecurityContextHolder.createEmptyContext(); -// securityContext.setAuthentication(token); -// SecurityContextHolder.setContext(securityContext); - SecurityContextHolder.getContext().setAuthentication(token); } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,5 +2,4 @@ import lombok.RequiredArgsConstructor; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.Role; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -25,5 +24,4 @@ private final JwtAuthFilter jwtAuthFilter; - //private final UserService userService; private final UserDetailsService userDetailsService; @@ -31,9 +29,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http.csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(request -> request.requestMatchers("/api/auth/**") - .permitAll() - .requestMatchers("/api/admin").hasAnyAuthority(Role.ROLE_ADMIN.name()) - .requestMatchers("/api/job-seeker").hasAnyAuthority(Role.ROLE_JOBSEEKER.name()) - .requestMatchers("/api/recruiter").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .authorizeHttpRequests(request -> request + .requestMatchers("/api/job-advertisements/all","/api/job-advertisements/view/**","/api/recruiter/info/**", "/api/auth/**").permitAll() + //.requestMatchers("/api/job-advertisements/**").hasAnyAuthority(Role.ROLE_RECRUITER.name()) .anyRequest().authenticated()) .sessionManagement(manager -> manager.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AdminController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AdminController.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AdminController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,6 +2,4 @@ import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +10,3 @@ public class AdminController { - - @GetMapping - public ResponseEntity sayHello() { - return ResponseEntity.ok("Hi Admin"); - } } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AuthController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AuthController.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AuthController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.*; -@CrossOrigin(origins = "*") @RestController @RequestMapping("/api/auth") @AllArgsConstructor +@CrossOrigin(origins = "*") public class AuthController { Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobAdvertisementController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobAdvertisementController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobAdvertisementController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,58 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.controllers; + + +import lombok.AllArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobAdvertisementService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/job-advertisements") +@AllArgsConstructor +@CrossOrigin(origins = "*") +public class JobAdvertisementController { + + private final JobAdvertisementService jobAdvertisementService; + + @PostMapping("/add") + public ResponseEntity addJobAdvertisement(@RequestBody JobAdvertisementDTO jobAdvertisementDTO) { + JobAdDetailsDTO jobAdDetailsDTO = jobAdvertisementService.addJobAdvertisement(jobAdvertisementDTO); + return new ResponseEntity<>(jobAdDetailsDTO, HttpStatus.OK); + } + + @PutMapping("/edit/{id}") + public ResponseEntity editJobAdvertisement(@PathVariable Long id, @RequestBody JobAdvertisementDTO JobAdvertisementDTO) { + JobAdDetailsDTO jobAdDetailsDTO = jobAdvertisementService.editJobAdvertisement(id, JobAdvertisementDTO); + return new ResponseEntity<>(jobAdDetailsDTO, HttpStatus.OK); + } + + @DeleteMapping("/delete/{id}") + public ResponseEntity deleteJobAdvertisement(@PathVariable Long id) { + jobAdvertisementService.deleteJobAdvertisement(id); + return new ResponseEntity<>("Job Advertisement with id: "+ id + "deleted.", HttpStatus.OK); + } + + @GetMapping("/recruiter/{id}") + public ResponseEntity findALlJobAdvertisementsByRecruiterId(@PathVariable Long id) { + List jobAdDetailsDTOS = jobAdvertisementService.findAllJobAdvertisementsByRecruiterId(id); + return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK); + } + + @GetMapping("/all") + public ResponseEntity findAllJobAdvertisements() { + List jobAdDetailsDTOS = jobAdvertisementService.findAllJobAdvertisements(); + return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK); + } + + @GetMapping("/view/{id}") + public ResponseEntity findJobAdvertisementById(@PathVariable Long id) { + JobAdDetailsDTO jobAdDetailsDTO = jobAdvertisementService.findJobAdvertisementById(id); + return new ResponseEntity<>(jobAdDetailsDTO, HttpStatus.OK); + } +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobSeekerController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobSeekerController.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobSeekerController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,5 +2,6 @@ -import lombok.RequiredArgsConstructor; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -8,5 +9,6 @@ @RestController @RequestMapping("/api/job-seeker") -@RequiredArgsConstructor +@AllArgsConstructor +@CrossOrigin(origins = "*") public class JobSeekerController { } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/RecruiterController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/RecruiterController.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/RecruiterController.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -1,18 +1,23 @@ package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.controllers; -import lombok.RequiredArgsConstructor; +import lombok.AllArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.RecruiterService; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/recruiter") -@RequiredArgsConstructor +@AllArgsConstructor +@CrossOrigin(origins = "*") public class RecruiterController { - @GetMapping - public ResponseEntity sayHello() { - return ResponseEntity.ok("Hi Recruiter"); + private final RecruiterService recruiterService; + + @GetMapping("/info/{id}") + public ResponseEntity getRecruiterDetailsById(@PathVariable("id") Long id) { + RecruiterDetailsDTO recruiterDetailsDTO = recruiterService.getRecruiterDetailsById(id); + return new ResponseEntity<>(recruiterDetailsDTO, HttpStatus.OK); } } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/EmploymentStatus.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/EmploymentStatus.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/EmploymentStatus.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,5 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations; + +public enum EmploymentStatus { + FULL_TIME, PART_TIME +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/JobType.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/JobType.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/enumerations/JobType.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,5 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations; + +public enum JobType { + JOB, INTERNSHIP +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdDetailsDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdDetailsDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,21 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class JobAdDetailsDTO { + private String recruiterName; + private Long recruiterId; + private final Long id; + private String title; + private String description; + private String industry; + private int startingSalary; + private String postedOn; + private String activeUntil; + private boolean isActive; + private String jobType; + private String employmentStatus; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdvertisementDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdvertisementDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdvertisementDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,21 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class JobAdvertisementDTO { + private String email; + private String title; + private String description; + private String industry; + private int startingSalary; + private String activeUntil; + private String jobType; + private String employmentStatus; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/JobAdvertisement.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/JobAdvertisement.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/JobAdvertisement.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,79 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.EmploymentStatus; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.JobType; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Entity +@NoArgsConstructor +@AllArgsConstructor +@Data +@Table(name = "job_advertisements") +public class JobAdvertisement { + + public JobAdvertisement(User recruiter, String title, String description, String industry, int startingSalary, LocalDate activeUntil, JobType jobType, EmploymentStatus employmentStatus) { + this.recruiter = recruiter; + this.title = title; + this.description = description; + this.industry = industry; + this.startingSalary = startingSalary; + this.postedOn = LocalDateTime.now(); + this.activeUntil = activeUntil; + this.isActive = true; + this.jobType = jobType; + this.employmentStatus = employmentStatus; + } + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + private User recruiter; + + private String title; + private String description; + private String industry; + private int startingSalary; + private LocalDateTime postedOn; + private LocalDate activeUntil; + private boolean isActive; + + @Enumerated(EnumType.STRING) + JobType jobType; + + @Enumerated(EnumType.STRING) + EmploymentStatus employmentStatus; + + public boolean isJobAdActive() { + LocalDate date = LocalDate.now(); + return date.isBefore(activeUntil); + } + + public static JobAdDetailsDTO mapToJobAdDetailsDTO(JobAdvertisement jobAdvertisement) { + + return new JobAdDetailsDTO( + jobAdvertisement.getRecruiter().getName(), + jobAdvertisement.getRecruiter().getId(), + jobAdvertisement.getId(), + jobAdvertisement.getTitle(), + jobAdvertisement.getDescription(), + jobAdvertisement.getIndustry(), + jobAdvertisement.getStartingSalary(), + jobAdvertisement.getPostedOn().toString(), + jobAdvertisement.getActiveUntil().toString(), + jobAdvertisement.isJobAdActive(), + jobAdvertisement.getJobType().name(), + jobAdvertisement.getEmploymentStatus().name() + ); + } + +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Admin.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Admin.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Admin.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -4,20 +4,19 @@ import jakarta.persistence.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @Entity -//@Data -//@NoArgsConstructor -//@AllArgsConstructor -//@Builder +@Data +@NoArgsConstructor @Table(name = "admins") public class Admin extends User { + +// private String name; +// private String surname; + @Override public String getName() { return "Admin"; } -// private String name; -// private String surname; } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JwtAuthResponse.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JwtAuthResponse.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JwtAuthResponse.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -10,4 +10,5 @@ @NoArgsConstructor public class JwtAuthResponse { + private Long id; private String email; private String name; Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,15 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RecruiterDetailsDTO { + private String email; + private String companyName; + private String companyDescription; + private String phoneNumber; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -5,5 +5,4 @@ import jakarta.persistence.Table; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,5 +13,4 @@ @NoArgsConstructor @AllArgsConstructor -@Builder @Table(name = "job_seekers") public class JobSeeker extends User { Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/User.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/User.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/User.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -15,9 +15,9 @@ @Entity -@Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "users") @Data @NoArgsConstructor @AllArgsConstructor +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "users") public abstract class User implements UserDetails { Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -26,4 +26,3 @@ } - } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,4 +2,5 @@ import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; @@ -11,4 +12,13 @@ recruiter.getPassword(), recruiter.getCompanyName(), + recruiter.getPhoneNumber() + ); + } + + public static RecruiterDetailsDTO mapToRecruiterDetailsDTO(Recruiter recruiter) { + return new RecruiterDetailsDTO( + recruiter.getEmail(), + recruiter.getCompanyName(), + recruiter.getCompanyDescription(), recruiter.getPhoneNumber() ); Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/JobAdvertisementRepository.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/JobAdvertisementRepository.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/JobAdvertisementRepository.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,11 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories; + +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface JobAdvertisementRepository extends JpaRepository { + List findAllByRecruiterId(Long id); +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/RecruiterRepository.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/RecruiterRepository.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/repositories/RecruiterRepository.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,6 +2,8 @@ import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.mappers.RecruiterMapper; import org.springframework.data.jpa.repository.JpaRepository; public interface RecruiterRepository extends JpaRepository { + Recruiter findRecruiterByEmail(String email); } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AuthServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AuthServiceImpl.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AuthServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -31,5 +31,4 @@ private final JwtService jwtService; - @Override public User signUpJobSeeker(JobSeeker jobSeeker) { @@ -50,5 +49,5 @@ String refreshJwt = jwtService.generateRefreshToken(new HashMap<>(), user); - return new JwtAuthResponse(user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshJwt); + return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshJwt); } @@ -59,5 +58,5 @@ String jwt = jwtService.generateToken(user); - return new JwtAuthResponse(user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshTokenRequest.getToken()); + return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshTokenRequest.getToken()); } return null; Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobAdvertisementServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobAdvertisementServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobAdvertisementServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,102 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.impl; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.EmploymentStatus; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.JobType; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.JobAdvertisementRepository; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.UserRepository; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobAdvertisementService; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class JobAdvertisementServiceImpl implements JobAdvertisementService { + private final UserRepository userRepository; + private final JobAdvertisementRepository jobAdvertisementRepository; + + @Override + public JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO) { + User recruiter = userRepository.findByEmail(jobAdvertisementDTO.getEmail()).orElseThrow(() -> new IllegalArgumentException("User not found")); + JobAdvertisement jobAdvertisement = new JobAdvertisement( + recruiter, + jobAdvertisementDTO.getTitle(), + jobAdvertisementDTO.getDescription(), + jobAdvertisementDTO.getIndustry(), + jobAdvertisementDTO.getStartingSalary(), + LocalDate.parse(jobAdvertisementDTO.getActiveUntil()), + JobType.valueOf(jobAdvertisementDTO.getJobType()), + EmploymentStatus.valueOf(jobAdvertisementDTO.getEmploymentStatus()) + ); + jobAdvertisementRepository.save(jobAdvertisement); + return JobAdvertisement.mapToJobAdDetailsDTO(jobAdvertisement); + } + + @Override + public JobAdDetailsDTO editJobAdvertisement(Long id, JobAdvertisementDTO jobAdvertisementDTO) { + JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Job Advertisement not found")); + jobAdvertisement.setTitle(jobAdvertisementDTO.getTitle()); + jobAdvertisement.setDescription(jobAdvertisementDTO.getDescription()); + jobAdvertisement.setIndustry(jobAdvertisementDTO.getIndustry()); + jobAdvertisement.setStartingSalary(jobAdvertisementDTO.getStartingSalary()); + jobAdvertisement.setActiveUntil(LocalDate.parse(jobAdvertisementDTO.getActiveUntil())); + jobAdvertisement.setActive(jobAdvertisement.isJobAdActive()); + jobAdvertisement.setJobType(JobType.valueOf(jobAdvertisementDTO.getJobType())); + jobAdvertisement.setEmploymentStatus(EmploymentStatus.valueOf(jobAdvertisementDTO.getEmploymentStatus())); + jobAdvertisementRepository.save(jobAdvertisement); + return JobAdvertisement.mapToJobAdDetailsDTO(jobAdvertisement); + } + + @Override + public void deleteJobAdvertisement(Long jobAdvertisementId) { + jobAdvertisementRepository.deleteById(jobAdvertisementId); + } + + @Override + public List findAllJobAdvertisements() { + List jobAdvertisementList = jobAdvertisementRepository.findAll(); + jobAdvertisementList.forEach(jobAdvertisement -> { + if (!jobAdvertisement.isJobAdActive() && jobAdvertisement.isActive()) { + jobAdvertisement.setActive(false); + jobAdvertisementRepository.save(jobAdvertisement); + } else if (jobAdvertisement.isJobAdActive() && !jobAdvertisement.isActive()) { + jobAdvertisement.setActive(true); + jobAdvertisementRepository.save(jobAdvertisement); + } + }); + + return jobAdvertisementList.stream() + .map(JobAdvertisement::mapToJobAdDetailsDTO) + .toList(); + } + + @Override + public List findAllJobAdvertisementsByRecruiterId(Long recruiterId) { + List jobAdvertisementList = jobAdvertisementRepository.findAllByRecruiterId(recruiterId); +// jobAdvertisementList.forEach(jobAdvertisement -> { +// if (!jobAdvertisement.isJobAdActive() && jobAdvertisement.isActive()) { +// jobAdvertisement.setActive(false); +// jobAdvertisementRepository.save(jobAdvertisement); +// } else if (jobAdvertisement.isJobAdActive() && !jobAdvertisement.isActive()) { +// jobAdvertisement.setActive(true); +// jobAdvertisementRepository.save(jobAdvertisement); +// } +// }); + + return jobAdvertisementList.stream() + .map(JobAdvertisement::mapToJobAdDetailsDTO) + .toList(); + } + @Override + public JobAdDetailsDTO findJobAdvertisementById(Long id) { + JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id).orElse(null); + return JobAdvertisement.mapToJobAdDetailsDTO(jobAdvertisement); + } +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JwtServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JwtServiceImpl.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JwtServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -41,8 +41,4 @@ } - public String extractUsername(String token) { - return extractClaim(token, Claims::getSubject); - } - private Claims extractAllClaims(String token) { return Jwts.parserBuilder().setSigningKey(getSigninKey()).build().parseClaimsJws(token).getBody(); @@ -54,4 +50,10 @@ } + @Override + public String extractUsername(String token) { + return extractClaim(token, Claims::getSubject); + } + + @Override public boolean isTokenValid(String token, UserDetails userDetails) { final String username = extractUsername(token); @@ -59,6 +61,6 @@ } - - private boolean isTokenExpired(String token) { + @Override + public boolean isTokenExpired(String token) { return extractClaim(token, Claims::getExpiration).before(new Date()); } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/RecruiterServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/RecruiterServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/RecruiterServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,22 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.impl; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.mappers.RecruiterMapper; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.RecruiterRepository; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.RecruiterService; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RecruiterServiceImpl implements RecruiterService { + + private final RecruiterRepository recruiterRepository; + + @Override + public RecruiterDetailsDTO getRecruiterDetailsById(Long recruiterId) { + Recruiter recruiter = recruiterRepository.findById(recruiterId).orElse(null); + return RecruiterMapper.mapToRecruiterDetailsDTO(recruiter); + } +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/UserServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/UserServiceImpl.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/UserServiceImpl.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -1,64 +1,11 @@ package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.impl; -import lombok.AllArgsConstructor; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.JobSeekerRepository; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.RecruiterRepository; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.UserRepository; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JwtService; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.crypto.password.PasswordEncoder; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.UserService; @Service -@AllArgsConstructor +@RequiredArgsConstructor +public class UserServiceImpl implements UserService { -public class UserServiceImpl { - private final UserRepository userRepository; - private final RecruiterRepository recruiterRepository; - private final JobSeekerRepository jobSeekerRepository; - private final PasswordEncoder passwordEncoder; - private final AuthenticationManager authenticationManager; - private final JwtService jwtService; - - -// @Override -// public User registerJobSeeker(JobSeeker jobSeeker) { -// jobSeeker.setPassword(passwordEncoder.encode(jobSeeker.getPassword())); -// return jobSeekerRepository.save(jobSeeker); -// } -// -// @Override -// public User registerRecruiter(Recruiter recruiter) { -// recruiter.setPassword(passwordEncoder.encode(recruiter.getPassword())); -// return recruiterRepository.save(recruiter); -// } -// -// @Override -// public JwtAuthenticationResponse login(JwtAuthenticationRequest jwtAuthenticationRequest) { -// authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(jwtAuthenticationRequest.getEmail(), jwtAuthenticationRequest.getPassword())); -// -// var user = userRepository.findByEmail(jwtAuthenticationRequest.getEmail()).orElseThrow(() -> new IllegalArgumentException("Email or password is incorrect")); -// var jwt = jwtService.generateToken(user); -// var refreshToken = jwtService.generateRefreshToken(new HashMap<>(), user); -// -// JwtAuthenticationResponse jwtAuthenticationResponse = new JwtAuthenticationResponse(); -// jwtAuthenticationResponse.setToken(jwt); -// jwtAuthenticationResponse.setRefreshToken(refreshToken); -// return jwtAuthenticationResponse; -// } -// -// @Override -// public JwtAuthenticationResponse refreshToken(RefreshTokenRequest refreshTokenRequest) { -// String userEmail = jwtService.extractUsername(refreshTokenRequest.getToken()); -// User user = userRepository.findByEmail(userEmail).orElseThrow(); -// if(jwtService.isTokenValid(refreshTokenRequest.getToken(), user)) { -// var jwt = jwtService.generateToken(user); -// -// JwtAuthenticationResponse jwtAuthenticationResponse = new JwtAuthenticationResponse(); -// jwtAuthenticationResponse.setToken(jwt); -// jwtAuthenticationResponse.setRefreshToken(refreshTokenRequest.getToken()); -// return jwtAuthenticationResponse; -// } -// return null; -// } } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobAdvertisementService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobAdvertisementService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobAdvertisementService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,20 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef; + +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement; + +import java.util.List; +import java.util.Optional; + +public interface JobAdvertisementService { + JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO); + JobAdDetailsDTO editJobAdvertisement(Long id, JobAdvertisementDTO jobAdvertisementDTO); + void deleteJobAdvertisement(Long jobAdvertisementId); + + List findAllJobAdvertisements(); + List findAllJobAdvertisementsByRecruiterId(Long recruiterId); + JobAdDetailsDTO findJobAdvertisementById(Long id); + + +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JwtService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JwtService.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JwtService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -6,9 +6,9 @@ public interface JwtService { - String generateToken(UserDetails userDetails); + String generateRefreshToken(Map extraClaims, UserDetails userDetails); String extractUsername(String token); boolean isTokenValid(String token, UserDetails userDetails); - String generateRefreshToken(Map extraClaims, UserDetails userDetails); + boolean isTokenExpired(String token); } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/RecruiterService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/RecruiterService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/RecruiterService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,8 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef; + +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; + +public interface RecruiterService { + RecruiterDetailsDTO getRecruiterDetailsById(Long recruiterId); +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/UserService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/UserService.java (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/UserService.java (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -1,15 +1,7 @@ package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.SignInDTO; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JwtAuthResponse; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RefreshTokenRequest; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.JobSeeker; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; -import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User; public interface UserService { - User registerJobSeeker(JobSeeker jobSeeker); - User registerRecruiter(Recruiter recruiter); - JwtAuthResponse login(SignInDTO signInDTO); - JwtAuthResponse refreshToken(RefreshTokenRequest refreshTokenRequest); + } Index: jobvista-frontend/.idea/codeStyles/codeStyleConfig.xml =================================================================== --- jobvista-frontend/.idea/codeStyles/codeStyleConfig.xml (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/.idea/codeStyles/codeStyleConfig.xml (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,5 @@ + + + + Index: jobvista-frontend/package-lock.json =================================================================== --- jobvista-frontend/package-lock.json (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/package-lock.json (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -21,9 +21,12 @@ "react": "^18.3.1", "react-dom": "^18.3.1", + "react-hook-form": "^7.51.4", "react-jwt": "^1.2.1", "react-redux": "^9.1.2", + "react-responsive-modal": "^6.4.2", "react-router": "^6.23.0", "react-router-dom": "^6.23.0", "react-scripts": "5.0.1", + "react-select": "^5.8.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", @@ -2036,4 +2039,23 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, + "node_modules/@bedrock-layout/use-forwarded-ref": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@bedrock-layout/use-forwarded-ref/-/use-forwarded-ref-1.6.1.tgz", + "integrity": "sha512-GD9A9AFLzFNjr7k6fgerSqxfwDWl+wsPS11PErOKe1zkVz0y7RGC9gzlOiX/JrgpyB3NFHWIuGtoOQqifJQQpw==", + "dependencies": { + "@bedrock-layout/use-stateful-ref": "^1.4.1" + }, + "peerDependencies": { + "react": "^16.8 || ^17 || ^18" + } + }, + "node_modules/@bedrock-layout/use-stateful-ref": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@bedrock-layout/use-stateful-ref/-/use-stateful-ref-1.4.1.tgz", + "integrity": "sha512-4eKO2KdQEXcR5LI4QcxqlJykJUDQJWDeWYAukIn6sRQYoabcfI5kDl61PUi6FR6o8VFgQ8IEP7HleKqWlSe8SQ==", + "peerDependencies": { + "react": "^16.8 || ^17 || ^18" + } + }, "node_modules/@csstools/normalize.css": { "version": "12.1.1", @@ -6319,4 +6341,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/body-scroll-lock": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz", + "integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg==" + }, "node_modules/bonjour-service": { "version": "1.2.1", @@ -6599,4 +6626,9 @@ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==" + }, + "node_modules/classnames": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/clean-css": { @@ -13177,4 +13209,9 @@ "node": ">= 4.0.0" } + }, + "node_modules/memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" }, "node_modules/merge-descriptors": { @@ -15706,5 +15743,4 @@ "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.51.4.tgz", "integrity": "sha512-V14i8SEkh+V1gs6YtD0hdHYnoL4tp/HX/A45wWQN15CYr9bFRmmRdYStSO5L65lCCZRF+kYiSKhm9alqbcdiVA==", - "peer": true, "engines": { "node": ">=12.22.0" @@ -15765,4 +15801,21 @@ "engines": { "node": ">=0.10.0" + } + }, + "node_modules/react-responsive-modal": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/react-responsive-modal/-/react-responsive-modal-6.4.2.tgz", + "integrity": "sha512-ARjGEKE5Gu5CSvyA8U9ARVbtK4SMAtdXsjtzwtxRlQIHC99RQTnOUctLpl7+/sp1Kg1OJZ6yqvp6ivd4TBueEw==", + "dependencies": { + "@bedrock-layout/use-forwarded-ref": "^1.3.1", + "body-scroll-lock": "^3.1.5", + "classnames": "^2.3.1" + }, + "funding": { + "url": "https://github.com/sponsors/pradel" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17 || ^18", + "react-dom": "^16.8.0 || ^17 || ^18" } }, @@ -15869,4 +15922,24 @@ } }, + "node_modules/react-select": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz", + "integrity": "sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==", + "dependencies": { + "@babel/runtime": "^7.12.0", + "@emotion/cache": "^11.4.0", + "@emotion/react": "^11.8.1", + "@floating-ui/dom": "^1.0.1", + "@types/react-transition-group": "^4.4.0", + "memoize-one": "^6.0.0", + "prop-types": "^15.6.0", + "react-transition-group": "^4.3.0", + "use-isomorphic-layout-effect": "^1.1.2" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-transition-group": { "version": "4.4.5", @@ -18060,4 +18133,17 @@ "querystringify": "^2.1.1", "requires-port": "^1.0.0" + } + }, + "node_modules/use-isomorphic-layout-effect": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz", + "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, Index: jobvista-frontend/package.json =================================================================== --- jobvista-frontend/package.json (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/package.json (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -16,9 +16,12 @@ "react": "^18.3.1", "react-dom": "^18.3.1", + "react-hook-form": "^7.51.4", "react-jwt": "^1.2.1", "react-redux": "^9.1.2", + "react-responsive-modal": "^6.4.2", "react-router": "^6.23.0", "react-router-dom": "^6.23.0", "react-scripts": "5.0.1", + "react-select": "^5.8.0", "redux": "^5.0.1", "redux-thunk": "^3.1.0", Index: jobvista-frontend/public/index.html =================================================================== --- jobvista-frontend/public/index.html (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/public/index.html (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -16,5 +16,5 @@ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> - + + + + + Job Vista Index: jobvista-frontend/src/App.css =================================================================== --- jobvista-frontend/src/App.css (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/App.css (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -5,10 +5,5 @@ background-color: rgb(243, 242, 241); height: 100vh; -} - -.card { - border: 1px solid black; - border-radius: 5px; - padding: 10px; + overflow-y: auto; } @@ -35,5 +30,140 @@ } +.container { + width: 80% !important; + max-width: 1500px !important; +} + /*font-family: 'Ubuntu', sans-serif;*/ /*font-family: 'Cairo', sans-serif;*/ + +.react-responsive-modal-overlay { + backdrop-filter: blur(2px); +} + +/*CARDS*/ + +.col { + height: 280px !important; +} + +.custom-card { + //border: 1px solid lightgray; + border-radius: 8px; + background-color: white; + transition: all 0.3s ease; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + transform: translate(0, 0); + height: 260px; +} + +.custom-card:hover { + transform: translate(0, 8px); + box-shadow: 0 10px 20px rgba(0, 0, 0, 0.2); +} + +.custom-card .card-head { + padding: 25px; + padding-bottom: 0 !important; +} + +.custom-card .card-head .job-type { + font-size: 12px !important; + margin-left: 6px !important; + position: relative; + bottom: 3px; +} + +.custom-card .card-head .expired { + font-size: 12px !important; + margin-left: 8px !important; + position: relative; + bottom: 3px; +} + +.custom-card .card-head .card-management-btns { + float: right; + scale: 130%; + display: flex; + gap: 5px; + transition: 0.2s; +} +.custom-card .card-head .card-management-btns i:hover { + opacity: 0.5; + cursor: pointer; +} + +.custom-card .card-body { + padding: 25px; + padding-top: 15px !important; + height: 100%; +} +.custom-card .card-body span{ + font-size: 15px; +} + +.custom-card .card-body .card-title { + margin-top: 10px; +} + + +.custom-card .card-body .card-title h5 { + display: inline; +} + + +.custom-card .card-body .hourly-salary { + margin-bottom: 30px; + display: inline; +} + +.custom-card .card-body .card-info { + color: gray; + margin: 13px 0; +} + +.custom-card .card-body .aligned { + display: flex; + justify-content: center; + gap: 8px; + text-align: center; + margin-top: 25px; + position: relative; + +} + +.custom-card .card-body .aligned a { + text-decoration: none; +} + + +.card-button { + border: 0; + border-radius: 8px; + width: 45%; + background-color: rgba(207, 235, 255, 1); + //background-size: 200% auto; + //background-image: linear-gradient(to right, #a1c4fd 0%, aliceblue 61%, #a1c4fd 100%); + color: black; + font-weight: bold; + padding: 5px 10px; + transition: 0.2s; +} + +.card-button:only-child { + width: 70%; +} +.card-button:not(.disabled):hover{ + background-color: rgb(187, 215, 235); + //background-position: right center; + color: black; +} + +.disabled { + cursor: default !important; + opacity: 0.6; +} + + + Index: jobvista-frontend/src/auth/RoutesConfig.js =================================================================== --- jobvista-frontend/src/auth/RoutesConfig.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/auth/RoutesConfig.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -5,4 +5,6 @@ import {SignUpRecruiterForm} from "../views/auth/SignUpRecruiterForm"; import {SignUpJobSeekerForm} from "../views/auth/SignUpJobSeekerForm"; +import {JobAdvertisements} from "../views/job_advertisements/JobAdvertisements"; +import {JobAdDetails} from "../views/job_advertisements/JobAdDetails"; export const RoutesConfig = () => { @@ -13,4 +15,7 @@ }> }> + }> + }> + }> ) Index: jobvista-frontend/src/enumerations/EmploymentStatus.js =================================================================== --- jobvista-frontend/src/enumerations/EmploymentStatus.js (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/enumerations/EmploymentStatus.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,4 @@ +export default { + FULL_TIME: 'Full-time', + PART_TIME: 'Part-time', +}; Index: jobvista-frontend/src/enumerations/JobType.js =================================================================== --- jobvista-frontend/src/enumerations/JobType.js (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/enumerations/JobType.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,4 @@ +export default { + JOB: 'JOB', + INTERNSHIP: 'INTERNSHIP', +}; Index: jobvista-frontend/src/redux/actionTypes.js =================================================================== --- jobvista-frontend/src/redux/actionTypes.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/redux/actionTypes.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -4,2 +4,8 @@ export const UPDATE_TOKEN = "UPDATE_TOKEN" export const CURRENT_USER = "CURRENT_USER" + +export const ADD_JOB_ADVERTISEMENT = "ADD_JOB_ADVERTISEMENT" +export const EDIT_JOB_ADVERTISEMENT = "EDIT_JOB_ADVERTISEMENT" +export const DELETE_JOB_ADVERTISEMENT = "DELETE_JOB_ADVERTISEMENT" +export const FETCH_JOB_ADVERTISEMENTS = "FETCH_JOB_ADVERTISEMENTS" +export const FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER = "FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER" Index: jobvista-frontend/src/redux/actions/authActions.js =================================================================== --- jobvista-frontend/src/redux/actions/authActions.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/redux/actions/authActions.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -43,6 +43,7 @@ const response = jwtResponse.data; const token = response.token; - //const refreshToken = response.refreshToken; // Corrected typo + //const refreshToken = response.refreshToken; const user = { + id: response.id, email: response.email, name: response.name, Index: jobvista-frontend/src/redux/actions/jobAdvertisementActions.js =================================================================== --- jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,102 @@ +import axios from "../../axios/axiosInstance"; +import { + ADD_JOB_ADVERTISEMENT, + CURRENT_USER, DELETE_JOB_ADVERTISEMENT, EDIT_JOB_ADVERTISEMENT, + FETCH_JOB_ADVERTISEMENTS, + FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER +} from "../actionTypes"; + +export const JobAdvertisementActions = { + addJobAdvertisement: (jobAdvertisement, callback) => { + return dispatch => { + axios.post("/job-advertisements/add", jobAdvertisement) + .then(response => { + dispatch({ + type: ADD_JOB_ADVERTISEMENT, + jobAdvertisement: response.data + }) + callback(true, response) + }).catch((error) => { + callback(false, error) + }) + } + }, + editJobAdvertisement: (jobAdvertisement, id, callback) => { + return dispatch => { + axios.put("/job-advertisements/edit/" + id, jobAdvertisement) + .then(response => { + dispatch({ + type: EDIT_JOB_ADVERTISEMENT, + jobAdvertisement: response.data + }) + callback(true, response) + }).catch((error) => { + callback(false, error) + }) + } + }, + deleteJobAdvertisement: (id, callback) => { + return dispatch => { + axios.delete("/job-advertisements/delete/" + id) + .then(response => { + dispatch({ + type: DELETE_JOB_ADVERTISEMENT, + id: id + }) + callback(true) + }).catch(error => { + callback(false, error) + }) + + } + }, + fetchJobAdvertisementById: (id, callback) => { + axios.get("/job-advertisements/view/" + id) + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + }, + + fetchJobAdvertisements: (callback) => { + return dispatch => { + axios.get("/job-advertisements/all") + .then(response => { + dispatch({ + type: FETCH_JOB_ADVERTISEMENTS, + jobAdvertisements: response.data, + }) + callback(true, response) + }).catch((error) => { + callback(false, error) + }) + } + }, + + fetchJobAdvertisementsByRecruiter: (id, callback) => { + return dispatch => { + let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); + axios.get("/job-advertisements/recruiter/" + currentUser.id) + .then(response => { + dispatch({ + type: FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER, + jobAdvertisementsByRecruiter: response.data, + }) + callback(true, response) + }).catch((error) => { + console.log("ERROR") + callback(false, error) + }) + } + }, + + fetchRecruiterDetailsById: (id, callback) => { + axios.get("/recruiter/info/" + id) + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } +} Index: jobvista-frontend/src/redux/reducers/authReducer.js =================================================================== --- jobvista-frontend/src/redux/reducers/authReducer.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/redux/reducers/authReducer.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -21,5 +21,5 @@ case UPDATE_TOKEN: let token = action.payload; - let currentUser = null + let currentUser = ""; if(!isExpired(token)) { localStorage.setItem(AUTH_TOKEN, token); @@ -37,11 +37,10 @@ }; case SIGN_OUT: - console.log("BRISAM") localStorage.removeItem(CURRENT_USER); localStorage.removeItem(AUTH_TOKEN); return { ...state, - currentUser: null, - token: null + currentUser: "", + token: "", } Index: jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js =================================================================== --- jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,63 @@ +import { + ADD_JOB_ADVERTISEMENT, + CURRENT_USER, DELETE_JOB_ADVERTISEMENT, EDIT_JOB_ADVERTISEMENT, + FETCH_JOB_ADVERTISEMENTS, + FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER +} from "../actionTypes"; +import {sortElementsByDateCreated} from "../../utils/utils"; +import {useSelector} from "react-redux"; + +const initialState = { + jobAdvertisements: [], + jobAdvertisementsByRecruiter: [] +} + +let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)) +export const JobAdvertisementReducer = (state = initialState, action) => { + let jobAdvertisements; + let jobAdvertisementsByRecruiter; + switch (action.type) { + case ADD_JOB_ADVERTISEMENT: + + return { + ...state, + jobAdvertisements: sortElementsByDateCreated([...state.jobAdvertisements, action.jobAdvertisement]), + jobAdvertisementsByRecruiter: sortElementsByDateCreated([...state.jobAdvertisementsByRecruiter, action.jobAdvertisement]) + } + case EDIT_JOB_ADVERTISEMENT: + jobAdvertisements = state.jobAdvertisements.filter(jobAd => jobAd.id !== action.jobAdvertisement.id) + jobAdvertisementsByRecruiter = state.jobAdvertisementsByRecruiter.filter(jobAd => jobAd.id !== action.jobAdvertisement.id) + + return { + jobAdvertisements: sortElementsByDateCreated([...jobAdvertisements, action.jobAdvertisement]), + jobAdvertisementsByRecruiter: sortElementsByDateCreated([...jobAdvertisementsByRecruiter, action.jobAdvertisement]) + } + case DELETE_JOB_ADVERTISEMENT: + jobAdvertisements = state.jobAdvertisements.filter(jobAd => jobAd.id !== action.id) + jobAdvertisementsByRecruiter = state.jobAdvertisementsByRecruiter.filter(jobAd => jobAd.id !== action.id) + + return { + jobAdvertisements: sortElementsByDateCreated([...jobAdvertisements]), + jobAdvertisementsByRecruiter: sortElementsByDateCreated([...jobAdvertisementsByRecruiter]) + } + + case FETCH_JOB_ADVERTISEMENTS: + return { + ...state, + jobAdvertisements: sortElementsByDateCreated(action.jobAdvertisements) + } + + case FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER: + return { + ...state, + jobAdvertisementsByRecruiter: sortElementsByDateCreated(action.jobAdvertisementsByRecruiter) + } + + default: + return { + ...state, + }; + } +} + +export default JobAdvertisementReducer Index: jobvista-frontend/src/redux/store.js =================================================================== --- jobvista-frontend/src/redux/store.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/redux/store.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -2,5 +2,5 @@ import { combineReducers } from 'redux'; import authReducer from "./reducers/authReducer"; -import { thunk } from 'redux-thunk'; +import jobAdReducer from "./reducers/jobAdvertisementReducer"; // const rootReducer = combineReducers({ @@ -15,5 +15,6 @@ export const store = configureStore({ reducer: { - auth: authReducer + auth: authReducer, + jobAd: jobAdReducer }, }); Index: jobvista-frontend/src/utils/utils.js =================================================================== --- jobvista-frontend/src/utils/utils.js (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/utils/utils.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,40 @@ + + +export const sortElementsByDateCreated = (array) => { + return array.slice().sort((a, b) => { + return new Date(b.postedAt).getTime() - new Date(a.postedAt).getTime() + }); +} + +export const formatRelativeTime = (dateString) => { + const date = new Date(dateString); + const now = new Date(); + const diffTime = now - date; + + // Define time intervals in milliseconds + const minute = 60 * 1000; + const hour = minute * 60; + const day = hour * 24; + const week = day * 7; + const month = day * 30; + + // Calculate the relative time + if (diffTime < minute) { + return 'just now'; + } else if (diffTime < hour) { + const minutes = Math.floor(diffTime / minute); + return `${minutes} ${minutes === 1 ? 'min' : 'min'} ago`; + } else if (diffTime < day) { + const hours = Math.floor(diffTime / hour); + return `${hours} ${hours === 1 ? 'hour' : 'hours'} ago`; + } else if (diffTime < week) { + const days = Math.floor(diffTime / day); + return `${days} ${days === 1 ? 'day' : 'days'} ago`; + } else if (diffTime < month) { + const weeks = Math.floor(diffTime / week); + return `${weeks} ${weeks === 1 ? 'week' : 'weeks'} ago`; + } else { + const months = Math.floor(diffTime / month); + return `${months} ${months === 1 ? 'month' : 'months'} ago`; + } +} Index: jobvista-frontend/src/views/auth/SignInForm.js =================================================================== --- jobvista-frontend/src/views/auth/SignInForm.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/views/auth/SignInForm.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -70,5 +70,5 @@
@@ -85,8 +85,8 @@
- SIGN UP AS RECRUITER + SIGN UP AS RECRUITER
- SIGN UP AS JOB SEEKER + SIGN UP AS JOB SEEKER
Index: jobvista-frontend/src/views/auth/SignUpJobSeekerForm.js =================================================================== --- jobvista-frontend/src/views/auth/SignUpJobSeekerForm.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/views/auth/SignUpJobSeekerForm.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -83,5 +83,5 @@
Index: jobvista-frontend/src/views/auth/SignUpRecruiterForm.js =================================================================== --- jobvista-frontend/src/views/auth/SignUpRecruiterForm.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/views/auth/SignUpRecruiterForm.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -80,5 +80,5 @@
Index: jobvista-frontend/src/views/auth/auth.css =================================================================== --- jobvista-frontend/src/views/auth/auth.css (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/views/auth/auth.css (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -3,2 +3,26 @@ padding: 5px 5px; } + +.form-container { + margin-bottom: 80px; +} + +.auth-primary-btn{ + background-color: rgba(1,38,90,0.80); + //background-color: #a1c4fd ; + color: white; +} +.auth-primary-btn:hover { + background-color: rgba(1,38,90,1); + color: white; +} + +.auth-secondary-btn { + border: 2px solid rgba(1,38,90,0.7); + color: midnightblue; +} + +.auth-secondary-btn:hover { + background-color: rgba(1,38,90,0.8); + color: white; +} Index: jobvista-frontend/src/views/dashboard/Dashboard.css =================================================================== --- jobvista-frontend/src/views/dashboard/Dashboard.css (revision 19398adb44637736271a04ab58b1f528cc33908f) +++ jobvista-frontend/src/views/dashboard/Dashboard.css (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -0,0 +1,46 @@ + +.head-dashboard-box { + height: 10%; + width: 100%; + background-color: #fff; + border-radius: 12px; + padding: 15px 20px; + margin-bottom: 20px; + margin-top: 30px; + height: auto; +} + + +.head-dashboard-box .head-component { + display: inline; +} + + +.head-dashboard-box .search-container { + position: relative; + float: left; +} +.head-dashboard-box .search-container .search-input { + width: 400px; + display: inline; + padding: 5px 30px; + border-radius: 10px; + margin-right: 15px; +} + +.search-container .search-input:focus { + outline-color: #6367ef; +} + +.search-container i { + left: 10px; + position: absolute; + top: 10px; +} + +.item { + width: 35%; + display: inline-block; + margin-left: 10px; + float: right; +} Index: jobvista-frontend/src/views/dashboard/Dashboard.js =================================================================== --- jobvista-frontend/src/views/dashboard/Dashboard.js (revision d8b6c91094bd4c748b347d914a3c4c3745d51587) +++ jobvista-frontend/src/views/dashboard/Dashboard.js (revision 19398adb44637736271a04ab58b1f528cc33908f) @@ -1,28 +1,133 @@ +import "./Dashboard.css" + +import {useDispatch, useSelector} from "react-redux"; +import {useEffect, useState} from "react"; +import {JobAdvertisementActions} from "../../redux/actions/jobAdvertisementActions"; +import {formatRelativeTime, sortElementsByDateCreated} from "../../utils/utils"; +import {dataRangeOptions, industryOptions, industryOptionsFilter, sortOptions} from "../selectOptions"; +import Select from "react-select"; +import Roles from "../../enumerations/Roles"; +import {Link} from "react-router-dom"; +import JobType from "../../enumerations/JobType"; + export const Dashboard = () => { + + const dispatch = useDispatch(); + + const [jobAdvertisements, setJobAdvertisements] = useState([]); + let jobAdvertisementsState = useSelector(state => state.jobAd.jobAdvertisements) + const auth = useSelector(state => state.auth.currentUser); + + const [role, setRole] = useState(""); + const [sortOrder, setSortOrder] = useState("newest"); + const [selectedDateRange, setSelectedDateRange] = useState("all"); + const [searchTerm, setSearchTerm] = useState(""); + const [dispatched, setDispatched] = useState(false) + + useEffect(() => { + if (auth) { + setRole(auth.role); + } + }, [auth]); + + useEffect(() => { + if(!dispatched && jobAdvertisementsState.length == 0) { + dispatch(JobAdvertisementActions.fetchJobAdvertisements((success, response) => { + if (success && response.data.length > 0) { + setJobAdvertisements(sortElementsByDateCreated(response.data)) + } + setDispatched(true) + console.log("Fetch all job advertisements GET") + console.log(response.data) + })) + + } else { + setJobAdvertisements(jobAdvertisementsState) + console.log("Fetch all job advertisements STATE") + } + }, []) return (
-
-
-
-
Job Listing Name
-

Job Listing Data

+
+
+
+
+ + setSearchTerm(event.target.value)} + /> +
-
-
-
-
Job Listing Name
-

Job Listing Data

-
-
-
-
-
Job Listing Name
-

Job Listing Data

+
+
+ setSortOrder(option.value)} + options = {sortOptions} + className="sort-range sort" + /> +
+
+ +

{errors.title?.message}

+ + +