feat: cancel race when creator

npwd-community · Aug 24, 2022 · 564d4ec · 564d4ec
1 parent 5d61a25
commit 564d4ec
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/client/client.ts b/client/client.ts
@@ -142,7 +142,7 @@ function getDistance(v1: Vector, v2: Vector) {
   return Math.sqrt(dx * dx + dy * dy + dz * dz);
 }
 
-// RegisterNuiCB(RacingEvents.StopRace, (trackName: string, cb) => {
-//   emitNet(QBRacingEvents.Stop, trackName);
-//   cb({ status: 'ok' });
-// });
+RegisterNuiCB(RacingEvents.StopRace, (raceId: string, cb) => {
+  emitNet(QBRacingEvents.CancelRace, raceId);
+  cb({ status: 'ok' });
+});
diff --git a/server/server.ts b/server/server.ts
@@ -1,7 +1,7 @@
 import { RawUser, User } from '../types/User';
 import { Server } from 'qbcore.js';
 import { RawTrack, Track, RaceRecord, Race, QBRace } from '../types/Racing';
-import { RacingEvents } from '../types/Events';
+import { QBRacingEvents, RacingEvents } from '../types/Events';
 import { SQLJSON } from '../types/Common';
 console.log('Server started!');
 
@@ -56,6 +56,7 @@ onNet(RacingEvents.DeleteTrack, async (raceId: string) => {
   );
 
   if (affectedRows > 0) {
+    emit(QBRacingEvents.CancelRace, raceId);
     emitNet(RacingEvents.SendDeleteTrack, src, true);
     return;
   }

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -21,7 +21,7 @@ const Footer = () => {
     <BottomNavigation value={page} onChange={handleChange} showLabels>
       <BottomNavigationAction
         label={'Races'}
-        value="/"
+        value=""
         component={NavLink}
         icon={<FormatListBulletedRoundedIcon />}
         to={`${path}`}

diff --git a/src/components/RaceCard.tsx b/src/components/RaceCard.tsx
@@ -132,7 +132,11 @@ const RaceCard = ({ race, onUpdate }: RaceCardProps) => {
       ) : (
         <CardActions disableSpacing>
           <Stack direction="row" spacing={1} marginLeft="auto">
-            {isCreator && <Button color="error">Delete</Button>}
+            {isCreator && (
+              <Button color="error" onClick={handleStop}>
+                Delete
+              </Button>
+            )}
 
             {isCompeting ? (
               <Button color="error" onClick={handleLeave}>

diff --git a/types/Events.ts b/types/Events.ts
@@ -28,6 +28,8 @@ export enum QBRacingEvents {
   WaitingDistanceCheck = 'qb-lapraces:client:WaitingDistanceCheck',
   GetRacingData = 'qb-lapraces:server:GetRacingData',
   GetIsAuthorizedToCreateRaces = 'qb-lapraces:server:IsAuthorizedToCreateRaces',
+  UpdateRaceState = 'qb-lapraces:server:UpdateRaceState',
+  CancelRace = 'qb-lapraces:server:CancelRace',
 }
 
 export enum NUIEvents {