refactor: var names

src/Main.tsx

@@ -1,8 +1,7 @@
-import { ReactNode, useState } from 'react';
+import { useState } from 'react';
 import {
  Box,
  Flex,
- Avatar,
  HStack,
  IconButton,
  Button,
@@ -14,25 +13,22 @@ import {
  useDisclosure,
  useColorModeValue,
  Stack,
- useStatStyles,
  Icon,
- Center,
 } from '@chakra-ui/react';
 import {
  HamburgerIcon,
  CloseIcon,
  AddIcon,
- ViewOffIcon,
  TriangleDownIcon,
 } from '@chakra-ui/icons';
 import { Route, Routes, useNavigate } from 'react-router-dom';
 import Home from './components/Home';
-import InsertJob from './components/InsertJob';
-import Register from './components/Register';
-import Login from './components/Login';
-import JobOffersRequests from './components/JobOffersRequests';
+import InsertJob from './components/job/InsertUpdateJob';
+import Register from './components/user/Register';
+import Login from './components/user/Login';
+import JobOffersRequests from './components/job/JobOffersRequests';
 import AuthenticationService from './service/AuthenticationService';
-import ViewOfferRequest from './components/ViewOfferRequest';
+import ViewOfferRequest from './components/job/ViewOfferRequest';
 import UserService from './service/UserService';
 
 const mainMenu = [
@@ -207,8 +203,8 @@ export default function Main() {
  element={
  <JobOffersRequests
  key={'offers'}
- baseUrl="api/v1/job/0"
- urlCountItems="api/v1/job/count/0"
+ baseUrl="api/v1/job/public/0"
+ urlCountItems="api/v1/job/public/count/0"
  />
  }
  />
@@ -217,8 +213,8 @@ export default function Main() {
  element={
  <JobOffersRequests
  key={'requests'}
- baseUrl="api/v1/job/1"
- urlCountItems="api/v1/job/count/1"
+ baseUrl="api/v1/job/public/1"
+ urlCountItems="api/v1/job/public/count/1"
  />
  }
  />

src/components/InsertJob.tsx → src/components/job/InsertUpdateJob.tsx

@@ -8,10 +8,10 @@ import {
  Select,
 } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
-import GenericService from '../service/GenericService';
+import GenericService from '../../service/GenericService';
 import { useNavigate, useParams } from 'react-router-dom';
-import Job from '../dto/Job';
-import FileUpload from './FileUpload';
+import Job from '../../dto/Job';
+import FileUpload from '../FileUpload';
 
 export default function InserJob() {
  const [form, setForm] = useState<Job>({
@@ -57,7 +57,7 @@ export default function InserJob() {
  title: form.title,
  description: form.description,
  type: form.type,
- images: files,
+ imagesContent: files,
  price: form.price,
  id: form.id,
  };

src/components/JobOffersRequests.tsx → src/components/job/JobOffersRequests.tsx

@@ -14,15 +14,15 @@ import {
  Grid,
 } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
-import GenericService from '../service/GenericService';
-import Job from '../dto/Job';
-import GenericResponse from '../dto/GenericResponse';
-import Pagination from './Pagination';
-import PaginationUtil from '../util/PaginationUtil';
+import GenericService from '../../service/GenericService';
+import Job from '../../dto/Job';
+import GenericResponse from '../../dto/GenericResponse';
+import Pagination from '../Pagination';
+import PaginationUtil from '../../util/PaginationUtil';
 import { useNavigate } from 'react-router-dom';
-import JobConst from '../consts/JobConst';
+import JobConst from '../../consts/JobConst';
 import { StarIcon } from '@chakra-ui/icons';
-import UserService from '../service/UserService';
+import UserService from '../../service/UserService';
 
 interface Props {
  baseUrl: string;

src/components/ViewOfferRequest.tsx → src/components/job/ViewOfferRequest.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
-import GenericService from '../service/GenericService';
-import Job from '../dto/Job';
+import GenericService from '../../service/GenericService';
+import Job from '../../dto/Job';
 import { Card, CardBody } from '@chakra-ui/card';
 import { Box, Flex, Text } from '@chakra-ui/react';
 import { useParams } from 'react-router-dom';
@@ -25,8 +25,8 @@ export default function ViewOfferRequest({}: Props) {
  <Text>Type: {job && job.type}</Text>
  <Flex>
  {job &&
- job.images &&
- job.images.map((image, idx) => (
+ job.pictureNamesList &&
+ job.pictureNamesList.map((image, idx) => (
  <Box key={idx} w={'64px'} h={'64px'}>
  <img src={'/api/v1/jobPicture/files/' + image} />
  </Box>

src/components/Login.tsx → src/components/user/Login.tsx

@@ -7,10 +7,10 @@ import {
  Input,
 } from '@chakra-ui/react';
 import { useState } from 'react';
-import GenericService from '../service/GenericService';
+import GenericService from '../../service/GenericService';
 import { useNavigate } from 'react-router-dom';
-import LoginRequest from '../dto/LoginRequest';
-import UserProfile from '../dto/UserProfile';
+import LoginRequest from '../../dto/LoginRequest';
+import UserProfile from '../../dto/UserProfile';
 
 export default function Login() {
  const [form, setForm] = useState({

src/components/Register.tsx → src/components/user/Register.tsx

@@ -7,11 +7,11 @@ import {
  Input,
 } from '@chakra-ui/react';
 import { useState } from 'react';
-import GenericService from '../service/GenericService';
+import GenericService from '../../service/GenericService';
 import { useNavigate } from 'react-router-dom';
-import RegisterRequest from '../dto/RegisterRequest';
-import FileUpload from './FileUpload';
-import UserProfile from '../dto/UserProfile';
+import RegisterRequest from '../../dto/RegisterRequest';
+import FileUpload from '../FileUpload';
+import UserProfile from '../../dto/UserProfile';
 
 export default function Register() {
  const [userPicture, setUserPicture] = useState<string>();

src/dto/Job.ts

@@ -6,8 +6,9 @@ export default interface Job {
  description: string;
  type: number;
  status?: number;
- images?: Array<string>;
+ imagesContent?: Array<string>;
  author?: Author;
  price: number;
  pictureName?: string;
+ pictureNamesList?: Array<string>;
 }