Merge branch 'development' into fix/th-183-fix-the-phone-field

h0wter · web-flow · commit 31615d2d7f9f · 2023-09-15T17:21:08.000+03:00
diff --git a/backend/src/libs/packages/socket/socket.service.ts b/backend/src/libs/packages/socket/socket.service.ts
@@ -34,12 +34,12 @@ class SocketService {
         logger.info(`${socket.id} disconnected`);
       });
       socket.on(
-        ServerSocketEvent.DRIVER_LOCATION_UPDATE,
+        ServerSocketEvent.TRUCK_LOCATION_UPDATE,
         (
-          payload: ServerSocketEventParameter[typeof ServerSocketEvent.DRIVER_LOCATION_UPDATE],
+          payload: ServerSocketEventParameter[typeof ServerSocketEvent.TRUCK_LOCATION_UPDATE],
         ): void => {
-          const { driverId, latLng } = payload;
-          this.geolocationCacheService.setCache(driverId, latLng);
+          const { truckId, latLng } = payload;
+          this.geolocationCacheService.setCache(truckId, latLng);
         },
       );
     });
diff --git a/frontend/index.html b/frontend/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/icon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>TowHub</title>
   </head>
   <body>
     <div id="modal-root"></div>
diff --git a/frontend/public/icon.svg b/frontend/public/icon.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="54" height="54">
+  <circle cx="27" cy="27" r="27" fill="#EE2A64" />
+  <mask id="a" width="54" height="54" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:alpha">
+    <circle cx="27" cy="27" r="27" fill="#EE2A64" />
+  </mask>
+  <g mask="url(#a)">
+    <path fill="#fff" stroke="#fff" stroke-width=".459" d="M23.698-9.279c-3.907 1.435-6.707 5.18-6.707 9.577 0 4.399 2.8 8.144 6.707 9.583v6.28c-6.03 1.561-10.495 7.048-10.495 13.558 0 7.727 6.28 14.008 14.005 14.008a13.98 13.98 0 0 0 10.715-4.99 3.507 3.507 0 0 0-.422-4.944 3.506 3.506 0 0 0-4.943.422 6.985 6.985 0 0 1-12.334-4.498c0-3.849 3.131-6.986 6.984-6.986a3.51 3.51 0 0 0 3.511-3.51V9.88c3.906-1.439 6.7-5.184 6.7-9.583 0-4.396-2.795-8.144-6.7-9.577v-11.445a8.216 8.216 0 0 0 1.542-4.778c0-4.56-3.71-8.273-8.273-8.273H8.51a3.51 3.51 0 0 0 0 7.019h15.476a1.255 1.255 0 0 1 0 2.508H8.51A3.512 3.512 0 0 0 5-20.74c0 1.94 1.571 3.51 3.51 3.51h15.188v7.95Z" />
+  </g>
+</svg>
diff --git a/frontend/public/vite.svg b/frontend/public/vite.svg
diff --git a/frontend/src/libs/packages/geolocation/helpers/helpers.ts b/frontend/src/libs/packages/geolocation/helpers/helpers.ts
@@ -1 +1 @@
-export { sendDriverGeolocation } from './send-driver-geolocation/send-driver-geolocation.helper.js';
+export { sendTruckGeolocation } from './send-truck-geolocation/send-truck-geolocation.helper.js';
diff --git a/frontend/src/libs/packages/geolocation/helpers/send-truck-geolocation/send-truck-geolocation.helper.ts b/frontend/src/libs/packages/geolocation/helpers/send-truck-geolocation/send-truck-geolocation.helper.ts
@@ -1,17 +1,17 @@
 import { ServerSocketEvent } from '~/libs/packages/socket/libs/enums/enums.js';
 import { socket as socketService } from '~/libs/packages/socket/socket.js';
 
-const sendDriverGeolocation = (
-  driverId: number,
+const sendTruckGeolocation = (
+  truckId: number,
   { coords }: GeolocationPosition,
 ): void => {
   socketService.emit({
-    event: ServerSocketEvent.DRIVER_LOCATION_UPDATE,
+    event: ServerSocketEvent.TRUCK_LOCATION_UPDATE,
     eventPayload: {
-      driverId,
+      truckId,
       latLng: { latitude: coords.latitude, longitude: coords.longitude },
     },
   });
 };
 
-export { sendDriverGeolocation };
+export { sendTruckGeolocation };
diff --git a/package-lock.json b/package-lock.json
diff --git a/shared/src/libs/packages/socket/libs/enums/server-socket-event.enum.ts b/shared/src/libs/packages/socket/libs/enums/server-socket-event.enum.ts
@@ -1,7 +1,7 @@
 const ServerSocketEvent = {
   CONNECTION: 'connection',
   DISCONNECT: 'disconnect',
-  DRIVER_LOCATION_UPDATE: 'driver_location_update',
+  TRUCK_LOCATION_UPDATE: 'truck_location_update',
 } as const;
 
 export { ServerSocketEvent };
diff --git a/shared/src/libs/packages/socket/libs/types/server-socket-event-parameter.type.ts b/shared/src/libs/packages/socket/libs/types/server-socket-event-parameter.type.ts
@@ -3,9 +3,9 @@ import { type GeolocationLatLng } from '~/libs/packages/geolocation/types/types.
 import { type ServerSocketEvent } from '../enums/enums.js';
 
 type ServerSocketEventParameter = {
-  [ServerSocketEvent.DRIVER_LOCATION_UPDATE]: {
+  [ServerSocketEvent.TRUCK_LOCATION_UPDATE]: {
     latLng: GeolocationLatLng;
-    driverId: number;
+    truckId: number;
   };
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { sendDriverGeolocation } from './send-driver-geolocation/send-driver-geolocation.helper.js';`
	`1`	`+export { sendTruckGeolocation } from './send-truck-geolocation/send-truck-geolocation.helper.js';`