refactor

goto-eof · May 10, 2023 · 31c51cc · 31c51cc
1 parent 58236c6
commit 31c51cc
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 39 deletions.
diff --git a/src/Main.tsx b/src/Main.tsx
@@ -24,7 +24,7 @@ import {
 } from '@chakra-ui/icons';
 import { Route, Routes, useNavigate } from 'react-router-dom';
 import Home from './components/Home';
-import InsertJob from './components/job/InsertUpdateJob';
+import InsertUpdateJob from './components/job/InsertUpdateJob';
 import Register from './components/user/Register';
 import Login from './components/user/Login';
 import JobOffersRequests from './components/job/JobsList';
@@ -285,18 +285,24 @@ export default function Main() {
  />
  }
  />
- <Route path="/insertJob/:scope" element={<InsertJob />} />
- <Route path="/editJob/:scope/:id" element={<InsertJob />} />
+ <Route path="/insertJob/:scope" element={<InsertUpdateJob />} />
+ <Route
+ path="/editJob/:scope/jobId/:id"
+ element={<InsertUpdateJob />}
+ />
  <Route path="/register" element={<Register />} />
  <Route path="/rooms" element={<Conversations />} />
  <Route
  path="/room/:roomId/username/:username"
  element={<SendMessage />}
  />
  <Route path="/authenticate" element={<Login />} />
- <Route path="/view/:scope/:id" element={<ViewOfferRequest />} />
  <Route
- path="/view/:scope/:status/:id"
+ path="/view/:scope/jobId/:id"
+ element={<ViewOfferRequest />}
+ />
+ <Route
+ path="/view/:scope/status/:status/jobId/:id"
  element={<ViewOfferRequest />}
  />
 

diff --git a/src/components/job/InsertUpdateJob.tsx b/src/components/job/InsertUpdateJob.tsx
@@ -23,7 +23,7 @@ import JobPicture from '../../dto/JobPicture';
 import JobService from '../../service/JobService';
 import { error } from 'console';
 
