refactor

README.md

@@ -18,4 +18,6 @@ password: Micr@J@bs
 
 ![screenshot](screenshot1.png)
 
+![screenshot](screenshot2.png)
+
 For any information, feel free to [contact me](http:https://andre-i.eu/#contactme).

src/Main.tsx

@@ -296,10 +296,7 @@ export default function Main() {
  />
  <Route path="/register" element={<Register />} />
  <Route path="/rooms" element={<Conversations />} />
- <Route
- path="/room/:roomId/username/:username"
- element={<JobInfoSidebar />}
- />
+ <Route path="/rooms/:roomId" element={<JobInfoSidebar />} />
  <Route path="/authenticate" element={<Login />} />
  <Route
  path="/view/:scope/jobId/:id"

src/components/job/ViewJob.tsx

@@ -84,7 +84,7 @@ export default function ViewOfferRequest({}: Props) {
  }
  GenericApiService.get<Room>(`api/v1/room/jobId/${job.id}`).then(
  (room: Room) => {
- navigate(`/room/${room?.id}/username/${job.author?.username}`);
+ navigate(`/rooms/${room?.id}`);
  }
  );
  }

src/components/message/Conversations.tsx

@@ -26,20 +26,24 @@ export default function Conversations() {
  }
  );
  }, []);
-
+ const navigate = useNavigate();
  return (
  <>
  <Title title={'Conversations'} />
- {rooms && rooms.map((room, idx) => <RoomItem key={idx} room={room} />)}
+ {rooms &&
+ rooms.map((room, idx) => (
+ <RoomItem navigate={navigate} key={idx} room={room} />
+ ))}
  </>
  );
 }
 
 interface RoomItemProps {
  room: Room;
+ navigate: (path: string) => void;
 }
 
-function RoomItem({ room }: RoomItemProps) {
+function RoomItem({ room, navigate }: RoomItemProps) {
  const [roomPicture] = useState<string>(
  JobService.getImageLink(room.pictureName)
  );
@@ -48,12 +52,9 @@ function RoomItem({ room }: RoomItemProps) {
  (participant) => !UserService.isSameUsername(participant)
  )[0]
  );
- const navigate = useNavigate();
+
  const goToConversation = (room: Room) => {
- const participant = room.participants.filter(
- (part) => !UserService.isSameUsername(part)
- )[0];
- navigate(`/room/${room.id}/username/${participant}`);
+ navigate(`/rooms/${room.id}`);
  };
  return (
  <Card
@@ -66,7 +67,7 @@ function RoomItem({ room }: RoomItemProps) {
  objectFit="cover"
  maxW={{ base: '100%', sm: '50px' }}
  src={roomPicture}
- alt="Caffe Latte"
+ alt="Room picture"
  />
 
  <Stack>

src/components/message/JobInfoSidebar.tsx

@@ -19,6 +19,7 @@ import Title from '../job/Header';
 export default function JobInfoSidebar() {
  const { roomId } = useParams();
  const [job, setJob] = useState<Job>();
+
  useEffect(() => {
  GenericApiService.get<Job>(`api/v1/job/private/roomId/${roomId}`).then(
  (job: Job) => {

src/interceptors/LoginInterceptor.ts

@@ -29,7 +29,6 @@ export const customInterceptor = (navigate: any) => {
  return Promise.reject(error);
  }
  );
- // return Promise.resolve(data);
  } else {
  localStorage.removeItem('access_token');
  localStorage.removeItem('refresh_token');