Merge linter changes into branch

pull/9/head
MiguelMLorente 2024-11-21 23:09:29 +01:00
parent 0fc8a7383f
commit 4b22c5ead8
12 changed files with 48 additions and 54 deletions

1
.gitignore vendored
View File

@ -142,6 +142,7 @@ dist
# production # production
/build /build
*/build/
# misc # misc
.DS_Store .DS_Store

View File

@ -7,7 +7,7 @@ import {
WebSocketGateway, WebSocketGateway,
} from '@nestjs/websockets'; } from '@nestjs/websockets';
import { PlayerService } from './players/player.service'; import { PlayerService } from './players/player.service';
import { Socket } from 'socket.io' import { Socket } from 'socket.io';
@WebSocketGateway({ cors: true }) @WebSocketGateway({ cors: true })
@Injectable() @Injectable()
@ -15,12 +15,15 @@ export class AppService implements OnGatewayConnection {
private readonly logger = new Logger(AppService.name); private readonly logger = new Logger(AppService.name);
constructor(private readonly playerService: PlayerService) {} constructor(private readonly playerService: PlayerService) {}
handleConnection(client:Socket) { handleConnection(client: Socket) {
this.logger.log(client.id); this.logger.log(client.id);
} }
@SubscribeMessage('example-request') @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 request in backend with data: ${data}`);
this.logger.debug(`Received data id from client: ${client.id}`); this.logger.debug(`Received data id from client: ${client.id}`);
return { return {

View File

@ -1,5 +1,4 @@
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { MessageBody, OnGatewayConnection, SubscribeMessage, WebSocketGateway } from '@nestjs/websockets';
@Injectable() @Injectable()
export class PlayerService { export class PlayerService {

View File

@ -1,5 +1,5 @@
export enum ClientEvent { export enum ClientEvent {
CREATE_LOBBY = "create-lobby", CREATE_LOBBY = "create-lobby",
JOIN_LOBBY = "join-lobby", JOIN_LOBBY = "join-lobby",
START_GAME = "start-game" START_GAME = "start-game",
} }

View File

@ -1,3 +1,3 @@
export type CreateLobbyEvent = { export type CreateLobbyEvent = {
userName: string; userName: string;
} };

View File

@ -1,4 +1,4 @@
export type JoinLobbyEvent = { export type JoinLobbyEvent = {
userName: string; userName: string;
lobbyId: string; lobbyId: string;
} };

View File

@ -1,4 +1,4 @@
export enum ServerError { export enum ServerError {
CREATE_LOBBY_ERROR = "create-lobby-error", CREATE_LOBBY_ERROR = "create-lobby-error",
JOIN_LOBBY_ERROR = "join-lobby-error" JOIN_LOBBY_ERROR = "join-lobby-error",
} }

View File

@ -1,4 +1,4 @@
export enum ServerEvent { export enum ServerEvent {
LOBBY_UPDATE = "lobby-update", LOBBY_UPDATE = "lobby-update",
START_ROUND = "start-round" START_ROUND = "start-round",
} }

View File

@ -12,6 +12,6 @@ module.exports = {
node: true, node: true,
jest: true, jest: true,
}, },
ignorePatterns: [".eslintrc.js", "dist/"], ignorePatterns: [".eslintrc.js", "dist/", "node_modules/", "build/"],
rules: {}, rules: {},
}; };

View File

@ -1,8 +0,0 @@
import React from "react";
import { render, screen } from "@testing-library/react";
import App from "./App";
test("Renders hello world", () => {
render(<App />);
expect(screen.getByText("Hello World! Front")).toBeInTheDocument();
});

View File

@ -1,18 +1,13 @@
import React from "react"; import React from "react";
import { io } from "socket.io-client"; import { io } from "socket.io-client";
import LandingPage from './pages/landing/LandingPage'; import LandingPage from "./pages/landing/LandingPage";
function App() { function App() {
const socket = io("http://localhost:3010"); 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 ( return (
<div className="App"> <div className="App">
<LandingPage socket={socket}/> <LandingPage socket={socket} />
</div> </div>
); );
} }

View File

@ -1,25 +1,29 @@
import React from "react" import React, { ChangeEvent } from "react";
import { Socket } from "socket.io-client"; import { Socket } from "socket.io-client";
const LandingPage = (props:{socket:Socket})=>{ const LandingPage = (props: { socket: Socket }) => {
var username = ""; let username = "";
const registerUsername = (event:any) => username = event.target.value; const registerUsername = (event: ChangeEvent<HTMLInputElement>) =>
const socket = props.socket; (username = event.target.value);
const handleCreateLobby = () => socket.emit("create-lobby", {username:username}); const socket = props.socket;
return <React.Fragment> const handleCreateLobby = () =>
<div className="LandingPageTitle"> socket.emit("create-lobby", { username: username });
<h1>Trains And Roads</h1> return (
</div> <React.Fragment>
<div className="UserNameImput"> <div className="LandingPageTitle">
<input placeholder="Enter username" onChange={registerUsername}></input> <h1>Trains And Roads</h1>
</div> </div>
<div className="CreateLobbyButton"> <div className="UserNameImput">
<button onClick={handleCreateLobby}>Create Lobby</button> <input placeholder="Enter username" onChange={registerUsername}></input>
</div> </div>
<div className="JoinLobby"> <div className="CreateLobbyButton">
<input className="LobbyIdInput" placeholder="Enter Lobby Id"></input> <button onClick={handleCreateLobby}>Create Lobby</button>
<button className="JoinLobbyButton secondary">Join Lobby</button> </div>
</div> <div className="JoinLobby">
<input className="LobbyIdInput" placeholder="Enter Lobby Id"></input>
<button className="JoinLobbyButton secondary">Join Lobby</button>
</div>
</React.Fragment> </React.Fragment>
);
}; };
export default LandingPage; export default LandingPage;