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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -2,4 +2,5 @@ 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; @@ -31,7 +32,17 @@ .authorizeHttpRequests(request -> request // TO DO: FIX PERMISSIONS - .requestMatchers("/api/job-advertisements/**","/api/job-advertisements/view/**","/api/recruiter/info/**", - "/api/job-advertisements/apply/**","/api/auth/**", "/api/resume/**", "/api/my-applications/**", "/api/applications/{id}/update", "/api/admin/**").permitAll() - //.requestMatchers("/api/job-advertisements/**").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-advertisements/**", + "/api/job-advertisements/view/**", + "/api/recruiter/**", + "/api/job-seeker/**", + "/api/recruiter/{id}/info", + "/api/recruiter/{id}/edit-info", + "/api/job-advertisements/apply/**", + "/api/auth/**", + "/api/resume/**", + "/api/my-applications/**", + "/api/applications/{id}/update", + "/api/admin/**").permitAll() +// .requestMatchers("/api/recruiter").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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AdminController.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -2,4 +2,5 @@ import lombok.RequiredArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterAdminDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.AdminService; @@ -20,12 +21,12 @@ @PostMapping("/change-access/{recruiter_id}") public ResponseEntity changeAccess(@PathVariable("recruiter_id") Long recruiterId, @RequestBody boolean access) { - RecruiterDetailsDTO recruiterDetailsDTO = adminService.changeAccess(recruiterId, access); - return new ResponseEntity<>(recruiterDetailsDTO, HttpStatus.OK); + RecruiterAdminDetailsDTO recruiterAdminDetailsDTO = adminService.changeAccess(recruiterId, access); + return new ResponseEntity<>(recruiterAdminDetailsDTO, HttpStatus.OK); } @GetMapping("/recruiters") public ResponseEntity findAllRecruiters() { - List recruiterDetailsDTOList = adminService.findAllRecruiters(); - return new ResponseEntity<>(recruiterDetailsDTOList, HttpStatus.OK); + List recruiterAdminDetailsDTOList = adminService.findAllRecruiters(); + return new ResponseEntity<>(recruiterAdminDetailsDTOList, 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobSeekerController.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -3,7 +3,14 @@ import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerEditDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobSeekerService; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; @RestController @@ -12,3 +19,33 @@ @CrossOrigin(origins = "*") public class JobSeekerController { + private final JobSeekerService jobSeekerService; + + @GetMapping("/{id}/edit-info") + public ResponseEntity getJobSeekerEditDetailsById(@PathVariable("id") Long id) { + JobSeekerEditDetailsDTO jobSeekerEditDetailsDTO = jobSeekerService.getJobSeekerEditDetailsById(id); + return new ResponseEntity<>(jobSeekerEditDetailsDTO, HttpStatus.OK); + } + + @PostMapping("/{id}/edit-info") + public ResponseEntity editRecruiterDetailsById(@PathVariable("id") Long id, @RequestBody JobSeekerEditDetailsDTO jobSeekerEditDetailsDTO) { + JobSeekerEditDetailsDTO jobSeekerEditDetailsDTOresp = jobSeekerService.editJobSeekerDetailsById(id, jobSeekerEditDetailsDTO); + return new ResponseEntity<>(jobSeekerEditDetailsDTOresp, HttpStatus.OK); + } + + @PostMapping("/submit-profile-pic") + public ResponseEntity submitJobSeekerProfilePic( + @RequestParam("jobSeekerId") Long jobSeekerId, + @RequestParam("profilePicFile") MultipartFile profilePicFile) { + jobSeekerService.submitProfilePic(jobSeekerId, profilePicFile); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/{id}/download-profile-pic") + public ResponseEntity downloadJobSeekerProfilePic(@PathVariable("id") Long id) { + Resource resource = jobSeekerService.loadProfilePicAsResource(id); + return ResponseEntity.ok() + .contentType(MediaType.IMAGE_JPEG) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"") + .body(resource); + } } 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/RecruiterController.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -3,8 +3,13 @@ import lombok.AllArgsConstructor; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.RecruiterService; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; @RestController @@ -16,8 +21,37 @@ private final RecruiterService recruiterService; - @GetMapping("/info/{id}") + @GetMapping("/{id}/info") public ResponseEntity getRecruiterDetailsById(@PathVariable("id") Long id) { RecruiterDetailsDTO recruiterDetailsDTO = recruiterService.getRecruiterDetailsById(id); return new ResponseEntity<>(recruiterDetailsDTO, HttpStatus.OK); } + + @GetMapping("/{id}/edit-info") + public ResponseEntity getRecruiterEditDetailsById(@PathVariable("id") Long id) { + RecruiterEditDetailsDTO recruiterEditDetailsDTO = recruiterService.getRecruiterEditDetailsById(id); + return new ResponseEntity<>(recruiterEditDetailsDTO, HttpStatus.OK); + } + + @PostMapping("/{id}/edit-info") + public ResponseEntity editRecruiterDetailsById(@PathVariable("id") Long id, @RequestBody RecruiterEditDetailsDTO recruiterEditDetailsDTO) { + RecruiterEditDetailsDTO recruiterEditDetailsDTOresp = recruiterService.editRecruiterDetailsById(id, recruiterEditDetailsDTO); + return new ResponseEntity<>(recruiterEditDetailsDTOresp, HttpStatus.OK); + } + + @PostMapping("/submit-logo") + public ResponseEntity submitRecruiterLogo( + @RequestParam("recruiterId") Long recruiterId, + @RequestParam("logoFile") MultipartFile logoFile) { + recruiterService.submitLogo(recruiterId, logoFile); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/{id}/download-logo") + public ResponseEntity downloadRecruiterLogo(@PathVariable("id") Long id) { + Resource resource = recruiterService.loadLogoAsResource(id); + return ResponseEntity.ok() + .contentType(MediaType.IMAGE_JPEG) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"") + .body(resource); + } } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/Application.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/Application.java (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/Application.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -62,7 +62,8 @@ application.getJobSeeker().getEmail(), application.getJobSeeker().getPhoneNumber(), + application.getJobAdvertisement().getRecruiter().getId(), application.getJobAdvertisement().getRecruiter().getName(), - application.getJobAdvertisement().getRecruiter().getEmail(), - application.getJobAdvertisement().getRecruiter().getPhoneNumber(), + application.getJobAdvertisement().getRecruiter().getContactEmailAddress(), + application.getJobAdvertisement().getRecruiter().getContactPhoneNumber(), application.getJobAdvertisement().getId(), application.getJobAdvertisement().getTitle(), Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/DTO/ApplicationDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/DTO/ApplicationDetailsDTO.java (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/DTO/ApplicationDetailsDTO.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -18,4 +18,5 @@ private String jobSeekerEmail; private String jobSeekerPhoneNumber; + private Long recruiterId; private String recruiterName; private String recruiterEmail; 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/DTO/JobAdvertisementDTO.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -11,5 +11,5 @@ @NoArgsConstructor public class JobAdvertisementDTO { - private String email; + private Long id; private String title; private String description; 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -11,10 +11,8 @@ @NoArgsConstructor public class RecruiterDetailsDTO { - private Long id; - private String email; private String companyName; private String companyDescription; - private String phoneNumber; - private boolean hasAccess; - private LocalDateTime registeredOn; + private String contactEmail; + private String contactPhoneNumber; + private String receptionist; } 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/JobSeeker.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -8,4 +8,6 @@ import lombok.NoArgsConstructor; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.Role; + +import java.nio.file.Paths; @Entity @@ -22,4 +24,8 @@ this.lastName = lastName; this.phoneNumber = phoneNumber; + + String relativeProfilePicFilePath = Paths.get("uploads", "job-seekers", "profile-pics", "default-profile-pic.png").toString(); + this.profilePicFilePath = relativeProfilePicFilePath; + this.role = Role.ROLE_JOBSEEKER; } @@ -34,4 +40,6 @@ private String phoneNumber; + private String profilePicFilePath; + @Override public String getName() { Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/Recruiter.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -9,8 +9,9 @@ import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.Role; +import java.nio.file.Paths; + @Entity @Data @NoArgsConstructor -@AllArgsConstructor @Table(name = "recruiters") public class Recruiter extends User { @@ -21,5 +22,10 @@ this.companyName = companyName; this.companyDescription = ""; - this.phoneNumber = phoneNumber; + this.contactEmailAddress = email; + this.contactPhoneNumber = phoneNumber; + this.receptionist = ""; + + String relativeLogoFilePath = Paths.get("uploads", "logo", "default-company-logo.png").toString(); + this.logoFilePath = relativeLogoFilePath; this.role = Role.ROLE_RECRUITER; } @@ -31,6 +37,11 @@ private String companyDescription; - @Column(name = "phone_number") - private String phoneNumber; + private String contactEmailAddress; + + private String contactPhoneNumber; + + private String receptionist; + + private String logoFilePath; @Override 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/JobSeekerMapper.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -2,5 +2,8 @@ import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerEditDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.JobSeeker; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; public class JobSeekerMapper { @@ -26,3 +29,12 @@ } + public static JobSeekerEditDetailsDTO mapToJobSeekerEditDetailsDTO(JobSeeker jobSeeker) { + return new JobSeekerEditDetailsDTO( + jobSeeker.getEmail(), + jobSeeker.getFirstName(), + jobSeeker.getLastName(), + jobSeeker.getPhoneNumber() + ); + } + } 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -1,6 +1,8 @@ package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.mappers; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterAdminDetailsDTO; 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.DTO.RecruiterEditDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; @@ -12,5 +14,5 @@ recruiter.getPassword(), recruiter.getCompanyName(), - recruiter.getPhoneNumber() + recruiter.getContactPhoneNumber() ); } @@ -18,9 +20,31 @@ public static RecruiterDetailsDTO mapToRecruiterDetailsDTO(Recruiter recruiter) { return new RecruiterDetailsDTO( + recruiter.getCompanyName(), + recruiter.getCompanyDescription(), + recruiter.getContactEmailAddress(), + recruiter.getContactPhoneNumber(), + recruiter.getReceptionist() + ); + } + public static RecruiterEditDetailsDTO mapToRecruiterEditDetailsDTO(Recruiter recruiter) { + return new RecruiterEditDetailsDTO( + recruiter.getEmail(), + recruiter.getCompanyName(), + recruiter.getCompanyDescription(), + recruiter.getContactEmailAddress(), + recruiter.getContactPhoneNumber(), + recruiter.getReceptionist() + ); + } + + public static RecruiterAdminDetailsDTO mapToRecruiterAdminDetailsDTO(Recruiter recruiter) { + return new RecruiterAdminDetailsDTO( recruiter.getId(), recruiter.getEmail(), recruiter.getCompanyName(), recruiter.getCompanyDescription(), - recruiter.getPhoneNumber(), + recruiter.getContactEmailAddress(), + recruiter.getContactPhoneNumber(), + recruiter.getReceptionist(), recruiter.isHasAccess(), recruiter.getRegisteredOn() @@ -36,4 +60,5 @@ ); } + // Using MapStruct: // RecruiterMapper INSTANCE = Mappers.getMapper(RecruiterMapper.class); Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AdminServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AdminServiceImpl.java (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AdminServiceImpl.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -3,4 +3,5 @@ import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterAdminDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter; @@ -20,10 +21,10 @@ @Override - public RecruiterDetailsDTO changeAccess(long recruiterId, boolean access) { + public RecruiterAdminDetailsDTO changeAccess(long recruiterId, boolean access) { Recruiter recruiter = recruiterRepository.findById(recruiterId).orElse(null); if (recruiter != null) { recruiter.setHasAccess(access); recruiterRepository.save(recruiter); - return RecruiterMapper.mapToRecruiterDetailsDTO(recruiter); + return RecruiterMapper.mapToRecruiterAdminDetailsDTO(recruiter); } return null; @@ -32,7 +33,7 @@ @Override - public List findAllRecruiters() { + public List findAllRecruiters() { List recruiterList = recruiterRepository.findAll(); - return recruiterList.stream().map(RecruiterMapper::mapToRecruiterDetailsDTO).toList(); + return recruiterList.stream().map(RecruiterMapper::mapToRecruiterAdminDetailsDTO).toList(); } } 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobAdvertisementServiceImpl.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -30,5 +30,5 @@ @Override public JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO) { - Recruiter recruiter = recruiterRepository.findRecruiterByEmail(jobAdvertisementDTO.getEmail()).orElseThrow(() -> new IllegalArgumentException("User not found")); + Recruiter recruiter = recruiterRepository.findById(jobAdvertisementDTO.getId()).orElseThrow(() -> new IllegalArgumentException("User not found")); JobAdvertisement jobAdvertisement = new JobAdvertisement( recruiter, 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JwtServiceImpl.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -25,4 +25,5 @@ .claim("role", user.getRole()) .claim("access", user.isHasAccess()) + .claim("id", user.getId()) .setIssuedAt(new Date()) .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24)) 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/RecruiterServiceImpl.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -3,9 +3,21 @@ import lombok.RequiredArgsConstructor; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterEditDetailsDTO; 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.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.Resource; +import org.springframework.core.io.UrlResource; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; @Service @@ -14,4 +26,38 @@ private final RecruiterRepository recruiterRepository; + private final Path logoStorageLocation; + + @Autowired + RecruiterServiceImpl(@Value("./uploads") String uploadDir, RecruiterRepository recruiterRepository) { + this.recruiterRepository = recruiterRepository; + + this.logoStorageLocation = Paths.get(uploadDir + "/logo").toAbsolutePath().normalize(); + try { + Files.createDirectories(this.logoStorageLocation); + } catch (IOException ex) { + throw new RuntimeException("Could not create the directory where the uploaded files will be stored.", ex); + } + } + + + @Override + public RecruiterEditDetailsDTO editRecruiterDetailsById(Long recruiterId, RecruiterEditDetailsDTO recruiterEditDetailsDTO) { + Recruiter recruiter = recruiterRepository.findById(recruiterId).orElse(null); + recruiter.setEmail(recruiterEditDetailsDTO.getEmail()); + recruiter.setCompanyName(recruiterEditDetailsDTO.getCompanyName()); + recruiter.setCompanyDescription(recruiterEditDetailsDTO.getCompanyDescription()); + recruiter.setContactEmailAddress(recruiterEditDetailsDTO.getContactEmail()); + recruiter.setContactPhoneNumber(recruiterEditDetailsDTO.getContactPhoneNumber()); + recruiter.setReceptionist(recruiterEditDetailsDTO.getReceptionist()); + recruiterRepository.save(recruiter); + return RecruiterMapper.mapToRecruiterEditDetailsDTO(recruiter); + } + + @Override + public RecruiterEditDetailsDTO getRecruiterEditDetailsById(Long recruiterId) { + Recruiter recruiter = recruiterRepository.findById(recruiterId).orElse(null); + return RecruiterMapper.mapToRecruiterEditDetailsDTO(recruiter); + } + @Override @@ -20,3 +66,50 @@ return RecruiterMapper.mapToRecruiterDetailsDTO(recruiter); } + + @Override + public void submitLogo(Long recruiterId, MultipartFile logoFile) { + + Path recruiterLogoDir = this.logoStorageLocation.resolve(String.valueOf(recruiterId)); + try { + Files.createDirectories(recruiterLogoDir); + String originalFilename = logoFile.getOriginalFilename(); + + if (originalFilename != null) { + Path targetLocation = recruiterLogoDir.resolve(originalFilename); + + Files.copy(logoFile.getInputStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING); + + Recruiter recruiter = recruiterRepository.findById(recruiterId) + .orElseThrow(() -> new RuntimeException("Recruiter not found")); + String relativePath = Paths.get("uploads", "logo", String.valueOf(recruiterId), originalFilename).toString(); + recruiter.setLogoFilePath(relativePath); + recruiterRepository.save(recruiter); + } + + } catch (IOException ex) { + throw new RuntimeException("Could not store file. Please try again!", ex); + } + + + } + + public Resource loadLogoAsResource(Long recruiterId) { + Recruiter recruiter = recruiterRepository.findById(recruiterId) + .orElseThrow(() -> new RuntimeException("Recruiter not found")); + + try { + String relativeLogoPath = recruiter.getLogoFilePath(); + Path logoPath = this.logoStorageLocation.getParent().getParent().resolve(relativeLogoPath); + Resource resource = new UrlResource(logoPath.toUri()); + if (resource.exists()) { + return resource; + } else { + throw new RuntimeException("File not found " + logoPath); + } + } catch (IOException ex) { + throw new RuntimeException("File not found " + ex); + } + + } + } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/AdminService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/AdminService.java (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/AdminService.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -1,4 +1,5 @@ package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterAdminDetailsDTO; import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO; @@ -6,5 +7,5 @@ public interface AdminService { - RecruiterDetailsDTO changeAccess(long recruiterId, boolean access); - List findAllRecruiters(); + RecruiterAdminDetailsDTO changeAccess(long recruiterId, boolean access); + List findAllRecruiters(); } 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 b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/RecruiterService.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -2,7 +2,14 @@ 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.DTO.RecruiterEditDetailsDTO; +import org.springframework.core.io.Resource; +import org.springframework.web.multipart.MultipartFile; public interface RecruiterService { RecruiterDetailsDTO getRecruiterDetailsById(Long recruiterId); + RecruiterEditDetailsDTO editRecruiterDetailsById(Long recruiterId, RecruiterEditDetailsDTO recruiterEditDetailsDTO); + RecruiterEditDetailsDTO getRecruiterEditDetailsById(Long recruiterId); + + void submitLogo(Long recruiterId, MultipartFile logoFile); + Resource loadLogoAsResource(Long recruiterId); } Index: jobvista-frontend/package-lock.json =================================================================== --- jobvista-frontend/package-lock.json (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/package-lock.json (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -32,4 +32,5 @@ "react-scripts": "5.0.1", "react-select": "^5.8.0", + "react-toastify": "^10.0.5", "redux": "^5.0.1", "redux-thunk": "^3.1.0", @@ -16027,4 +16028,16 @@ } }, + "node_modules/react-toastify": { + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-10.0.5.tgz", + "integrity": "sha512-mNKt2jBXJg4O7pSdbNUfDdTsK9FIdikfsIE/yUCxbAEXl4HMyJaivrVFcn3Elvt5xvCQYhUZm+hqTIu1UXM3Pw==", + "dependencies": { + "clsx": "^2.1.0" + }, + "peerDependencies": { + "react": ">=18", + "react-dom": ">=18" + } + }, "node_modules/react-transition-group": { "version": "4.4.5", Index: jobvista-frontend/package.json =================================================================== --- jobvista-frontend/package.json (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/package.json (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -27,4 +27,5 @@ "react-scripts": "5.0.1", "react-select": "^5.8.0", + "react-toastify": "^10.0.5", "redux": "^5.0.1", "redux-thunk": "^3.1.0", Index: jobvista-frontend/src/App.css =================================================================== --- jobvista-frontend/src/App.css (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/App.css (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -2,7 +2,20 @@ @import url('https://fonts.googleapis.com/css2?family=Cabin:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap'); +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +html { + scroll-behavior: smooth; +} + .App { - background-color: rgb(243, 242, 241); - //background-color: #EBF2FC; + /*background-color: rgb(243, 242, 241);*/ + background-color: #F5F5F5; + /*background-color: #F4F2EE;*/ + /*background-color: #0F0F0F;*/ + /*background-color: #EBF2FC;*/ height: 100vh; overflow-y: auto; @@ -14,5 +27,5 @@ -webkit-box-pack: center; justify-content: center; -margin-bottom: 20px; + margin-bottom: 20px; margin-top: 20px; } @@ -36,4 +49,12 @@ } +.container, .custom-container { + margin-top: 120px !important; +} + +.no-additional-margin { + margin-top: 80px !important; +} + /*font-family: 'Ubuntu', sans-serif;*/ @@ -49,4 +70,10 @@ height: 280px !important; } + +.container .g-4 { + --bs-gutter-y: 6rem !important; + margin-bottom: 100px !important; +} + .add-new-card { @@ -80,5 +107,5 @@ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); transform: translate(0, 0); - height: 260px; + height: auto; } @@ -167,11 +194,11 @@ 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; + background-image: linear-gradient(to bottom, #dddddd, #f0f0f0); + color: #333333; font-weight: bold; padding: 5px 10px; transition: 0.2s; + text-decoration: none; + text-align: center; } @@ -180,14 +207,10 @@ } .card-button:not(.disabled):hover{ - background-color: rgb(187, 215, 235); - //background-position: right center; - color: black; -} - -.disabled { - cursor: default !important; - opacity: 0.6; -} - - - + background: linear-gradient(to bottom, #bbbbbb, #dddddd); + color: #333333; +} + + + + + Index: jobvista-frontend/src/App.js =================================================================== --- jobvista-frontend/src/App.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/App.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -4,10 +4,12 @@ import {BrowserRouter} from "react-router-dom"; import {Header} from "./views/static/Header"; -import {RoutesConfig} from "./auth/RoutesConfig"; -import {useEffect, useState} from "react"; +import RoutesConfig from "./auth/RoutesConfig"; +import React, {useEffect, useState} from "react"; import {AuthActions} from "./redux/actions/authActions"; import {AUTH_TOKEN} from "./axios/axiosInstance"; import {jwtDecode} from "jwt-decode"; import {NoAccess} from "./views/static/NoAccess"; +import {Loading} from "./views/static/Loading"; +import {ToastContainer} from "react-toastify"; function App() { @@ -20,5 +22,17 @@ const [user, setUser] = useState(null); const [loading, setLoading] = useState(true); + const [minimumLoadingTime, setMinimumLoadingTime] = useState(true); + const auth = useSelector(state => state.auth); + + useEffect(() => { + // Simulate a minimum loading time of 1 second + const timer = setTimeout(() => { + setMinimumLoadingTime(false); + }, 1000); + + // Clear timeout if component unmounts + return () => clearTimeout(timer); + }, []); useEffect(() => { @@ -30,5 +44,6 @@ name: decodedToken.name, role: decodedToken.role, - hasAccess: auth.currentUser.access, + hasAccess: decodedToken.access, + id: decodedToken.id }); setLoading(false); @@ -42,6 +57,6 @@ }, [auth]); - if (loading) { - return ; // Replace LoadingSpinner with your loading indicator component + if (loading || minimumLoadingTime) { + return ; // Replace LoadingSpinner with your loading indicator component } @@ -58,11 +73,11 @@
+ {/**/} ) : ( )} - - + ); Index: jobvista-frontend/src/auth/RoutesConfig.js =================================================================== --- jobvista-frontend/src/auth/RoutesConfig.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/auth/RoutesConfig.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -1,31 +1,212 @@ - -import {Route, Router, Routes} from 'react-router-dom' +import {Navigate, Route, Router, Routes} from 'react-router-dom' import {Dashboard} from "../views/dashboard/Dashboard"; import {SignInForm} from "../views/auth/SignInForm"; import {SignUpRecruiterForm} from "../views/auth/SignUpRecruiterForm"; import {SignUpJobSeekerForm} from "../views/auth/SignUpJobSeekerForm"; -import {JobAdvertisements} from "../views/job_advertisements/JobAdvertisements"; +import {Workspace} from "../views/job_advertisements/RecruiterWorkspace"; import {JobAdDetails} from "../views/job_advertisements/JobAdDetails"; import {ApplicationsByJobAd} from "../views/applications/ApplicationsByJobAd"; import {ApplicationsByJobSeeker} from "../views/applications/ApplicationsByJobSeeker"; + +import {AdminPanel} from "../views/admin_panel/AdminPanel"; +import {RecruiterProfile} from "../views/recruiters/RecruiterProfile"; +import {AboutUs} from "../views/static/AboutUs"; +import {JobSeekerEditProfile} from "../views/edit_profile/JobSeekerEditProfile"; +import {RecruiterEditProfile} from "../views/edit_profile/RecruiterEditProfile"; +import Roles from "../enumerations/Roles"; +import {useSelector} from "react-redux"; import {useEffect, useState} from "react"; -import {AUTH_TOKEN} from "../axios/axiosInstance"; -import {jwtDecode} from "jwt-decode"; -import {useSelector} from "react-redux"; -import {AdminPanel} from "../views/admin_panel/AdminPanel"; -export const RoutesConfig = () => { +import {ErrorPage} from "../views/static/ErrorPage"; + +export const PrivateRoutes = [ + { + component: AdminPanel, + path: '/admin-panel', + title: 'Admin Panel', + exact: true, + permission: [ + Roles.ADMIN + ] + }, + { + component: Workspace, + path: '/job-management-hub', + title: 'Job Management Hub', + exact: true, + permission: [ + Roles.RECRUITER, + ] + }, + { + component: ApplicationsByJobAd, + path: '/job-management-hub/applications/:advertisement_id', + title: 'Applications by Job Ad', + exact: true, + permission: [ + Roles.RECRUITER + ] + }, + { + component: ApplicationsByJobSeeker, + path: '/my-applications', + title: 'My Applications', + exact: true, + permission: [ + Roles.JOBSEEKER + ] + }, + + { + component: JobSeekerEditProfile, + path: '/job-seeker/edit-profile', + title: 'Edit Job Seeker Profile', + exact: true, + permission: [ + Roles.JOBSEEKER + ] + }, + { + component: RecruiterEditProfile, + path: '/recruiter/edit-profile', + title: 'Edit Recruiter Profile', + exact: true, + permission: [ + Roles.RECRUITER + ] + }, +] + +export const PublicRoutes = [ + { + component: Dashboard, + path: "/", + exact: true, + permission: [ + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN, + Roles.GUEST + ] + }, + { + component: SignInForm, + path: '/signin', + title: 'Sign In', + exact: true, + permission: [ + Roles.GUEST, + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN + ] + }, + + { + component: SignUpRecruiterForm, + path: '/signup/recruiter', + title: 'Sign Up as Recruiter', + permission: [ + Roles.GUEST, + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN + ] + }, + { + component: SignUpJobSeekerForm, + path: '/signup/job-seeker', + title: 'Sign Up as Job Seeker', + permission: [ + Roles.GUEST, + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN + ] + }, + { + component: JobAdDetails, + path: '/job-advertisements/:id', + title: 'Job Advertisement Details', + exact: true, + permission: [ + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN, + Roles.GUEST + ] + }, + { + component: RecruiterProfile, + path: '/recruiters/:id', + title: 'Recruiter Profile', + exact: true, + permission: [ + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN, + Roles.GUEST + ] + }, + { + component: AboutUs, + path: '/about', + title: 'About Us', + exact: true, + permission: [ + Roles.GUEST, + Roles.RECRUITER, + Roles.JOBSEEKER, + Roles.ADMIN + ] + }, +] + +const AllRoutes = [...PrivateRoutes, ...PublicRoutes]; + +const filterRoutes = (roleParam) => { + return AllRoutes.filter(route => { + return route.permission.includes(roleParam); + }); +}; +const RoutesConfig = () => { + const currentUser = useSelector(state => state.auth.currentUser); + const [role, setRole] = useState(Roles.GUEST); + + useEffect(() => { + if (currentUser) { + setRole(currentUser.role); + } + }, [currentUser]); return ( - - }> - }> - }> - }> - }> - }> - }> - }> - }> - + + {filterRoutes(role).map(route => ( + } + exact={route.exact} + /> + ))} + }/> + + + // + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // }> + // ) } + +export default RoutesConfig Index: jobvista-frontend/src/enumerations/Roles.js =================================================================== --- jobvista-frontend/src/enumerations/Roles.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/enumerations/Roles.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -14,3 +14,4 @@ RECRUITER: 'ROLE_RECRUITER', JOBSEEKER: 'ROLE_JOBSEEKER', + GUEST: 'ROLE_GUEST' }; Index: jobvista-frontend/src/redux/actionTypes.js =================================================================== --- jobvista-frontend/src/redux/actionTypes.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/actionTypes.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -20,4 +20,7 @@ export const FETCH_RECRUITERS = "FETCH_RECRUITERS" export const CHANGE_ACCESS = "CHANGE_ACCESS" +export const SUBMIT_RECRUITER_LOGO = "SUBMIT_RECRUITER_LOGO" +export const SUBMIT_RECRUITER_COVER = "SUBMIT_RECRUITER_COVER" +export const SET_LOGO_URL = 'SET_LOGO_URL'; +export const SET_PROFILE_PIC_URL = 'SET_PROFILE_PIC_URL'; - Index: jobvista-frontend/src/redux/actions/applicationActions.js =================================================================== --- jobvista-frontend/src/redux/actions/applicationActions.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/actions/applicationActions.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -47,8 +47,7 @@ } }, - fetchApplicationsByJobSeeker: (callback) => { + fetchApplicationsByJobSeeker: (jobSeekerId, callback) => { return dispatch => { - let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); - axios.get("/my-applications/" + currentUser.id) + axios.get("/my-applications/" + jobSeekerId) .then(response => { dispatch({ Index: jobvista-frontend/src/redux/actions/authActions.js =================================================================== --- jobvista-frontend/src/redux/actions/authActions.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/actions/authActions.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -45,9 +45,8 @@ //const refreshToken = response.refreshToken; const user = { - id: response.id, - email: response.email, name: response.name, role: response.role, access: response.hasAccess, + id: response.id, }; dispatch({ Index: jobvista-frontend/src/redux/actions/jobAdvertisementActions.js =================================================================== --- jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -87,8 +87,8 @@ }, - fetchJobAdvertisementsByRecruiter: (callback) => { + fetchJobAdvertisementsByRecruiter: (recruiterId, callback) => { return dispatch => { let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); - axios.get("/job-advertisements/recruiter/" + currentUser.id) + axios.get("/job-advertisements/recruiter/" + recruiterId) .then(response => { dispatch({ @@ -103,8 +103,8 @@ }, - filterJobAdvertisementsByRecruiter: (filter, callback) => { + filterJobAdvertisementsByRecruiter: (id, filter, callback) => { let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); - axios.post("/job-advertisements/recruiter/" + currentUser.id + "/filtered", filter) + axios.post("/job-advertisements/recruiter/" + id + "/filtered", filter) .then(response => { callback(true, response) @@ -116,5 +116,5 @@ fetchRecruiterDetailsById: (id, callback) => { - axios.get("/recruiter/info/" + id) + axios.get("/recruiter/"+id+"/info") .then(response => { callback(true, response) Index: jobvista-frontend/src/redux/reducers/authReducer.js =================================================================== --- jobvista-frontend/src/redux/reducers/authReducer.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/reducers/authReducer.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -3,4 +3,5 @@ import {isExpired} from "react-jwt"; import {CURRENT_USER, SIGN_IN, SIGN_OUT, UPDATE_TOKEN} from "../actionTypes"; +import {jwtDecode} from "jwt-decode"; const initialState = { @@ -13,5 +14,5 @@ case SIGN_IN: localStorage.setItem(AUTH_TOKEN, action.payload.token); - localStorage.setItem(CURRENT_USER, JSON.stringify(action.payload.user)); + //localStorage.setItem(CURRENT_USER, JSON.stringify(action.payload.user)); return { ...state, @@ -21,10 +22,24 @@ case UPDATE_TOKEN: let token = action.payload; + let decodedToken; let currentUser = ""; + if(token !=null) { + try { + decodedToken = jwtDecode(token); + } catch (error) { + console.log("Failed to decode token: " + error) + } + } + if(!isExpired(token)) { localStorage.setItem(AUTH_TOKEN, token); - currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); + currentUser = { + name: decodedToken.name, + role: decodedToken.role, + access: decodedToken.access, + id: decodedToken.id + }; } else { - localStorage.removeItem(CURRENT_USER); + //localStorage.removeItem(CURRENT_USER); localStorage.removeItem(AUTH_TOKEN); currentUser = ""; @@ -37,5 +52,5 @@ }; case SIGN_OUT: - localStorage.removeItem(CURRENT_USER); + //localStorage.removeItem(CURRENT_USER); localStorage.removeItem(AUTH_TOKEN); return { Index: jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js =================================================================== --- jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/reducers/jobAdvertisementReducer.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -1,7 +1,12 @@ import { ADD_JOB_ADVERTISEMENT, - CURRENT_USER, DELETE_JOB_ADVERTISEMENT, EDIT_JOB_ADVERTISEMENT, + CURRENT_USER, + DELETE_JOB_ADVERTISEMENT, + EDIT_JOB_ADVERTISEMENT, FETCH_JOB_ADVERTISEMENTS, - FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER, FILTER_JOB_ADVERTISEMENTS, FILTER_JOB_ADVERTISEMENTS_BY_RECRUITER + FETCH_JOB_ADVERTISEMENTS_BY_RECRUITER, + FILTER_JOB_ADVERTISEMENTS, + FILTER_JOB_ADVERTISEMENTS_BY_RECRUITER, + SET_LOGO_URL } from "../actionTypes"; import {sortElementsBy} from "../../utils/utils"; Index: jobvista-frontend/src/redux/store.js =================================================================== --- jobvista-frontend/src/redux/store.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/redux/store.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -6,4 +6,5 @@ import adminReducer from "./reducers/adminReducer" import {AdminActions} from "./actions/adminActions"; +import ImagesReducer from "./reducers/imagesReducer"; // const rootReducer = combineReducers({ @@ -21,5 +22,6 @@ jobAd: jobAdReducer, appl: applicationReducer, - admin: adminReducer + admin: adminReducer, + images: ImagesReducer }, }); Index: jobvista-frontend/src/views/admin_panel/AdminPanel.js =================================================================== --- jobvista-frontend/src/views/admin_panel/AdminPanel.js (revision b2488107b82c95e4bdfdfd18b76b44f023786601) +++ jobvista-frontend/src/views/admin_panel/AdminPanel.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) @@ -4,4 +4,5 @@ import {useState, useEffect} from "react"; import {AdminActions} from "../../redux/actions/adminActions"; +import {notifyAccessUpdate} from "../../utils/toastUtils"; export const AdminPanel = () => { @@ -24,4 +25,6 @@ setRecruiters(recruitersState) console.log("Fetch all recruiters STATE") + console.log(recruitersState) + } }, [recruitersState]) @@ -32,5 +35,6 @@ }; - const handleAccessChange = (recruiterId, newAccessStatus) => { + const handleAccessChange = (recruiterId, companyName, newAccessStatus) => { + setRecruiters(prevState => prevState.map(recruiter => @@ -41,9 +45,7 @@ ); - console.log(recruiterId + " " + newAccessStatus) - dispatch(AdminActions.changeAccess(recruiterId, newAccessStatus, (success, response) => { if(success) { - console.log("Access changed") + notifyAccessUpdate(companyName) } })); @@ -51,5 +53,5 @@ return ( -
+
@@ -64,5 +66,5 @@ - {recruiters.map((recruiter) => ( + {recruitersState.map((recruiter) => ( @@ -70,5 +72,5 @@ - +
{recruiter.id}{recruiter.email} {recruiter.companyName}{recruiter.phoneNumber}{recruiter.contactPhoneNumber}