From 4b22c5ead8fa5453420e3782f628a46b8415eb74 Mon Sep 17 00:00:00 2001 From: MiguelMLorente Date: Thu, 21 Nov 2024 23:09:29 +0100 Subject: [PATCH] Merge linter changes into branch --- .gitignore | 1 + app/src/app.service.ts | 9 ++-- app/src/players/player.service.ts | 3 +- interface/client-events/ClientEvent.ts | 6 +-- interface/client-events/CreateLobbyEvent.ts | 4 +- interface/client-events/JoinLobbyEvent.ts | 6 +-- interface/server-events/ServerError.ts | 4 +- interface/server-events/ServerEvent.ts | 4 +- web/.eslintrc.js | 2 +- web/src/App.test.tsx | 8 ---- web/src/App.tsx | 9 +--- web/src/pages/landing/LandingPage.tsx | 46 +++++++++++---------- 12 files changed, 48 insertions(+), 54 deletions(-) delete mode 100644 web/src/App.test.tsx diff --git a/.gitignore b/.gitignore index cad3fbc..1e8e056 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,7 @@ dist # production /build +*/build/ # misc .DS_Store diff --git a/app/src/app.service.ts b/app/src/app.service.ts index b66e63d..9f41f32 100644 --- a/app/src/app.service.ts +++ b/app/src/app.service.ts @@ -7,7 +7,7 @@ import { WebSocketGateway, } from '@nestjs/websockets'; import { PlayerService } from './players/player.service'; -import { Socket } from 'socket.io' +import { Socket } from 'socket.io'; @WebSocketGateway({ cors: true }) @Injectable() @@ -15,12 +15,15 @@ export class AppService implements OnGatewayConnection { private readonly logger = new Logger(AppService.name); constructor(private readonly playerService: PlayerService) {} - handleConnection(client:Socket) { + handleConnection(client: Socket) { this.logger.log(client.id); } @SubscribeMessage('example-request') - handleCustomEvent(@ConnectedSocket() client:Socket,@MessageBody() data: string): unknown { + handleCustomEvent( + @ConnectedSocket() client: Socket, + @MessageBody() data: string, + ): unknown { this.logger.debug(`Received request in backend with data: ${data}`); this.logger.debug(`Received data id from client: ${client.id}`); return { diff --git a/app/src/players/player.service.ts b/app/src/players/player.service.ts index f41918d..1a8917f 100644 --- a/app/src/players/player.service.ts +++ b/app/src/players/player.service.ts @@ -1,7 +1,6 @@ import { Injectable, Logger } from '@nestjs/common'; -import { MessageBody, OnGatewayConnection, SubscribeMessage, WebSocketGateway } from '@nestjs/websockets'; @Injectable() export class PlayerService { private readonly logger = new Logger(PlayerService.name); -} \ No newline at end of file +} diff --git a/interface/client-events/ClientEvent.ts b/interface/client-events/ClientEvent.ts index 578e405..f0db423 100644 --- a/interface/client-events/ClientEvent.ts +++ b/interface/client-events/ClientEvent.ts @@ -1,5 +1,5 @@ export enum ClientEvent { - CREATE_LOBBY = "create-lobby", - JOIN_LOBBY = "join-lobby", - START_GAME = "start-game" + CREATE_LOBBY = "create-lobby", + JOIN_LOBBY = "join-lobby", + START_GAME = "start-game", } diff --git a/interface/client-events/CreateLobbyEvent.ts b/interface/client-events/CreateLobbyEvent.ts index 4f0fb5c..af204ff 100644 --- a/interface/client-events/CreateLobbyEvent.ts +++ b/interface/client-events/CreateLobbyEvent.ts @@ -1,3 +1,3 @@ export type CreateLobbyEvent = { - userName: string; -} \ No newline at end of file + userName: string; +}; diff --git a/interface/client-events/JoinLobbyEvent.ts b/interface/client-events/JoinLobbyEvent.ts index 52d65a8..d9ac08f 100644 --- a/interface/client-events/JoinLobbyEvent.ts +++ b/interface/client-events/JoinLobbyEvent.ts @@ -1,4 +1,4 @@ export type JoinLobbyEvent = { - userName: string; - lobbyId: string; -} \ No newline at end of file + userName: string; + lobbyId: string; +}; diff --git a/interface/server-events/ServerError.ts b/interface/server-events/ServerError.ts index 051f024..12c0b96 100644 --- a/interface/server-events/ServerError.ts +++ b/interface/server-events/ServerError.ts @@ -1,4 +1,4 @@ export enum ServerError { - CREATE_LOBBY_ERROR = "create-lobby-error", - JOIN_LOBBY_ERROR = "join-lobby-error" + CREATE_LOBBY_ERROR = "create-lobby-error", + JOIN_LOBBY_ERROR = "join-lobby-error", } diff --git a/interface/server-events/ServerEvent.ts b/interface/server-events/ServerEvent.ts index 7116b49..d30c145 100644 --- a/interface/server-events/ServerEvent.ts +++ b/interface/server-events/ServerEvent.ts @@ -1,4 +1,4 @@ export enum ServerEvent { - LOBBY_UPDATE = "lobby-update", - START_ROUND = "start-round" + LOBBY_UPDATE = "lobby-update", + START_ROUND = "start-round", } diff --git a/web/.eslintrc.js b/web/.eslintrc.js index 9700d32..55192a3 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -12,6 +12,6 @@ module.exports = { node: true, jest: true, }, - ignorePatterns: [".eslintrc.js", "dist/"], + ignorePatterns: [".eslintrc.js", "dist/", "node_modules/", "build/"], rules: {}, }; diff --git a/web/src/App.test.tsx b/web/src/App.test.tsx deleted file mode 100644 index b97f69b..0000000 --- a/web/src/App.test.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import React from "react"; -import { render, screen } from "@testing-library/react"; -import App from "./App"; - -test("Renders hello world", () => { - render(); - expect(screen.getByText("Hello World! Front")).toBeInTheDocument(); -}); diff --git a/web/src/App.tsx b/web/src/App.tsx index c60b845..a914432 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -1,18 +1,13 @@ import React from "react"; import { io } from "socket.io-client"; -import LandingPage from './pages/landing/LandingPage'; +import LandingPage from "./pages/landing/LandingPage"; function App() { const socket = io("http://localhost:3010"); - const emitData = () => - console.log(socket.emit("example-request", "custom-request")); - socket.on("example-response", (data) => - console.log(`Received response in front end with data: ${data}`), - ); return (
- +
); } diff --git a/web/src/pages/landing/LandingPage.tsx b/web/src/pages/landing/LandingPage.tsx index 7975f3f..be713cc 100644 --- a/web/src/pages/landing/LandingPage.tsx +++ b/web/src/pages/landing/LandingPage.tsx @@ -1,25 +1,29 @@ -import React from "react" +import React, { ChangeEvent } from "react"; import { Socket } from "socket.io-client"; -const LandingPage = (props:{socket:Socket})=>{ - var username = ""; - const registerUsername = (event:any) => username = event.target.value; - const socket = props.socket; - const handleCreateLobby = () => socket.emit("create-lobby", {username:username}); - return -
-

Trains And Roads

-
-
- -
-
- -
-
- - -
+const LandingPage = (props: { socket: Socket }) => { + let username = ""; + const registerUsername = (event: ChangeEvent) => + (username = event.target.value); + const socket = props.socket; + const handleCreateLobby = () => + socket.emit("create-lobby", { username: username }); + return ( + +
+

Trains And Roads

+
+
+ +
+
+ +
+
+ + +
+ ); }; -export default LandingPage; \ No newline at end of file +export default LandingPage;