-export default function InserJob() {
+export default function InserUpdateJob() {
  const [form, setForm] = useState<Job>({
  title: '',
  description: '',
@@ -41,7 +41,7 @@ export default function InserJob() {
 
  useEffect(() => {
  if (id) {
- GenericService.get<Job>(`api/v1/job/${scopeFromUri}/${id}`).then(
+ GenericService.get<Job>(`api/v1/job/${scopeFromUri}/jobId/${id}`).then(
  (job) => {
  setJob(job);
  setForm({
@@ -99,7 +99,11 @@ export default function InserJob() {
  }
  );
  } else {
- GenericService.put<Job>(`api/v1/job/${scopeFromUri}`, form.id, data).then(
+ GenericService.put<Job>(
+ `api/v1/job/${scopeFromUri}/jobId`,
+ form.id,
+ data
+ ).then(
  () => {
  if (form.type == JobConst.TYPE_OFFER) {
  navigate('/myOffers');

diff --git a/src/components/job/JobsList.tsx b/src/components/job/JobsList.tsx
@@ -42,8 +42,8 @@ export default function JobOffersRequests({
 }: Props) {
  const BASE_URL_RETRIEVE_ITEMS: string =
  status !== undefined
- ? `api/v1/job/${scope}/admin/${type}/${status}`
- : `api/v1/job/${scope}/${type}`;
+ ? `api/v1/job/${scope}/admin/jobType/${type}`
+ : `api/v1/job/${scope}/jobType/${type}`;
 
  const [offers, setOffers] = useState<Array<Job>>(new Array<Job>());
  const [itemsCount, setItemsCount] = useState(0);
@@ -55,13 +55,13 @@ export default function JobOffersRequests({
  };
 
  useEffect(() => {
- GenericService.getAll<JobListPage>(`${BASE_URL_RETRIEVE_ITEMS}/0`).then(
- (jobListPageResponse) => {
-  setOffers(jobListPageResponse.jobList);
-  setItemsCount(jobListPageResponse.totalItems);
-  setLoaded(true);
- }
- );
+ GenericService.getAll<JobListPage>(
+ `${BASE_URL_RETRIEVE_ITEMS}/page/0`
+ ).then((jobListPageResponse) => {
+ setOffers(jobListPageResponse.jobList);
+ setItemsCount(jobListPageResponse.totalItems);
+ setLoaded(true);
+ });
  }, []);
 
  const goToPage = (page: number) => {
@@ -114,8 +114,8 @@ function JobComponent({ job, scope, status, removeElementFromList }: JobProps) {
  window.scrollTo(0, 0);
  navigate(
  status !== undefined
- ? `/view/${scope}/${status}/${id}`
- : `/view/${scope}/${id}`
+ ? `/view/${scope}/${status}/jobId/${id}`
+ : `/view/${scope}/jobId/${id}`
  );
  };
 
@@ -237,16 +237,18 @@ function JobComponent({ job, scope, status, removeElementFromList }: JobProps) {
  >
  {JobService.calulateAcceptButtonLabel(job)}
  </Button>
- {UserService.isAdmin() && JobService.isCreated(job.status) && (
- <Button
- mr={3}
- variant="solid"
- colorScheme="blue"
- onClick={() => approve(job)}
- >
- Approve
- </Button>
- )}
+ {UserService.isAdmin() &&
+ (JobService.isCreated(job.status) ||
+ JobService.isUpdated(job.status)) && (
+ <Button
+ mr={3}
+ variant="solid"
+ colorScheme="blue"
+ onClick={() => approve(job)}
+ >
+ Approve
+ </Button>
+ )}
  </Box>
  </Box>
  </Flex>

diff --git a/src/components/job/ViewJob.tsx b/src/components/job/ViewJob.tsx
@@ -44,8 +44,8 @@ export default function ViewOfferRequest({}: Props) {
  useEffect(() => {
  GenericService.get<Job>(
  status !== undefined
- ? `api/v1/job/${scopeFromUrl}/admin/${status}/${id}`
- : `api/v1/job/${scopeFromUrl}/${id}`
+ ? `api/v1/job/${scopeFromUrl}/admin/jobStatus/${status}/jobId/${id}`
+ : `api/v1/job/${scopeFromUrl}/jobId/${id}`
  ).then((job) => {
  setJob(job);
  });
@@ -65,19 +65,21 @@ export default function ViewOfferRequest({}: Props) {
 
  const goToEditOfferRequest = (job: Job | undefined) => {
  if (job) {
- navigate(`/editJob/${scopeFromUrl}/${job.id}`);
+ navigate(`/editJob/${scopeFromUrl}/jobId/${job.id}`);
  }
  };
 
  const deleteItem = (job: Job | undefined) => {
  if (job && job.id) {
- GenericService.delete(`api/v1/job/${scopeFromUrl}`, job.id).then((_) => {
- if (job && job.type === JobConst.TYPE_OFFER) {
- navigate('/myOffers');
- } else if (job && job.type === JobConst.TYPE_REQUEST) {
- navigate('/myRequests');
+ GenericService.delete(`api/v1/job/${scopeFromUrl}/jobId`, job.id).then(
+ (_) => {
+ if (job && job.type === JobConst.TYPE_OFFER) {
+ navigate('/myOffers');
+ } else if (job && job.type === JobConst.TYPE_REQUEST) {
+ navigate('/myRequests');
+ }
  }
- });
+ );
  }
  };
 

diff --git a/src/components/message/SendMessage.tsx b/src/components/message/SendMessage.tsx
@@ -88,7 +88,6 @@ export default function SendMessage() {
  <Box key={message.id}>
  <Box>{message.message}</Box>
  <Box fontSize={'0.6em'}>{message.usernameFrom}</Box>
- {/* <Box fontSize={'0.5em'}>{message.date.toString()}</Box> */}
  <Divider />
  </Box>
  ))}