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 befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -31,18 +31,23 @@ http.csrf(AbstractHttpConfigurer::disable) .authorizeHttpRequests(request -> request - // TO DO: FIX PERMISSIONS - .requestMatchers("/api/job-advertisements/**", - "/api/job-advertisements/view/**", + .requestMatchers( + "/api/auth/**", + "/api/job-advertisements/**", + "/api/applications/**", "/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()) + "/api/job-seeker/**" + ).permitAll() + .requestMatchers("/api/admin/**").hasAnyAuthority(Role.ROLE_ADMIN.name()) + .requestMatchers("/api/recruiter/{id}/edit-info").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/recruiter/submit-logo").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-seeker/{id}/edit-info").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-seeker/submit-profile-pic").hasAnyAuthority(Role.ROLE_JOBSEEKER.name()) + .requestMatchers("/api/job-advertisements/add").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-advertisements/edit/{id}").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-advertisements/delete/{id}").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/applications/{id}/update").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/job-advertisements/{advertisement_id}/applications").hasAnyAuthority(Role.ROLE_RECRUITER.name()) + .requestMatchers("/api/applications/submit").hasAnyAuthority(Role.ROLE_JOBSEEKER.name()) + .requestMatchers("/api/my-applications/{id}").hasAnyAuthority(Role.ROLE_JOBSEEKER.name()) .anyRequest().authenticated()) .sessionManagement(manager -> manager.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/ApplicationController.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/ApplicationController.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/ApplicationController.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -42,7 +42,7 @@ } - @GetMapping("/resume/{fileName:.+}") - public ResponseEntity downloadResume(@PathVariable("fileName") String fileName) { - Resource resource = applicationService.loadResumeAsResource(fileName); + @GetMapping("/applications/{id}/download-resume") + public ResponseEntity downloadResume(@PathVariable("id") Long applicationId) { + Resource resource = applicationService.loadResumeAsResource(applicationId); return ResponseEntity.ok() .contentType(MediaType.APPLICATION_PDF) @@ -51,5 +51,5 @@ } - @PostMapping("/job-advertisements/apply") + @PostMapping("/applications/submit") public ResponseEntity submitApplication( @RequestParam("jobSeekerId") Long jobSeekerId, @@ -61,8 +61,8 @@ @RequestParam("messageToRecruiter") String messageToRecruiter) { - ApplicationDTO applicationDTO = new ApplicationDTO(jobSeekerId, jobAdId, resumeFile, answerOne, answerTwo, answerThree, messageToRecruiter); + ApplicationDTO applicationDTO = new ApplicationDTO(jobSeekerId, jobAdId, + resumeFile, answerOne, answerTwo, answerThree, messageToRecruiter); ApplicationDetailsDTO applicationDetailsDTO = applicationService.submitApplication(applicationDTO); return new ResponseEntity<>(applicationDetailsDTO, HttpStatus.OK); } - } 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 befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobAdvertisementController.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -46,5 +46,5 @@ @GetMapping("/recruiter/{id}") - public ResponseEntity findALlJobAdvertisementsByRecruiterId(@PathVariable Long id) { + public ResponseEntity findAllJobAdvertisementsByRecruiterId(@PathVariable Long id) { List jobAdDetailsDTOS = jobAdvertisementService.findAllJobAdvertisementsByRecruiterId(id); return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK); 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 befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/Application.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -32,6 +32,6 @@ private JobAdvertisement jobAdvertisement; - @Column(name = "resume_file_name", nullable = false) - private String resumeFileName; + @Column(name = "resume_file_name", nullable = true) + private String resumeFilePath; @ElementCollection @@ -45,8 +45,8 @@ private ApplicationStatus status; - public Application(JobSeeker jobSeeker, JobAdvertisement jobAdvertisement, String resumeFileName, List answers, String message) { + public Application(JobSeeker jobSeeker, JobAdvertisement jobAdvertisement, List answers, String message) { this.jobSeeker = jobSeeker; this.jobAdvertisement = jobAdvertisement; - this.resumeFileName = resumeFileName; + this.resumeFilePath = ""; this.questionAnswers = answers; this.message = message; @@ -69,5 +69,5 @@ application.getJobAdvertisement().getTitle(), application.getQuestionAnswers(), - application.getResumeFileName(), + application.getResumeFilePath(), application.getMessage(), application.getSubmittedOn(), Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JobSeekerEditDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JobSeekerEditDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JobSeekerEditDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -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 JobSeekerEditDetailsDTO { + private String email; + private String firstName; + private String lastName; + private String phoneNumber; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterAdminDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterAdminDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterAdminDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,22 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RecruiterAdminDetailsDTO { + private Long id; + private String email; + private String companyName; + private String companyDescription; + private String contactEmail; + private String contactPhoneNumber; + private String receptionist; + private boolean hasAccess; + private LocalDateTime registeredOn; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterEditDetailsDTO.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterEditDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterEditDetailsDTO.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,18 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RecruiterEditDetailsDTO { + private String email; + private String companyName; + private String companyDescription; + private String contactEmail; + private String contactPhoneNumber; + private String receptionist; +} Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -41,5 +41,5 @@ public ApplicationServiceImpl(@Value("${file.upload-dir}") String uploadDir, UserRepository userRepository, ApplicationRepository applicationRepository, JobAdvertisementRepository jobAdvertisementRepository, JobSeekerRepository jobSeekerRepository) { - this.fileStorageLocation = Paths.get(uploadDir).toAbsolutePath().normalize(); + this.fileStorageLocation = Paths.get(uploadDir + "/applications").toAbsolutePath().normalize(); try { @@ -58,17 +58,12 @@ public ApplicationDetailsDTO submitApplication(ApplicationDTO applicationDTO) { + JobSeeker jobSeeker = jobSeekerRepository.findById(applicationDTO.getJobSeekerId()) + .orElseThrow(() -> new IllegalArgumentException("User not found.")); + JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(applicationDTO.getJobAdId()) + .orElseThrow(() -> new IllegalArgumentException("Job advertisement not found.")); + if (applicationDTO.getResumeFile().isEmpty()) { throw new RuntimeException("Failed to store empty file."); } - - Path targetLocation = this.fileStorageLocation.resolve(applicationDTO.getResumeFile().getOriginalFilename()); - try { - Files.copy(applicationDTO.getResumeFile().getInputStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING); - } catch (IOException e) { - throw new RuntimeException(e); - } - - JobSeeker jobSeeker = jobSeekerRepository.findById(applicationDTO.getJobSeekerId()).orElseThrow(() -> new IllegalArgumentException("User not found")); - JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(applicationDTO.getJobAdId()).orElseThrow(() -> new IllegalArgumentException("Job Ad not found")); List answers = new ArrayList<>(); @@ -77,6 +72,23 @@ answers.add(applicationDTO.getAnswerThree()); - Application application = new Application(jobSeeker, jobAdvertisement, applicationDTO.getResumeFile().getOriginalFilename(), answers, applicationDTO.getMessageToRecruiter()); - applicationRepository.save(application); + Application application = new Application(jobSeeker, jobAdvertisement, + answers,applicationDTO.getMessageToRecruiter()); + application = applicationRepository.save(application); + + Path filePath = this.fileStorageLocation.resolve(String.valueOf(application.getId())).resolve("resume"); + Path targetLocation = filePath.resolve(applicationDTO.getResumeFile().getOriginalFilename()); + + try { + Files.createDirectories(filePath); + Files.copy(applicationDTO.getResumeFile().getInputStream(), targetLocation); + } catch (IOException e) { + throw new RuntimeException(e); + } + + String relativePath = Paths.get("uploads","applications",String.valueOf(application.getId()), + "resume", applicationDTO.getResumeFile().getOriginalFilename()).toString(); + application.setResumeFilePath(relativePath); + application = applicationRepository.save(application); + return Application.mapToApplicationDetailsDTO(application); } @@ -95,15 +107,20 @@ @Override - public Resource loadResumeAsResource(String fileName) { + public Resource loadResumeAsResource(Long applicationId) { + Application application = applicationRepository.findById(applicationId). + orElseThrow(() -> new IllegalArgumentException("Application not found")); + + String relativeFilePath = application.getResumeFilePath(); + Path filePath = fileStorageLocation.getParent().getParent().resolve(relativeFilePath).normalize(); + try { - Path filePath = fileStorageLocation.resolve(fileName).normalize(); Resource resource = new UrlResource(filePath.toUri()); if (resource.exists()) { return resource; } else { - throw new RuntimeException("File not found " + fileName); + throw new RuntimeException("File not found: " + relativeFilePath); } } catch (IOException ex) { - throw new RuntimeException("File not found " + fileName, ex); + throw new RuntimeException("File path is invalid: " + relativeFilePath, ex); } } 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 befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobAdvertisementServiceImpl.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -17,5 +17,4 @@ import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Comparator; import java.util.List; @@ -24,5 +23,4 @@ @RequiredArgsConstructor public class JobAdvertisementServiceImpl implements JobAdvertisementService { - private final UserRepository userRepository; private final JobAdvertisementRepository jobAdvertisementRepository; private final RecruiterRepository recruiterRepository; @@ -30,5 +28,6 @@ @Override public JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO) { - Recruiter recruiter = recruiterRepository.findById(jobAdvertisementDTO.getId()).orElseThrow(() -> new IllegalArgumentException("User not found")); + Recruiter recruiter = recruiterRepository.findById(jobAdvertisementDTO.getId()) + .orElseThrow(() -> new IllegalArgumentException("User not found")); JobAdvertisement jobAdvertisement = new JobAdvertisement( recruiter, @@ -47,5 +46,6 @@ @Override public JobAdDetailsDTO editJobAdvertisement(Long id, JobAdvertisementDTO jobAdvertisementDTO) { - JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Job Advertisement not found")); + JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("Job Advertisement not found")); jobAdvertisement.setTitle(jobAdvertisementDTO.getTitle()); jobAdvertisement.setDescription(jobAdvertisementDTO.getDescription()); Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobSeekerServiceImpl.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobSeekerServiceImpl.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JobSeekerServiceImpl.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,101 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.impl; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerEditDetailsDTO; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.JobSeeker; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.mappers.JobSeekerMapper; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.JobSeekerRepository; +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobSeekerService; +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 +@RequiredArgsConstructor +public class JobSeekerServiceImpl implements JobSeekerService { + + private final JobSeekerRepository jobSeekerRepository; + private final Path profilePicStorageLocation; + + @Autowired + JobSeekerServiceImpl(@Value("./uploads") String uploadDir, JobSeekerRepository jobSeekerRepository) { + this.jobSeekerRepository = jobSeekerRepository; + + this.profilePicStorageLocation = Paths.get(uploadDir + "/job-seekers").toAbsolutePath().normalize(); + try { + Files.createDirectories(this.profilePicStorageLocation); + } catch (IOException ex) { + throw new RuntimeException("Could not create the directory where the uploaded files will be stored.", ex); + } + } + + @Override + public JobSeekerEditDetailsDTO editJobSeekerDetailsById(Long jobSeekerId, JobSeekerEditDetailsDTO jobSeekerEditDetailsDTO) { + JobSeeker jobSeeker = jobSeekerRepository.findById(jobSeekerId).orElse(null); + jobSeeker.setEmail(jobSeekerEditDetailsDTO.getEmail()); + jobSeeker.setFirstName(jobSeekerEditDetailsDTO.getFirstName()); + jobSeeker.setLastName(jobSeekerEditDetailsDTO.getLastName()); + jobSeeker.setPhoneNumber(jobSeekerEditDetailsDTO.getPhoneNumber()); + jobSeekerRepository.save(jobSeeker); + return JobSeekerMapper.mapToJobSeekerEditDetailsDTO(jobSeeker); + } + + @Override + public JobSeekerEditDetailsDTO getJobSeekerEditDetailsById(Long jobSeekerId) { + JobSeeker jobSeeker = jobSeekerRepository.findById(jobSeekerId).orElse(null); + return JobSeekerMapper.mapToJobSeekerEditDetailsDTO(jobSeeker); + } + + @Override + public void submitProfilePic(Long jobSeekerId, MultipartFile profilePicFile) { + Path jobSeekerProfilePicDir = this.profilePicStorageLocation.resolve(String.valueOf(jobSeekerId)).resolve("profile-pics"); + + try { + Files.createDirectories(jobSeekerProfilePicDir); + String originalFileName = profilePicFile.getOriginalFilename(); + + if(originalFileName != null) { + Path targetLocation = jobSeekerProfilePicDir.resolve(originalFileName); + Files.copy(profilePicFile.getInputStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING); + + JobSeeker jobSeeker = jobSeekerRepository.findById(jobSeekerId).orElse(null); + String relativePath = Paths.get("uploads", "job-seekers", String.valueOf(jobSeekerId), "profile-pics", originalFileName).toString(); + + jobSeeker.setProfilePicFilePath(relativePath); + jobSeekerRepository.save(jobSeeker); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + public Resource loadProfilePicAsResource(Long jobSeekerId) { + JobSeeker jobSeeker = jobSeekerRepository.findById(jobSeekerId) + .orElseThrow(() -> new RuntimeException("Job Seeker not found")); + + try { + String relativeProfilePicPath = jobSeeker.getProfilePicFilePath(); + Path profilePicPath = profilePicStorageLocation.getParent().getParent().resolve(relativeProfilePicPath); + Resource resource = new UrlResource(profilePicPath.toUri()); + if(resource.exists()) { + return resource; + } else { + throw new RuntimeException("Could not find profile pic at " + profilePicPath); + } + } catch (IOException ex) { + throw new RuntimeException(ex); + } + + + } +} 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 befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/RecruiterServiceImpl.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -32,5 +32,5 @@ this.recruiterRepository = recruiterRepository; - this.logoStorageLocation = Paths.get(uploadDir + "/logo").toAbsolutePath().normalize(); + this.logoStorageLocation = Paths.get(uploadDir + "/recruiters").toAbsolutePath().normalize(); try { Files.createDirectories(this.logoStorageLocation); @@ -70,5 +70,5 @@ public void submitLogo(Long recruiterId, MultipartFile logoFile) { - Path recruiterLogoDir = this.logoStorageLocation.resolve(String.valueOf(recruiterId)); + Path recruiterLogoDir = this.logoStorageLocation.resolve(String.valueOf(recruiterId)).resolve("logos"); try { Files.createDirectories(recruiterLogoDir); @@ -82,5 +82,5 @@ Recruiter recruiter = recruiterRepository.findById(recruiterId) .orElseThrow(() -> new RuntimeException("Recruiter not found")); - String relativePath = Paths.get("uploads", "logo", String.valueOf(recruiterId), originalFilename).toString(); + String relativePath = Paths.get("uploads","recruiters", String.valueOf(recruiterId), "logos", originalFilename).toString(); recruiter.setLogoFilePath(relativePath); recruiterRepository.save(recruiter); Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/ApplicationService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/ApplicationService.java (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/ApplicationService.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -14,5 +14,5 @@ List findAllByJobAdvertisementId(Long jobId); List findAllByJobSeekerId(Long jobSeekerId); - Resource loadResumeAsResource(String fileName); + Resource loadResumeAsResource(Long applicationId); ApplicationStatusDTO updateApplicationStatus(Long id, String status); } Index: jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobSeekerService.java =================================================================== --- jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobSeekerService.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JobSeekerService.java (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,15 @@ +package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef; + +import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.JobSeekerEditDetailsDTO; +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 JobSeekerService { + + JobSeekerEditDetailsDTO editJobSeekerDetailsById(Long jobSeekerId, JobSeekerEditDetailsDTO jobSeekerEditDetailsDTO); + JobSeekerEditDetailsDTO getJobSeekerEditDetailsById(Long jobSeekerId); + + void submitProfilePic(Long jobSeekerId, MultipartFile logoFile); + Resource loadProfilePicAsResource(Long jobSeekerId); +} Index: jobvista-frontend/src/App.css =================================================================== --- jobvista-frontend/src/App.css (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/App.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -14,5 +14,5 @@ .App { /*background-color: rgb(243, 242, 241);*/ - background-color: #F5F5F5; + background-color: #E6E6E6; /*background-color: #F4F2EE;*/ /*background-color: #0F0F0F;*/ @@ -84,5 +84,5 @@ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); transform: translate(0, 0); - height: 260px; + height: 270px; width: 100%; color: grey; @@ -101,5 +101,4 @@ .custom-card { - //border: 1px solid lightgray; border-radius: 8px; background-color: white; @@ -107,6 +106,24 @@ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); transform: translate(0, 0); + height: 360px; +} + +.hub-card { + height: 270px !important; +} + +.custom-card .card-foot { + position: absolute; + display: flex; + justify-content: center; + gap: 8px; + text-align: center; height: auto; -} + width: 100%; + bottom: 20px; +} + + + .custom-card:hover { @@ -118,4 +135,5 @@ padding: 25px; padding-bottom: 0 !important; + height: 20%; } @@ -147,7 +165,7 @@ .custom-card .card-body { - padding: 25px; - padding-top: 15px !important; - height: 100%; + padding: 0 25px; + padding-top: 5px !important; + height: 50%; } .custom-card .card-body span{ @@ -175,17 +193,5 @@ } -.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; -} + Index: jobvista-frontend/src/auth/RoutesConfig.js =================================================================== --- jobvista-frontend/src/auth/RoutesConfig.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/auth/RoutesConfig.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -4,5 +4,5 @@ import {SignUpRecruiterForm} from "../views/auth/SignUpRecruiterForm"; import {SignUpJobSeekerForm} from "../views/auth/SignUpJobSeekerForm"; -import {Workspace} from "../views/job_advertisements/RecruiterWorkspace"; +import {Workspace} from "../views/job_advertisements/JobManagementHub"; import {JobAdDetails} from "../views/job_advertisements/JobAdDetails"; import {ApplicationsByJobAd} from "../views/applications/ApplicationsByJobAd"; @@ -10,12 +10,13 @@ import {AdminPanel} from "../views/admin_panel/AdminPanel"; -import {RecruiterProfile} from "../views/recruiters/RecruiterProfile"; +import {RecruiterProfile} from "../views/profiles/RecruiterProfile"; import {AboutUs} from "../views/static/AboutUs"; -import {JobSeekerEditProfile} from "../views/edit_profile/JobSeekerEditProfile"; -import {RecruiterEditProfile} from "../views/edit_profile/RecruiterEditProfile"; +import {JobSeekerEditProfile} from "../views/profiles/JobSeekerEditProfile"; +import {RecruiterEditProfile} from "../views/profiles/RecruiterEditProfile"; import Roles from "../enumerations/Roles"; import {useSelector} from "react-redux"; import {useEffect, useState} from "react"; import {ErrorPage} from "../views/static/ErrorPage"; +import {NoAccess} from "../views/static/NoAccess"; export const PrivateRoutes = [ @@ -158,4 +159,14 @@ Roles.JOBSEEKER, Roles.ADMIN + ] + }, + { + component: NoAccess, + path: '/no-access', + title: 'No Access', + exact: true, + permission: [ + Roles.GUEST, + Roles.RECRUITER, ] }, Index: jobvista-frontend/src/redux/actions/JobSeekerActions.js =================================================================== --- jobvista-frontend/src/redux/actions/JobSeekerActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/redux/actions/JobSeekerActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,67 @@ +import axios from "../../axios/axiosInstance"; +import {SET_PROFILE_PIC_URL} from "../actionTypes"; + +export const JobSeekerActions = { + + submitProfilePic: (formData, callback) => { + let jobSeekerId = formData.get("jobSeekerId"); + let profilePicFile = formData.get("profilePicFile") + return dispatch => { + axios.post("/job-seeker/submit-profile-pic", formData, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }) + .then(response => { + const blob = new Blob([profilePicFile]) + const profilePicUrl = window.URL.createObjectURL(blob); + dispatch({ + type: SET_PROFILE_PIC_URL, + payload: {jobSeekerId, profilePicUrl} + }) + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + }, + + downloadProfilePic: (jobSeekerId, callback) => { + return dispatch => { + return axios.get("/job-seeker/" + jobSeekerId + "/download-profile-pic", {responseType: "blob"}) + .then(response => { + const blob = new Blob([response.data]) + const profilePicUrl = window.URL.createObjectURL(blob); + dispatch({ + type: SET_PROFILE_PIC_URL, + payload: {jobSeekerId, profilePicUrl} + }); + callback(true, profilePicUrl) + }).catch(error => { + callback(false, error) + }) + } + }, + + fetchJobSeekerEditDetailsById: (id, callback) => { + return dispatch => { + return axios.get("/job-seeker/"+id+"/edit-info") + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + }, + + editJobSeekerDetailsById: (data, id, callback) => { + return dispatch => { + return axios.post("/job-seeker/"+id+"/edit-info", data) + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + } +} Index: jobvista-frontend/src/redux/actions/applicationActions.js =================================================================== --- jobvista-frontend/src/redux/actions/applicationActions.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/redux/actions/applicationActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -10,5 +10,5 @@ submitApplication: (application, callback) => { return dispatch => { - axios.post("/job-advertisements/apply", application, { + axios.post("/applications/submit", application, { headers: { 'Content-Type': 'multipart/form-data' @@ -26,38 +26,36 @@ }) } - }, updateApplicationStatus: (id, status, callback) => { console.log(status) - return dispatch => { - // TO DO: REFACTOR - axios.post("/applications/" + id + "/update", { - id: id, - status: status - }) - .then(response => { - dispatch({ - type: UPDATE_APPLICATION_STATUS, - application: response.data, - }) - callback(true, response) - }).catch(error => { - callback(false, error) - }) - } + return dispatch => { + axios.post("/applications/" + id + "/update", { + id: id, + status: status + }) + .then(response => { + dispatch({ + type: UPDATE_APPLICATION_STATUS, + application: response.data, + }) + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } }, fetchApplicationsByJobSeeker: (jobSeekerId, callback) => { - return dispatch => { - axios.get("/my-applications/" + jobSeekerId) - .then(response => { - dispatch({ - type: FETCH_APPLICATIONS_BY_JOB_SEEKER_ID, - applicationsByJobSeeker: response.data - }) - callback(true, response) - }).catch(error => { - callback(false, error) - }) - } + return dispatch => { + axios.get("/my-applications/" + jobSeekerId) + .then(response => { + dispatch({ + type: FETCH_APPLICATIONS_BY_JOB_SEEKER_ID, + applicationsByJobSeeker: response.data + }) + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } }, @@ -77,17 +75,15 @@ } }, - downloadResume: (fileName, callback) => { - return dispatch => { - return axios.get("/resume/" + fileName, {responseType: "blob"}) - .then(response => { - const blob = new Blob([response.data], { type: 'application/pdf' }); - const url = window.URL.createObjectURL(blob); - callback(true, url); - }) + downloadResume: (id, callback) => { + return axios.get("/applications/" + id + "/download-resume", {responseType: "blob"}) + .then(response => { + const blob = new Blob([response.data], {type: 'application/pdf'}); + const url = window.URL.createObjectURL(blob); + callback(true, url); + }) + .catch(error => { + callback(false, error) + }) - .catch(error => { - callback(false, error) - }) - } } } Index: jobvista-frontend/src/redux/actions/jobAdvertisementActions.js =================================================================== --- jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/redux/actions/jobAdvertisementActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -10,9 +10,5 @@ addJobAdvertisement: (jobAdvertisement, callback) => { return dispatch => { - axios.post("/job-advertisements/add", jobAdvertisement, { - headers: { - 'Content-Type': 'application/json' - }, - }) + axios.post("/job-advertisements/add", jobAdvertisement) .then(response => { dispatch({ @@ -20,7 +16,8 @@ jobAdvertisement: response.data }) - callback(true, response) + callback(true) }).catch((error) => { - callback(false, error) + console.error(error) + callback(false) }) } @@ -34,7 +31,8 @@ jobAdvertisement: response.data }) - callback(true, response) + callback(true) }).catch((error) => { - callback(false, error) + console.error(error) + callback(false) }) } @@ -50,5 +48,6 @@ callback(true) }).catch(error => { - callback(false, error) + console.error(error) + callback(false) }) @@ -83,5 +82,6 @@ callback(true, response) }).catch((error) => { - callback(false, error) }) + callback(false, error) + }) }, @@ -96,4 +96,16 @@ jobAdvertisementsByRecruiter: response.data, }) + callback(true, response) + }).catch((error) => { + callback(false, error) + }) + } + }, + + fetchJobAdvertisementsByRecruiterProfile: (recruiterId, callback) => { + return dispatch => { + let currentUser = JSON.parse(localStorage.getItem(CURRENT_USER)); + axios.get("/job-advertisements/recruiter/" + recruiterId) + .then(response => { callback(true, response) }).catch((error) => { @@ -116,5 +128,5 @@ fetchRecruiterDetailsById: (id, callback) => { - axios.get("/recruiter/"+id+"/info") + axios.get("/recruiter/" + id + "/info") .then(response => { callback(true, response) Index: jobvista-frontend/src/redux/actions/recruiterActions.js =================================================================== --- jobvista-frontend/src/redux/actions/recruiterActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/redux/actions/recruiterActions.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,66 @@ + +import axios from "../../axios/axiosInstance"; +import {SET_LOGO_URL} from "../actionTypes"; +export const RecruiterActions = { + submitLogo: (formData, callback) => { + let recruiterId = formData.get("recruiterId"); + let logoFile = formData.get("logoFile") + return dispatch => { + axios.post("/recruiter/submit-logo", formData, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }) + .then(response => { + const blob = new Blob([logoFile]) + const logoUrl = window.URL.createObjectURL(blob); + dispatch({ + type: SET_LOGO_URL, + payload: { recruiterId, logoUrl } + }); + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + }, + + downloadLogo: (recruiterId, callback) => { + return dispatch => { + return axios.get("/recruiter/" + recruiterId + "/download-logo", {responseType: "blob"}) + .then(response => { + const blob = new Blob([response.data]) + const logoUrl = window.URL.createObjectURL(blob); + dispatch({ + type: SET_LOGO_URL, + payload: { recruiterId, logoUrl } + }); + callback(true, logoUrl); + }).catch(error => { + callback(false, error) + }) + } + }, + + fetchRecruiterEditDetailsById: (id, callback) => { + return dispatch => { + return axios.get("/recruiter/"+id+"/edit-info") + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + }, + + editRecruiterDetailsById: (data, id, callback) => { + return dispatch => { + return axios.post("/recruiter/"+id+"/edit-info", data) + .then(response => { + callback(true, response) + }).catch(error => { + callback(false, error) + }) + } + } +} Index: jobvista-frontend/src/redux/reducers/imagesReducer.js =================================================================== --- jobvista-frontend/src/redux/reducers/imagesReducer.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/redux/reducers/imagesReducer.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,32 @@ +import {SET_LOGO_URL, SET_PROFILE_PIC_URL} from "../actionTypes"; + +const initialState = { + profilePictures: {}, + logos: {} +} + +const ImagesReducer = (state = initialState, action) => { + + switch (action.type) { + case SET_PROFILE_PIC_URL: + return{ + ...state, + profilePictures: { + ...state.profilePictures, [action.payload.jobSeekerId]: action.payload.profilePicUrl + } + } + case SET_LOGO_URL: + return { + ...state, + logos: { + ...state.logos, [action.payload.recruiterId]: action.payload.logoUrl + } + } + default: + return { + ...state, + }; + } +} + +export default ImagesReducer Index: jobvista-frontend/src/utils/toastUtils.js =================================================================== --- jobvista-frontend/src/utils/toastUtils.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/utils/toastUtils.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,173 @@ +import { toast } from 'react-toastify'; +import 'react-toastify/dist/ReactToastify.css'; + + +export const notifyProfileEdit = () => { + toast.success( + + Your details were successfully updated! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyProfilePicChange = () => { + toast.success( + + Your profile picture was successfully changed! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyLogoChange = () => { + toast.success( + + Your logo was successfully changed! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyJobAdEdit = () => { + toast.success( + + Job advertisement updated successfully! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyJobAdPost = () => { + toast.success( + + Job advertisement posted successfully! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyJobAdDelete = () => { + toast.success( + + Job advertisement deleted successfully! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyAppStatusUpdate = () => { + toast.success( + + Status updated successfully! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyJobAdApply = () => { + toast.success( + + Your application was successfully sent! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyAccessUpdate = (companyName) => { + toast.success( + + {companyName}'s access was successfully changed! + , { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + }); +} + +export const notifyIncorrectEmailOrPassword = () => { + toast.error( + Incorrect email or password. Please try again., + { + position: "bottom-right", + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: false, + draggable: true, + progress: undefined, + theme: "dark", + pauseOnFocusLoss: false + } + ); +} Index: jobvista-frontend/src/utils/utils.js =================================================================== --- jobvista-frontend/src/utils/utils.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/utils/utils.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -7,10 +7,4 @@ } -export const sortElementsBySubmissionDate = (array) => { - return array.slice().sort((a, b) => { - return new Date(b).getTime() - new Date(a.postedOn).getTime() - }); -} - export const formatRelativeTime = (dateString) => { const date = new Date(dateString); @@ -18,5 +12,4 @@ const diffTime = now - date; - // Define time intervals in milliseconds const minute = 60 * 1000; const hour = minute * 60; @@ -25,5 +18,4 @@ const month = day * 30; - // Calculate the relative time if (diffTime < minute) { return 'just now'; Index: jobvista-frontend/src/views/admin_panel/AdminPanel.css =================================================================== --- jobvista-frontend/src/views/admin_panel/AdminPanel.css (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/views/admin_panel/AdminPanel.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -3,4 +3,11 @@ } +.table tbody tr:nth-child(even) { + background-color: #fff; /* Light gray */ +} + +.table tbody tr:nth-child(odd) { + background-color: #f2f2f2; /* White */ +} /* The switch - the box around the slider */ .switch { Index: jobvista-frontend/src/views/admin_panel/AdminPanel.js =================================================================== --- jobvista-frontend/src/views/admin_panel/AdminPanel.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/views/admin_panel/AdminPanel.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -54,5 +54,5 @@ return (
- +
Index: jobvista-frontend/src/views/applications/ApplicationDetailsModal.js =================================================================== --- jobvista-frontend/src/views/applications/ApplicationDetailsModal.js (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/views/applications/ApplicationDetailsModal.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -32,16 +32,24 @@ useEffect(() => { - if(application) { - dispatch(ApplicationActions.downloadResume(application.fileName, (success, response) => { - if(success) { + if (application) { + ApplicationActions.downloadResume(application.id, (success, response) => { + if (success) { setResumeUrl(response); } - })) + }) } - }, [application]) + }, []) + + function getFileName(path) { + let fileName = path.split('\\').pop().split('/').pop(); + + fileName = fileName.trim(); + + return fileName; + } return (
- +

{application.jobSeekerName}'s application for {application.jobAdTitle}

@@ -49,18 +57,20 @@
-
+
- + +
+ +
+
+
+ +
+ +
+ )} + {/*
*/} +
+ + + ) +} Index: jobvista-frontend/src/views/profiles/RecruiterProfile.js =================================================================== --- jobvista-frontend/src/views/profiles/RecruiterProfile.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/profiles/RecruiterProfile.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,193 @@ +import "../job_advertisements/JobAdvertisements.css" +import {useDispatch, useSelector} from "react-redux"; +import {useEffect, useState} from "react"; +import {JobAdvertisementActions} from "../../redux/actions/jobAdvertisementActions"; +import {formatRelativeTime, sortElementsBy} from "../../utils/utils"; +import {Link} from "react-router-dom"; +import JobType from "../../enumerations/JobType"; +import {RecruiterActions} from "../../redux/actions/recruiterActions"; + +import {useParams} from "react-router"; + + +export const RecruiterProfile = () => { + + const dispatch = useDispatch(); + const {id} = useParams(); + const auth = useSelector(state => (state.auth.currentUser)) + + const [jobAdvertisementsByRecruiter, setJobAdvertisementsByRecruiter] = useState([]); + const [recruiterDetails, setRecruiterDetails] = useState(null); + + let logosState = useSelector(state => state.images.logos) + const [logoDispatched, setLogoDispatched] = useState(false) + const [logoView, setLogoView] = useState(null); + + const [activeJobListingsCount, setActiveJobListingsCount] = useState(0); + + + useEffect(() => { + + JobAdvertisementActions.fetchRecruiterDetailsById(id, (success, response) => { + if (success) { + setRecruiterDetails(response.data) + } + }) + + }, []); + + useEffect(() => { + if (id) { + if (!logoDispatched && !logosState[id]) { + dispatch(RecruiterActions.downloadLogo(id, (success, response) => { + if (success) { + setLogoView(response) + setLogoDispatched(true) + } + })) + } else { + setLogoView(logosState[id]) + } + } + + }, [auth]) + + useEffect(() => { + + dispatch(JobAdvertisementActions.fetchJobAdvertisementsByRecruiterProfile(id, (success, response) => { + if (success && response.data.length > 0) { + setJobAdvertisementsByRecruiter(sortElementsBy(response.data, "postedOn")) + setActiveJobListingsCount(countActiveJobListings(response.data)); + } + })) + }, []) + + + function countActiveJobListings(jobAds) { + if (jobAds.length > 0) { + const activeJobListings = jobAds.filter(job => job.active) + return activeJobListings.length; + } + return 0; + } + + + return (
+
+
+
+ Company Banner + + +
+ +
+

{recruiterDetails && recruiterDetails.companyName}

+

Active job listings: {activeJobListingsCount}

+
+
+ + {recruiterDetails && + <> +
+

About the company

+

{recruiterDetails.companyDescription ? + recruiterDetails.companyDescription : "There is no info about this company yet." + }

+

+ {recruiterDetails.contactEmail} • + {recruiterDetails.contactPhoneNumber} + {recruiterDetails.receptionist && • {recruiterDetails.receptionist}} +

+
+ + } + + {/*
*/} + + {/*
*/} + {/*
*/} + {/*
*/} + {/*
*/} + {/* */} + {/* setSearchTerm(event.target.value)}*/} + {/* />*/} + {/*
*/} + {/*
*/} + {/* setSelectedIndustry(option.value)}*/} + {/* options={industryOptionsFilter}*/} + {/* className="sort-range sort"*/} + {/* />*/} + {/*
*/} + {/*
*/} + {/* setSelectedSortOrder(option.value)}*/} + {/* options={sortOptions}*/} + {/* className="sort-range sort"*/} + {/* />*/} + {/*
*/} + {/* */} + {/*
*/} + {/*
*/} + {/*
*/} +
+ + {jobAdvertisementsByRecruiter && jobAdvertisementsByRecruiter.map((jobAd, index) => ( +
+
+
+ ${jobAd.startingSalary}/hr + {jobAd.jobType === JobType.JOB ? "Job" : "Internship"} + {!jobAd.active && Expired} +
+
+
{jobAd.title}
+ {jobAd.industry} • {formatRelativeTime(jobAd.postedOn)} +
+ Company: {jobAd.recruiterName}
+
+ +
+
+ Read + more +
+
+
))} + +
+ + +
+
+ + ) +} Index: jobvista-frontend/src/views/shared_css/Modal.css =================================================================== --- jobvista-frontend/src/views/shared_css/Modal.css (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/views/shared_css/Modal.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -89,4 +89,5 @@ .application-textarea { height: 100px; + /*margin-bottom: 20px;*/ } Index: jobvista-frontend/src/views/shared_css/Random.css =================================================================== --- jobvista-frontend/src/views/shared_css/Random.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/shared_css/Random.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,65 @@ +.blue-submit-button { + font-size: 1rem; + padding: 5px 17px; + border-radius: 8px; + background-color: #06367a; + border: none; + color: white; + font-weight: 500; + transition: background-color 0.3s ease; +} + +.blue-submit-button:hover { + background-color: #2e579b; +} + +/*FILTER CONTAINER*/ + +.filter-container { + height: 10%; + width: 100%; + background-color: #fff; + border-radius: 12px; + padding: 15px 20px; + margin-bottom: 20px; + margin-top: 30px; + height: auto; +} + +.filter-container .filter-box { + display: inline-flex; + justify-content: center; + gap: 10px; +} + + +.filter-container .search-container { + position: relative; + /*float: left;*/ + display: inline-block; +} +.filter-container .search-container .search-input { + width: 400px; + display: inline; + padding: 5px 30px; + border-radius: 10px; + border: 1px solid lightgrey; + /*margin-right: 15px;*/ +} + +.filter-container .search-container .search-input:focus { + outline-color: #2684ff; +} + +.filter-container .search-container i { + left: 10px; + position: absolute; + top: 10px; +} + +.filter-container .item { + width: 20%; + display: inline-block; + /*margin-left: 10px;*/ + /*float: left !important;*/ +} Index: jobvista-frontend/src/views/static/AboutUs.css =================================================================== --- jobvista-frontend/src/views/static/AboutUs.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/static/AboutUs.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,47 @@ +.about-wrap { + margin-top: 30px; +} + +.floating-wrap h3 { + font-family: Segoe UI; + text-align: center; +} +.floating-wrap h4 { + text-align: center; +} + +.floating-wrap h2 { + font-family: Cairo; + font-weight: bold; +} +.floating-wrap p { + font-family: Ubuntu +} +.floating-wrap { + background-color:white; + padding: 15px 20px; + border-radius: 15px; + margin-bottom: 20px; +} + +.floating-inside-wrap { + background-color: rgb(243, 242, 241); + padding: 15px 20px; + border-radius: 15px; + margin: 10px; +} + +.about-us-img { + margin-bottom: 20px; + border-radius: 15px; + width: 100%; + padding: 0; +} + +.start-title { + font-weight: bold; + font-size: 20px; + font-family: Segoe UI; + text-transform: uppercase; + +} Index: jobvista-frontend/src/views/static/AboutUs.js =================================================================== --- jobvista-frontend/src/views/static/AboutUs.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/static/AboutUs.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,92 @@ +import "./AboutUs.css" +export const AboutUs = () => { + + return ( +
+
+
+
+
+

Your Future, Our Mission

+

+ At Job Vista, we believe that finding the right job should be simple, efficient, and rewarding. Our mission is to connect talented individuals with their dream careers while helping companies discover the best candidates to join their teams. +

+ + +
+
+

How It Started

+

+ Founded in 2024, Job Vista was born out of a passion for transforming the job search experience. The idea for Job Vista originated as a university project, where a group of us noticed that the job market was becoming increasingly complex, with both job seekers and employers facing numerous challenges in finding the perfect match. Inspired by the potential to make a real difference, we decided to turn our project into a full-fledged platform. Our goal was to create an app that simplifies this process, making it easier for everyone involved. +

+ +

What We Offer

+ +

Job Seekers + can browse through thousands of job opportunities from various industries, all in one place. Enjoy an easy application process where you can apply for jobs with just a few clicks and track your applications seamlessly. Receive personalized job alerts about openings that match your skills and interests. Additionally, access a wealth of career resources, including articles, tips, and tools to help you prepare for interviews, improve your resume, and advance your career.

+

+ Recruiters + can post job openings and manage applications with our user-friendly interface, ensuring efficient recruitment. Find the best talent using our advanced search and filtering tools to discover candidates that fit your requirements. Enhance your brand visibility by showcasing your company and attracting top talent with a detailed company profile. +

+ + {/*

*/} + {/* Our Vision*/} + {/*

*/} + {/*

*/} + {/* We envision a world where job seekers and employers can effortlessly connect, leading to fulfilling careers and successful businesses. By leveraging technology and innovation, Job Vista aims to be the go-to platform for job hunting and recruitment.*/} + {/*

*/} +
+
+
+ + +
+ +
+
+
+ {/*

*/} + {/* Join Us*/} + {/*

*/} + + {/*

*/} + {/* Whether you're looking for your next job opportunity or searching for the perfect candidate, Job Vista is here to support you every step of the way. Join our community today and take the next step towards a brighter future.*/} + {/*

*/} +
+
+
+

120

+

Total Recruiters

+
+
+
+
+

2400+

+

Total Job Seekers

+
+
+
+
+
+
+

240

+

Total Job Listings

+
+
+
+
+

4000+

+

Total Applications

+
+
+
+
+
+
+ +
+
+ +
+ ) +} Index: jobvista-frontend/src/views/static/Header.css =================================================================== --- jobvista-frontend/src/views/static/Header.css (revision befb98800bd9171fa5ce8a5f29287e549f0ff5aa) +++ jobvista-frontend/src/views/static/Header.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -19,5 +19,5 @@ .navbar { - width: calc(100% - 17px); + width: 100%; height: 80px; background-color: #f8f9fa; Index: jobvista-frontend/src/views/static/Loading.css =================================================================== --- jobvista-frontend/src/views/static/Loading.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/static/Loading.css (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,34 @@ + +.loading-container { + display: flex; + height: 100vh; + justify-content: center; + align-items: center; + gap: 10px; + background-color: #f8f9fa; +} + +.loading-logo { + width: 85px; + height: 85px; + display: inline-block; + background: url("../../../public/images/logo.png") no-repeat center center; + background-size: contain; + +} + +.loading-brand-name { + width: 275px; + height: 175px; + display: inline-block; + background: url("../../../public/images/brand-name-2.png") no-repeat center center; + background-size: contain; +} + +.loading-signature { + width: 275px; + height: 175px; + display: inline-block; + background: url("../../../public/images/signature.png") no-repeat center center; + background-size: contain; +} Index: jobvista-frontend/src/views/static/Loading.js =================================================================== --- jobvista-frontend/src/views/static/Loading.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) +++ jobvista-frontend/src/views/static/Loading.js (revision 08f82ec612b1b125feec3dcd5c8c0f1062f09e18) @@ -0,0 +1,12 @@ +import "./Loading.css" + +export const Loading = () => { + return ( +
+
+
+ + {/*
*/} +
+ ) +}