From 49ffa74bb41ff2927038bd40d6df7e9a7fc82079 Mon Sep 17 00:00:00 2001 From: Me Date: Mon, 16 Jan 2023 18:48:13 +0100 Subject: [PATCH 01/29] small update to ProfileUsers, make it so buttons don't load if user doesn't --- .../pages/profile/ProfileDisplayOneUser.svelte | 8 ++++++++ .../src/pages/profile/ProfileUsers.svelte | 5 ++++- .../api_front/src/pieces/DisplayAUser.svelte | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte index f20dbade..fc2fd8fb 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte @@ -42,3 +42,11 @@ + diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 7b945dc7..27de76b2 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -16,6 +16,7 @@ /**** Layout variables ****/ let tabItems: string[] = ['All Users', 'My Friends', 'Friend Requests', 'Blocked Users'] let activeTabItem: string = 'All Users'; + let loadedUser; onMount( async() => { @@ -295,8 +296,9 @@
{#if usernameBeingViewed !== undefined} - + + {#if loadedUser === true}
{#if friendshipStatusFull && friendshipStatusFull.id} {#if friendshipStatusFull.status === 'R'} @@ -329,6 +331,7 @@ {/if}
+ {/if} {:else}

Click on a user!

diff --git a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte index 0a0c6eb0..5a7b67b8 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte @@ -4,6 +4,7 @@ import GenerateUserDisplay from './GenerateUserDisplay.svelte'; export let aUsername; + export let loaded = false; let user; onMount( async() => { @@ -20,6 +21,13 @@ $: aUsername, updateUser(); + $: { + if (user === undefined) + loaded = false; + else + loaded = true; + } +
@@ -30,3 +38,13 @@
Failed to load user {aUsername}
{/if}
+ + + \ No newline at end of file From af872eafc5c21533ad22990aaec9d2d630405756 Mon Sep 17 00:00:00 2001 From: Me Date: Mon, 16 Jan 2023 18:53:14 +0100 Subject: [PATCH 02/29] removed the cached .env that was lurking about --- srcs/requirements/svelte/api_front/.env | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 srcs/requirements/svelte/api_front/.env diff --git a/srcs/requirements/svelte/api_front/.env b/srcs/requirements/svelte/api_front/.env deleted file mode 100644 index 1b450684..00000000 --- a/srcs/requirements/svelte/api_front/.env +++ /dev/null @@ -1,2 +0,0 @@ -WEBSITE_HOST=transcendance -WEBSITE_PORT=8080 From 86f7add6edae0ebcb61865af5621339fcfc28066 Mon Sep 17 00:00:00 2001 From: Me Date: Mon, 16 Jan 2023 21:47:02 +0100 Subject: [PATCH 03/29] a few small fixes, about to add 404 exceptions most places i do fetches --- .../src/friendship/friendship.service.ts | 2 ++ .../src/pages/profile/ProfileUsers.svelte | 36 ++++++++++++++----- .../api_front/src/pieces/DisplayAUser.svelte | 10 ++++-- .../src/pieces/GenerateUserDisplay.svelte | 16 +++++---- .../api_front/src/routes/primaryRoutes.js | 2 ++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts index 2a325e0b..2089c023 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts @@ -85,6 +85,8 @@ export class FriendshipService { if (!friendship) { throw new HttpException(`There is no such friendship`, HttpStatus.NOT_FOUND); + // throw new HttpException(`There is no such friendship`, HttpStatus.NO_CONTENT); + // throw new HttpException(`There is no such friendship`, 204); } return new SendableFriendship(friendship); } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 861f4400..1e9451d8 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -118,14 +118,23 @@ friendshipStatusFull = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends?username=${aUsername}`) .then((response) => { if (!response.ok) { - throw new Error("HTTP " + response.status); - } + console.log("response not ok : ") + console.log({...response}) + // throw new Error("HTTP " + response.status); + } + // else { + console.log("response ok : ") + console.log({...response}) return response.json(); + // } }) - .catch((error) => { + .catch((error) => { + console.log("catching things") console.log("catch fetchFriendshipFull: ", error); return []; }); + // console.log('friendshipFull: ') + // console.log({...friendshipStatusFull}) }; const sendFriendRequest = async (aUsername) => { @@ -274,6 +283,7 @@ const unblockAUser = async (relationshipId) => { // it's basically the same as unfriending someone cuz unfriending them means the relationship is deleted await unfriend(relationshipId); + await fetchAll(); activeTabItem = activeTabItem; }; @@ -289,8 +299,21 @@ await fetchBlockedUsers(); console.log("fetching blocked users"); } - if (usernameBeingViewed) + if (usernameBeingViewed) { + await fetchAllUsers_Wrapper(); fetchFriendshipFull(usernameBeingViewed); + } + + + // if (usernameBeingViewed) { + // let found = allUsers.find( + // (e) => e.username === usernameBeingViewed + // ); + // if (!found) { + // usernameBeingViewed = null; + // friendshipStatusFull = null; + // } + // } }; @@ -470,9 +493,4 @@ } - .error{ - font-size: 0.8em; - font-weight: bold; - color: red; - } diff --git a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte index 1623872d..bb728bd7 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte @@ -6,16 +6,20 @@ export let aUsername; export let loaded = false; - let user; + let aUser; onMount( async() => { aUser = await fetchUser(aUsername); }) - $: aUsername, fetchUser(aUsername); + const updateUser = async(aUsername) => { + aUser = await fetchUser(aUsername); + }; + + $: aUsername, updateUser(aUsername); $: { - if (user === undefined) + if (aUser === undefined) loaded = false; else loaded = true; diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index d8a9904d..1527b58e 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -8,8 +8,7 @@ let rank = ''; let avatar; // avatar needs to be updated!!! - console.log('Generate User Display, BEFORE on mount ' + avatar) - console.log('user:') + console.log('Generate User Display user:') console.log({...user}) // console.log(user) let errors = {avatar: ''}; @@ -18,15 +17,20 @@ avatar = await fetchAvatar(user.username); }) + const updateAvatar = async() => { + avatar = await fetchAvatar(user.username); + }; + + $: user, updateAvatar(); /**** THIS IS BASICALLY ALL THE RANK LOGIC ERIC HAS MADE ****/ - if (user.loseGame > user.winGame) { - rank = 'Bitch Ass Loser!' - } else if (user.loseGame === user.winGame) { + if (user.stats.loseGame > user.stats.winGame) { + rank = "Come on, you can do better" + } else if (user.stats.loseGame === user.stats.winGame) { rank = 'Fine i guess...' } else { - rank = 'Yea you da Boss!' + rank = 'You da Boss!' } diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js index 9bd7b912..eb0aa6c9 100644 --- a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js +++ b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js @@ -12,9 +12,11 @@ import { fetchUser } from "../pieces/utils"; async function checkLogin(detail) { const user = await fetchUser(); if (!user || !user.username) { + console.log('failed to be logged in') return false; } else { + console.log('successfully logged in') return true; } } From 29b6042cda1e5984c5943e912e4ad4a03d25fb4c Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 03:04:36 +0100 Subject: [PATCH 04/29] clean up --- .../src/friendship/friendship.service.ts | 6 --- .../src/pages/profile/ProfileUsers.svelte | 34 ++++++---------- .../src/pieces/GenerateUserDisplay.svelte | 14 +++---- .../api_front/src/pieces/ScrollTo.svelte | 40 ------------------- .../svelte/api_front/src/pieces/utils.ts | 2 + .../api_front/src/routes/primaryRoutes.js | 4 +- 6 files changed, 22 insertions(+), 78 deletions(-) delete mode 100644 srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts index 2089c023..d0aba0ab 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts @@ -1,9 +1,6 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { User } from 'src/users/entities/user.entity'; - -import { SendableUser } from 'src/users/sendableUsers'; - import { Repository, Brackets } from 'typeorm'; import { CreateFriendshipDto } from './dto/create-friendship.dto'; import { Friendship, FriendshipStatus } from './entities/friendship.entity'; @@ -77,7 +74,6 @@ export class FriendshipService { ) }), ) - // .andWhere('friendship.status != :status', {status : FriendshipStatus.BLOCKED}) .getOne() // console.log('END Find one friend by username: ') @@ -85,8 +81,6 @@ export class FriendshipService { if (!friendship) { throw new HttpException(`There is no such friendship`, HttpStatus.NOT_FOUND); - // throw new HttpException(`There is no such friendship`, HttpStatus.NO_CONTENT); - // throw new HttpException(`There is no such friendship`, 204); } return new SendableFriendship(friendship); } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 1e9451d8..f5a215fb 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -60,6 +60,8 @@ myFriendships = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`) .then((response) => { if (!response.ok) { + if (response.status === 404) + return [] throw new Error("HTTP " + response.status); } return response.json(); @@ -74,6 +76,8 @@ requestsMade = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/pending`) .then((response) => { if (!response.ok) { + if (response.status === 404) + return [] throw new Error("HTTP " + response.status); } return response.json(); @@ -88,6 +92,8 @@ requestsRecieved = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/received`) .then((response) => { if (!response.ok) { + if (response.status === 404) + return [] throw new Error("HTTP " + response.status); } return response.json(); @@ -102,6 +108,8 @@ blockedUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/blocked`) .then((response) => { if (!response.ok) { + if (response.status === 404) + return [] throw new Error("HTTP " + response.status); } return response.json(); @@ -118,23 +126,16 @@ friendshipStatusFull = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends?username=${aUsername}`) .then((response) => { if (!response.ok) { - console.log("response not ok : ") - console.log({...response}) - // throw new Error("HTTP " + response.status); + if (response.status === 404) + return [] + throw new Error("HTTP " + response.status); } - // else { - console.log("response ok : ") - console.log({...response}) return response.json(); - // } }) .catch((error) => { - console.log("catching things") console.log("catch fetchFriendshipFull: ", error); return []; }); - // console.log('friendshipFull: ') - // console.log({...friendshipStatusFull}) }; const sendFriendRequest = async (aUsername) => { @@ -303,17 +304,6 @@ await fetchAllUsers_Wrapper(); fetchFriendshipFull(usernameBeingViewed); } - - - // if (usernameBeingViewed) { - // let found = allUsers.find( - // (e) => e.username === usernameBeingViewed - // ); - // if (!found) { - // usernameBeingViewed = null; - // friendshipStatusFull = null; - // } - // } }; @@ -382,6 +372,8 @@
+ +
{#if usernameBeingViewed} diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index 1527b58e..46606ced 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -2,14 +2,14 @@ import { onMount } from 'svelte'; - import { fetchAvatar } from "./utils"; + import { fetchAvatar } from "./utils.js"; export let user; let rank = ''; let avatar; - // avatar needs to be updated!!! - console.log('Generate User Display user:') - console.log({...user}) + + // console.log('Generate User Display user:') + // console.log({...user}) // console.log(user) let errors = {avatar: ''}; @@ -23,8 +23,6 @@ $: user, updateAvatar(); - /**** THIS IS BASICALLY ALL THE RANK LOGIC ERIC HAS MADE ****/ - if (user.stats.loseGame > user.stats.winGame) { rank = "Come on, you can do better" } else if (user.stats.loseGame === user.stats.winGame) { @@ -64,12 +62,10 @@ - +
{#if user}
- - user avatar
{errors.avatar}
{user.username}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte b/srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte deleted file mode 100644 index e95fcc34..00000000 --- a/srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/srcs/requirements/svelte/api_front/src/pieces/utils.ts b/srcs/requirements/svelte/api_front/src/pieces/utils.ts index e193b039..91295b28 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/utils.ts +++ b/srcs/requirements/svelte/api_front/src/pieces/utils.ts @@ -47,6 +47,8 @@ export async function fetchAllUsers() return fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`) .then((response) => { if (!response.ok) { + if (response.status === 404) + return []; throw new Error("HTTP " + response.status); } return response.json(); diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js index eb0aa6c9..87af3079 100644 --- a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js +++ b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js @@ -12,11 +12,11 @@ import { fetchUser } from "../pieces/utils"; async function checkLogin(detail) { const user = await fetchUser(); if (!user || !user.username) { - console.log('failed to be logged in') + // console.log('failed to be logged in') return false; } else { - console.log('successfully logged in') + // console.log('successfully logged in') return true; } } From 86b8ab74a28a0eb684369801cc2cde98b9c7d93f Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 10:16:47 +0100 Subject: [PATCH 05/29] =?UTF-8?q?correction=20d'un=20appel=20non=20prot?= =?UTF-8?q?=C3=A9g=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nestjs/api_back/src/chat/chat.service.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts index a97d9004..8313583b 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts @@ -372,11 +372,14 @@ export class ChatService { async getListBlockUser(username: string): Promise { printCaller("-- in "); - + let users: string[] = []; let user = await this.getUserByName(username); - let friends_users = await this.friendshipService.findAllBlockedFriends(user.id); - let users = friends_users.map(user => user.receiverUsername); - + console.log("USERNAME CHAT SRVICE " + username); + let friends_users; + if (user) + friends_users = await this.friendshipService.findAllBlockedFriends(user.id); + if (friends_users) + users = friends_users.map(user => user.receiverUsername); printCaller("-- out "); return users; } From 86a507fdf61944b7505062a7bf73fdd2ea54f493 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 10:29:32 +0100 Subject: [PATCH 06/29] add a max lenght for username --- .../nestjs/api_back/src/users/dto/create-users.dto.ts | 3 ++- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts index 8b1a2529..9b61c95a 100644 --- a/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts +++ b/srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts @@ -1,10 +1,11 @@ -import { IsBoolean, Matches, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; +import { IsBoolean, Matches, MaxLength, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator'; import { isSet } from 'util/types'; export class CreateUsersDto { @IsString() @IsNotEmpty() @Matches(/^[a-zA-Z0-9'-_]+$/) + @MaxLength(50) readonly username: string; readonly fortyTwoId: string; @IsEmail() diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index f4fa2699..a5058dee 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -51,7 +51,7 @@ .then((response) => { if (!response.ok) { success.username = '' - errors.username = "Use [a-zA-Z0-9] and - _ ."; + errors.username = "Max length : 50 . Use [a-zA-Z0-9] and - _ ."; if (response.status === 409) { errors.username = `${set.username} is already in use, pick a different one.`; } From b4139283e153524f2bd0fcd11c44dde780852e10 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:08:34 +0100 Subject: [PATCH 07/29] different new username when another one exist at the first connection --- .../nestjs/api_back/src/auth/42/authentication.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts b/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts index b338ce7b..3d4098ac 100644 --- a/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts +++ b/srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts @@ -24,10 +24,12 @@ export class AuthenticationService { if (!check_name) return await this.userService.create(createUsersDto); let createUsersDtoWithUsername : CreateUsersDto = createUsersDto; + let i = 0; while (check_name === true) { - createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + randomUUID() }; + createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + '_' + i}; check_name = await this.userService.isUsernameExists(createUsersDtoWithUsername.username); + i++; } return this.userService.create(createUsersDtoWithUsername); } From 4c5580bbf36511482095529987087dd483c83bc9 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:19:43 +0100 Subject: [PATCH 08/29] =?UTF-8?q?rajout=20d'un=20texte=20de=20succes=20qui?= =?UTF-8?q?=20avait=20=C3=A9t=C3=A9=20enlev=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index a5058dee..426c7bb5 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -93,9 +93,11 @@ ) .then((response) => { if (!response.ok) { + success.avatar = '' errors.avatar = response.statusText; throw new Error("HTTP " + response.status); } + errors.avatar = '' uploadAvatarSuccess = true; success.avatar = 'Your avatar has been updated'; }) @@ -144,6 +146,7 @@
Pick a new Avatar
{errors.avatar}
+
{success.avatar}
From d9fc3b49be2850f07330d865c36764df5db2eab7 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 11:22:53 +0100 Subject: [PATCH 09/29] =?UTF-8?q?couleurs=20blanc=20sur=20blanc=20corrig?= =?UTF-8?q?=C3=A9es=20pour=20upload=20avatar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svelte/api_front/src/pages/profile/ProfileSettings.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index 426c7bb5..97f25816 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -192,6 +192,7 @@ .form-field { padding: 10px; + color: #333; } .label { From d8317350b0ed2a45ba117c60780c2c4ef5f83c37 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Tue, 17 Jan 2023 12:18:42 +0100 Subject: [PATCH 10/29] fix font load for canvas --- .../svelte/api_front/public/global.css | 10 ++++++++++ .../svelte/api_front/src/pages/game/Game.svelte | 17 +++++++++-------- .../src/pages/game/GameSpectator.svelte | 16 ++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/srcs/requirements/svelte/api_front/public/global.css b/srcs/requirements/svelte/api_front/public/global.css index 4a77fd07..25ba58a6 100644 --- a/srcs/requirements/svelte/api_front/public/global.css +++ b/srcs/requirements/svelte/api_front/public/global.css @@ -26,6 +26,16 @@ body { font-display: swap; } +@font-face { + font-family: "Bit5x3"; + src: + url("/fonts/Bit5x3.woff2") format("woff2"), + local("Bit5x3"), + url("/fonts/Bit5x3.woff") format("woff"); + font-weight: normal; + font-style: normal; + font-display: swap; +} a { color: rgb(0,100,200); diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index ccb4242a..855ef0c4 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -390,19 +390,20 @@ {/if} {/if} +
.
+
From 44f9f8e21b2874a1802fe9eed30d1a6ad2f6463e Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Tue, 17 Jan 2023 14:31:20 +0100 Subject: [PATCH 12/29] Game page CSS adjustements and hidden header. --- .../svelte/api_front/src/App.svelte | 15 ++-- .../api_front/src/pages/game/Game.svelte | 47 +++++++----- .../src/pages/game/GameSpectator.svelte | 74 ++++++++++++------- .../api_front/src/pieces/store_showHeader.ts | 4 + 4 files changed, 88 insertions(+), 52 deletions(-) create mode 100644 srcs/requirements/svelte/api_front/src/pieces/store_showHeader.ts diff --git a/srcs/requirements/svelte/api_front/src/App.svelte b/srcs/requirements/svelte/api_front/src/App.svelte index 9c848f74..f69889fe 100644 --- a/srcs/requirements/svelte/api_front/src/App.svelte +++ b/srcs/requirements/svelte/api_front/src/App.svelte @@ -4,18 +4,17 @@ import { location } from 'svelte-spa-router'; import Chat from './pieces/chat/Chat.svelte'; import Header from './pieces/Header.svelte'; + import { showHeader } from './pieces/store_showHeader'; - const conditionsFailed = (event) => { - console.error('conditionsFailed event', event.detail); - // i mean i guess i can just leave this in there permanently? - - // replace('/unauthorized-access'); - replace('/'); - }; + const conditionsFailed = (event) => { + console.error('conditionsFailed event', event.detail); + // replace('/unauthorized-access'); + replace('/'); + }; -{#if ($location !== '/')} +{#if ($location !== '/' && $showHeader)}
{/if} diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index 855ef0c4..d02e162d 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -9,6 +9,7 @@ import { gameState } from "./client/ws"; import { invited_username } from '../../pieces/store_invitation'; + import { showHeader } from '../../pieces/store_showHeader'; //user's stuff let user; @@ -61,6 +62,7 @@ clearTimeout(value); }); pong.destroy(); + setHiddenGame(true); }) function resetPage() { @@ -73,6 +75,12 @@ pong.destroy(); }; + function leaveMatch() { + clearInterval(watchMatchStartInterval); + clearInterval(watchGameStateInterval); + resetPage(); + }; + const initGame = async() => { showWaitPage = true; @@ -239,20 +247,18 @@ }); } - function leaveMatch() { - clearInterval(watchMatchStartInterval); - clearInterval(watchGameStateInterval); - resetPage(); - }; - let game_page_class = ""; function setHiddenGame(value: boolean) { - if (value) { + if (value === true) { game_page_class = ""; + window.document.body.classList.remove('dim_background'); + showHeader.set(true); } else { game_page_class = "dim_background"; + window.document.body.classList.add('dim_background'); + showHeader.set(false); } hiddenGame = value; } @@ -323,7 +329,7 @@ {#if hiddenGame} {#if showGameOptions}
- +
game options @@ -370,7 +376,7 @@ {#if showInvitations}
- +
invitations @@ -408,6 +414,10 @@ background-color: #222; } +:global(body.dim_background) { + background-color: #222; +} + #game_page { margin: 0; position: relative; @@ -418,8 +428,9 @@ flex-grow: 1; } -#game_options, #game_invitations { - margin-top: 20px; +.game_options_button { + margin-top: 15px; + margin-bottom: 15px; } #canvas_container { @@ -430,11 +441,9 @@ /* overflow: hidden; */ } canvas { - /* background-color: #ff0000; */ - background-color: #333; - max-width: 75vw; font-family: "Bit5x3"; - /* max-height: 100vh; */ + background-color: #333; + max-width: 65vw; width: 80%; } @@ -460,10 +469,10 @@ canvas { padding: 10px; } .avatar { - min-height: 100px; - min-width: 100px; + min-height: 5vw; + min-width: 5vw; - max-width: 100px; - max-height: 100px; + max-width: 5vw; + max-height: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte index fc37f8c0..17f5245f 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte @@ -10,6 +10,8 @@ import * as pongSpectator from "./client/pongSpectator"; import { gameState } from "./client/ws"; + import { showHeader } from '../../pieces/store_showHeader'; + let playerOneAvatar = ""; let playerTwoAvatar = ""; @@ -26,7 +28,7 @@ let timeoutArr = []; onMount( async() => { - matchList = await fetchMatchList(); + await fetchMatchList(); }) onDestroy( async() => { @@ -35,8 +37,20 @@ clearTimeout(value); }); pongSpectator.destroy(); + setHiddenGame(true); }) + async function resetPage() { + setHiddenGame(true); + pongSpectator.destroy(); + await fetchMatchList(); + }; + + function leaveMatch() { + clearInterval(watchGameStateInterval); + resetPage(); + }; + async function initGameSpectator(match: Match) { watchGameStateInterval = setInterval(watchGameState, watchGameStateIntervalRate); @@ -68,20 +82,9 @@ } } - function leaveMatch() { - clearInterval(watchGameStateInterval); - resetPage(); - }; - - async function resetPage() { - setHiddenGame(true); - pongSpectator.destroy(); - matchList = await fetchMatchList(); - }; - async function fetchMatchList() { - return fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/match/all`) + matchList = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/match/all`) .then((response) => { if (!response.ok) { throw new Error("All matchs not retrieved"); @@ -100,11 +103,15 @@ let game_page_class = ""; function setHiddenGame(value: boolean) { - if (value) { + if (value === true) { game_page_class = ""; + window.document.body.classList.remove('dim_background'); + showHeader.set(true); } else { game_page_class = "dim_background"; + window.document.body.classList.add('dim_background'); + showHeader.set(false); } hiddenGame = value; } @@ -145,7 +152,7 @@ {#if hiddenGame} -
+
options @@ -194,14 +201,34 @@ background-color: #222; } -#game_page { +:global(body.dim_background) { + background-color: #222; +} + +/* Possible rollback, demander à Hugo */ +/* #game_page { margin: 0; padding: 20px; position: relative; width: 100%; height: 100%; box-sizing: border-box; +} */ +#game_page { + margin: 0; + position: relative; + width: 100%; + height: auto; + display: flex; + flex-direction: column; + flex-grow: 1; } + +.game_options { + margin-top: 15px; + margin-bottom: 15px; +} + #canvas_container { margin-top: 20px; text-align: center; @@ -210,14 +237,11 @@ /* overflow: hidden; */ } canvas { - /* background-color: #ff0000; */ - background-color: #333333; - max-width: 75vw; font-family: "Bit5x3"; - /* max-height: 100vh; */ + background-color: #333; + max-width: 65vw; width: 80%; } - .div_game { text-align: center; font-family: "PressStart2P"; @@ -244,10 +268,10 @@ canvas { font-size: 1vw; } .avatar { - min-height: 100px; - min-width: 100px; + min-height: 5vw; + min-width: 5vw; - max-width: 100px; - max-height: 100px; + max-width: 5vw; + max-height: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pieces/store_showHeader.ts b/srcs/requirements/svelte/api_front/src/pieces/store_showHeader.ts new file mode 100644 index 00000000..cd33edb0 --- /dev/null +++ b/srcs/requirements/svelte/api_front/src/pieces/store_showHeader.ts @@ -0,0 +1,4 @@ + +import { writable } from 'svelte/store'; + +export const showHeader = writable(true); From 1e215261aa43835b8294805d81d21b4d9daa8cfe Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 15:41:48 +0100 Subject: [PATCH 13/29] fixing ProfileUser CSS and adding delete account button, in progress --- .../src/friendship/friendship.service.ts | 18 +++++++ .../src/users/entities/user.entity.ts | 6 +-- .../api_back/src/users/users.controller.ts | 12 +++-- .../api_back/src/users/users.service.ts | 21 ++++++-- .../src/pages/profile/ProfileSettings.svelte | 19 +++++++ .../src/pages/profile/ProfileUsers.svelte | 52 +++++++++++++++++-- .../api_front/src/pieces/clickOutside.ts | 15 ++++++ 7 files changed, 128 insertions(+), 15 deletions(-) create mode 100644 srcs/requirements/svelte/api_front/src/pieces/clickOutside.ts diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts index d0aba0ab..3d763f05 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts @@ -334,6 +334,24 @@ export class FriendshipService { return this.friendshipRepository.remove(friendship); } + async deleteAllFriendships(user : User) { + let friendships = await this.friendshipRepository + .createQueryBuilder('friendship') + .leftJoinAndSelect('friendship.sender', 'sender') + .leftJoinAndSelect('friendship.receiver', 'receiver') + .where('friendship.sender = :sender', { sender: user }) + .orWhere('friendship.receiver = :receiver', { receiver: user}) + .getMany() + + // return this.friendshipRepository.remove(friendships); + // return this.friendshipRepository.delete(friendships); + + for (const friendship of friendships) { + this.friendshipRepository.remove(friendship); + } + return true; + } + async findIfUserIsBlockedOrHasBlocked(userConnectedId: number, userToFindId: number) { // console.log("finding if user is blocked") // console.log('user connected: ' + userConnectedId) diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts index c25401cf..b1f1934c 100644 --- a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts +++ b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts @@ -43,14 +43,14 @@ export class User { @Column({ nullable: true }) secretTwoFactorAuth: string; - @OneToMany(type => Friendship , (friendship) => friendship.sender) + @OneToMany(type => Friendship , (friendship) => friendship.sender, { onDelete: 'CASCADE' }) sentFriendRequest: Friendship[]; - @OneToMany(type => Friendship , (friendship) => friendship.receiver) + @OneToMany(type => Friendship , (friendship) => friendship.receiver, { onDelete: 'CASCADE' }) receivedFriendRequest: Friendship[]; @JoinColumn() - @OneToOne(() => UserStats, { cascade: true }) + @OneToOne(() => UserStats, { cascade: true, onDelete: 'CASCADE' }) stats: UserStats; // ROOMS : diff --git a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts index 0db08095..163a0d90 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts @@ -1,5 +1,5 @@ import { - Body, Controller, Delete, Get, NotFoundException,HttpStatus, Param, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors + Body, Controller, Delete, Get, NotFoundException,HttpStatus, Param, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors, Next, } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { Response } from 'express'; @@ -73,8 +73,14 @@ export class UsersController { @UseGuards(AuthenticateGuard) @UseGuards(TwoFactorGuard) @Delete() - remove(@Req() req) { - return this.usersService.remove(req.user.id); + remove(@Req() request, @Res() response, @Next() next) { + this.usersService.remove(request.user.id); + request.logout(function(err) { + if (err) { return next(err); } + response.redirect('/'); + }); + request.session.cookie.maxAge = 0; + return {msg : 'You have deleted your account'}; } diff --git a/srcs/requirements/nestjs/api_back/src/users/users.service.ts b/srcs/requirements/nestjs/api_back/src/users/users.service.ts index 680075da..cd3998c6 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.service.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.service.ts @@ -113,10 +113,23 @@ export class UsersService { } async remove(id: number) { - const user = await this.userRepository.findOneBy({id: id}); - if (!user) - throw new HttpException(`The user could not be deleted.`,HttpStatus.NOT_FOUND); - return this.userRepository.remove(user); + console.log("deleting a user user.services") + // const user = await this.userRepository.findOneBy({id: id}); + // if (!user) + // throw new HttpException(`The user could not be deleted.`,HttpStatus.NOT_FOUND); + + let deleting = await this.userRepository + .createQueryBuilder() + .delete() + .from(User) + .where("user.id = :id", { id: id }) + .execute(); + + // this.friendshipService.deleteAllFriendships(user) + // return this.userRepository.remove(user.id); + console.log("done delete user users.service") + // await this.userRepository.delete(user); + } async enableTwoFactorAuth(id: number) { diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index 97f25816..ea6cd16a 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -108,6 +108,24 @@ avatar = await fetchAvatar(user.username); } + const deleteAccount = async() => { + console.log("deleting account") + await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`, { + method: "DELETE", + }) + .then((response) => { + if (!response.ok) { + throw new Error("HTTP " + response.status); + } + console.log("account deleted") + push('/'); + }) + .catch((error) => { + console.log("catch unable to delete: ", error); + }); + } + + @@ -152,6 +170,7 @@
+
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 944bfba3..554f7fee 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -6,6 +6,7 @@ import Tabs from "../../pieces/Tabs.svelte"; import { fetchUser, fetchAllUsers, fetchAvatar } from "../../pieces/utils"; + import { clickOutside } from '../../pieces/clickOutside' let user; let allUsers = []; @@ -26,6 +27,10 @@ let activeTabItem: string = "All Users"; let loadedUser; + let showModal = false; + + + onMount(async () => { user = await fetchUser(); @@ -166,8 +171,13 @@ const viewAUser = async (aUsername) => { usernameBeingViewed = aUsername; await fetchFriendshipFull(aUsername); + showModal = true; }; + const unViewAUser = () => { + showModal = false; + } + const acceptFriendRequest = async (relationshipId) => { await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/relations/${relationshipId}/accept`, { @@ -410,8 +420,9 @@ -
- {#if usernameBeingViewed} + {#if showModal && usernameBeingViewed} +
unViewAUser()}> + {#if loadedUser === true} @@ -453,9 +464,11 @@

Click on a user!

You'll see them displayed here

--> - {/if} + +
+ {/if}
@@ -465,8 +478,8 @@ /* ok so i want a 12 column grid with a sidebar */ div.top-grid{ - display: grid; - grid-template-columns: repeat(8, 1fr); + /* display: grid; */ + /* grid-template-columns: repeat(8, 1fr); */ /* max-height: calc(100vh - 30vh); */ height: 85vh; /* margin: 0; */ @@ -545,5 +558,34 @@ width: 60px; } + /* Modal Stuff */ + + .box { + --width: 70vw; + --height: 60vh; + position: absolute; + width: var(--width); + height: var(--height); + left: calc(50% - var(--width) / 2); + top: calc(50% - var(--height) / 2); + display: flex; + align-items: center; + padding: 8px; + border-radius: 7px; + /* background-color: #ff3e00; */ + /* color: #fff; */ + text-align: center; + font-weight: bold; + } + + .backdrop { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + background: rgba(0,0,0,0.50) + } + diff --git a/srcs/requirements/svelte/api_front/src/pieces/clickOutside.ts b/srcs/requirements/svelte/api_front/src/pieces/clickOutside.ts new file mode 100644 index 00000000..5998a482 --- /dev/null +++ b/srcs/requirements/svelte/api_front/src/pieces/clickOutside.ts @@ -0,0 +1,15 @@ +export function clickOutside(node) { + const handleClick = (event) => { + if (!node.contains(event.target)) { + node.dispatchEvent(new CustomEvent("outclick")); + } + }; + + document.addEventListener("click", handleClick, true); + + return { + destroy() { + document.removeEventListener("click", handleClick, true); + } + }; +} \ No newline at end of file From c2812c05343ab3dd1672221e4a709999b727229f Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 15:57:43 +0100 Subject: [PATCH 14/29] fucking DELETE method for account is now working and existing --- .../nestjs/api_back/src/chat/chat.service.ts | 3 ++- .../api_back/src/users/entities/user.entity.ts | 6 +++--- .../api_back/src/users/users.controller.ts | 12 +++++++++--- .../src/pages/profile/ProfileSettings.svelte | 18 ++++++++++++++++++ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts index 8313583b..dc314cc2 100644 --- a/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts +++ b/srcs/requirements/nestjs/api_back/src/chat/chat.service.ts @@ -146,7 +146,8 @@ export class ChatService { const user_db = await this.getUserByName(username); printCaller("-- out "); - return user_db.currentRoom; + if (user_db) + return user_db.currentRoom; } async getRoomByName(room_name: string, fieldsToReturn: string[] = null): Promise diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts index c25401cf..24a268be 100644 --- a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts +++ b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts @@ -43,14 +43,14 @@ export class User { @Column({ nullable: true }) secretTwoFactorAuth: string; - @OneToMany(type => Friendship , (friendship) => friendship.sender) + @OneToMany(type => Friendship , (friendship) => friendship.sender, {onDelete: 'CASCADE'}) sentFriendRequest: Friendship[]; - @OneToMany(type => Friendship , (friendship) => friendship.receiver) + @OneToMany(type => Friendship , (friendship) => friendship.receiver, {onDelete: 'CASCADE'}) receivedFriendRequest: Friendship[]; @JoinColumn() - @OneToOne(() => UserStats, { cascade: true }) + @OneToOne(() => UserStats, { cascade: true, onDelete: 'CASCADE' }) stats: UserStats; // ROOMS : diff --git a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts index 0db08095..a1b91bc3 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts @@ -1,5 +1,5 @@ import { - Body, Controller, Delete, Get, NotFoundException,HttpStatus, Param, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors + Body, Controller, Delete, Get, NotFoundException,HttpStatus, Next, Patch, Post, Query, Redirect, Req, Res, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { Response } from 'express'; @@ -73,8 +73,14 @@ export class UsersController { @UseGuards(AuthenticateGuard) @UseGuards(TwoFactorGuard) @Delete() - remove(@Req() req) { - return this.usersService.remove(req.user.id); + remove(@Req() req, @Res() response, @Next() next) { + this.usersService.remove(req.user.id); + req.logout(function(err) { + if (err) { return next(err); } + response.redirect('/'); + }); + req.session.cookie.maxAge = 0; + return {msg : 'Your account has been deleted'}; } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index 97f25816..eb7e226e 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -108,6 +108,23 @@ avatar = await fetchAvatar(user.username); } + const deleteAccount = async() => { + console.log("deleting account") + await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user`, { + method: "DELETE", + }) + .then((response) => { + if (!response.ok) { + throw new Error("HTTP " + response.status); + } + console.log("account deleted") + push('/'); + }) + .catch((error) => { + console.log("catch unable to delete: ", error); + }); + } + @@ -152,6 +169,7 @@
+ From f3ed25a4e951f77eab4ae1a304260874b32b66b3 Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 16:19:12 +0100 Subject: [PATCH 15/29] correction d'un bug pour les friendship --- .../api_back/src/friendship/entities/friendship.entity.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/friendship/entities/friendship.entity.ts b/srcs/requirements/nestjs/api_back/src/friendship/entities/friendship.entity.ts index 4d25f813..722de918 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/entities/friendship.entity.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/entities/friendship.entity.ts @@ -17,10 +17,10 @@ export class Friendship { @CreateDateColumn() date : Date; - @ManyToOne(type => User, user => user.username) + @ManyToOne(type => User, user => user.username, {onDelete: 'CASCADE'}) sender: User; - @ManyToOne(type => User, user => user.username) + @ManyToOne(type => User, user => user.username, {onDelete: 'CASCADE'}) receiver: User; @Column({ type: 'enum', enum: FriendshipStatus, default: FriendshipStatus.REQUESTED}) From 053c630a959e2d5bb74245e552eb22dec0209be4 Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 16:35:17 +0100 Subject: [PATCH 16/29] back to working on ProfileUser CSS --- .../src/friendship/friendship.service.ts | 18 -------------- .../api_back/src/users/users.service.ts | 21 ++++------------ .../src/pages/profile/ProfileUsers.svelte | 24 +++++++++++++------ 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts index 3d763f05..d0aba0ab 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts @@ -334,24 +334,6 @@ export class FriendshipService { return this.friendshipRepository.remove(friendship); } - async deleteAllFriendships(user : User) { - let friendships = await this.friendshipRepository - .createQueryBuilder('friendship') - .leftJoinAndSelect('friendship.sender', 'sender') - .leftJoinAndSelect('friendship.receiver', 'receiver') - .where('friendship.sender = :sender', { sender: user }) - .orWhere('friendship.receiver = :receiver', { receiver: user}) - .getMany() - - // return this.friendshipRepository.remove(friendships); - // return this.friendshipRepository.delete(friendships); - - for (const friendship of friendships) { - this.friendshipRepository.remove(friendship); - } - return true; - } - async findIfUserIsBlockedOrHasBlocked(userConnectedId: number, userToFindId: number) { // console.log("finding if user is blocked") // console.log('user connected: ' + userConnectedId) diff --git a/srcs/requirements/nestjs/api_back/src/users/users.service.ts b/srcs/requirements/nestjs/api_back/src/users/users.service.ts index cd3998c6..680075da 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.service.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.service.ts @@ -113,23 +113,10 @@ export class UsersService { } async remove(id: number) { - console.log("deleting a user user.services") - // const user = await this.userRepository.findOneBy({id: id}); - // if (!user) - // throw new HttpException(`The user could not be deleted.`,HttpStatus.NOT_FOUND); - - let deleting = await this.userRepository - .createQueryBuilder() - .delete() - .from(User) - .where("user.id = :id", { id: id }) - .execute(); - - // this.friendshipService.deleteAllFriendships(user) - // return this.userRepository.remove(user.id); - console.log("done delete user users.service") - // await this.userRepository.delete(user); - + const user = await this.userRepository.findOneBy({id: id}); + if (!user) + throw new HttpException(`The user could not be deleted.`,HttpStatus.NOT_FOUND); + return this.userRepository.remove(user); } async enableTwoFactorAuth(id: number) { diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 554f7fee..805e77d6 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -330,7 +330,7 @@
{#if activeTabItem === 'All Users' && allUsers} -

{activeTabItem}

+ {#if Object.keys(allUsers).length === 0}
You are alone on this platform...
{/if} @@ -355,7 +355,7 @@
{/each} {:else if activeTabItem === 'My Friends' && myFriendships} -

{activeTabItem}

+ {#if Object.keys(myFriendships).length === 0}
You don't have any Friends... Yet!
{/if} @@ -380,7 +380,7 @@
{/each} {:else if activeTabItem === 'Friend Requests' && requestsRecieved} -

{activeTabItem}

+ {#if Object.keys(requestsRecieved).length === 0}
You don't have any Friend Requests
{/if} @@ -397,8 +397,7 @@
{/each} {:else if activeTabItem === 'Blocked Users' && blockedUsers} -

{activeTabItem}

- + {#if Object.keys(blockedUsers).length === 0}
You have not Blocked any Users
{/if} @@ -421,7 +420,8 @@ {#if showModal && usernameBeingViewed} -
unViewAUser()}> +
+
unViewAUser()}> @@ -502,7 +502,7 @@ div.sidebar-list{ /* grid-column: 1 / span 2; */ - grid-column: 3 / span 4; + /* grid-column: 3 / span 4; */ background: #FB8B24; padding: 1vw; font-size: smaller; @@ -514,6 +514,7 @@ border-right: 4px solid #071013; border-bottom: 4px solid #071013; overflow-wrap: break-word; + text-align: center; } @@ -521,6 +522,7 @@ /* yea i mean that seems fine... */ display: inline-block; text-align: center; + /* somehting about the buttons too, smaller ? */ } div.status{ @@ -558,6 +560,14 @@ width: 60px; } + div.user { + /* left: 50%; + display: inline-block; + -ms-transform: translateX(-50%); + transform: translateY(-50%); */ + } + + /* Modal Stuff */ .box { From 715fce65af0c612c4a805cad9b4d3d351af5e349 Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 18:03:51 +0100 Subject: [PATCH 17/29] much better ProfileUser CSS, not perfect by any stretch, but i don't absolutly hate it anymore, slightly better Tab responsiveness, oh and i added a pop of color --- .../src/pages/profile/ProfileSettings.svelte | 1 + .../src/pages/profile/ProfileUsers.svelte | 112 +++++++----------- .../src/pieces/GenerateUserDisplay.svelte | 3 +- .../svelte/api_front/src/pieces/Header.svelte | 6 + .../svelte/api_front/src/pieces/Tabs.svelte | 36 ++++-- 5 files changed, 80 insertions(+), 78 deletions(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte index eb7e226e..9d84d680 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -191,6 +191,7 @@ grid-template-columns: 1fr 1fr; grid-gap: 20px; /* text-align: center; */ + margin-bottom: 10px; } img { diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 805e77d6..34a8a6cb 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -321,16 +321,15 @@ -
+
-
- +
+ {#if activeTabItem === 'All Users' && allUsers} - {#if Object.keys(allUsers).length === 0}
You are alone on this platform...
{/if} @@ -355,7 +354,6 @@
{/each} {:else if activeTabItem === 'My Friends' && myFriendships} - {#if Object.keys(myFriendships).length === 0}
You don't have any Friends... Yet!
{/if} @@ -380,7 +378,6 @@
{/each} {:else if activeTabItem === 'Friend Requests' && requestsRecieved} - {#if Object.keys(requestsRecieved).length === 0}
You don't have any Friend Requests
{/if} @@ -397,7 +394,6 @@
{/each} {:else if activeTabItem === 'Blocked Users' && blockedUsers} - {#if Object.keys(blockedUsers).length === 0}
You have not Blocked any Users
{/if} @@ -417,12 +413,9 @@
- - {#if showModal && usernameBeingViewed}
-
unViewAUser()}> - +
unViewAUser()}> {#if loadedUser === true} @@ -459,18 +452,10 @@ {/if}
{/if} - - -
{/if}
-
diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index 691fa01a..ca1aa0c4 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -91,7 +91,7 @@

Match Statistics

-

Victories: {user.stats.winGame}

+

Wins: {user.stats.winGame}

Losses: {user.stats.loseGame}

Draws: {user.stats.drawGame}

Total: {user.stats.totalGame}

@@ -119,6 +119,7 @@ /* Normal CSS stuff */ .avatar{ max-width: 150px; + /* width: 1em; */ /* padding: 5px; */ } diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte index 7949e05f..59b67f75 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte @@ -100,4 +100,10 @@ max-width: 10%; float: left; } + + button:hover{ + cursor: pointer; + background-color: rgb(0, 166, 255) !important; + } + diff --git a/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte b/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte index a91f903e..384cc84e 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte @@ -3,7 +3,7 @@ export let items; export let activeItem; export let size = 'medium'; - // big, medium, small + // big, medium, small, default (responsive) const dispatch = createEventDispatcher(); @@ -11,11 +11,9 @@
-
    {#each items as item}
  • dispatch('tabChange', item)}> -
    {item}
    • {/each} @@ -23,9 +21,7 @@
\ No newline at end of file From 88188d397f0118a54d0a6724060768bc5acc37bf Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 18:32:03 +0100 Subject: [PATCH 18/29] tiny bug fix to if successfully loaded a user --- .../api_front/src/pages/profile/ProfileUsers.svelte | 8 -------- .../svelte/api_front/src/pieces/DisplayAUser.svelte | 4 +++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index 34a8a6cb..bbb5b9af 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -333,22 +333,14 @@ {#if Object.keys(allUsers).length === 0}
You are alone on this platform...
{/if} - - - {#each allUsers as aUser}
viewAUser(aUser.username)}> - - {#await fetchAvatar(aUser.username) then avatar} user avatar {:catch error}

Avatar was unable to load

{/await}
{aUser.username}
-
{aUser.status}

diff --git a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte index bb728bd7..e2729788 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte @@ -9,17 +9,19 @@ let aUser; onMount( async() => { + loaded = false; aUser = await fetchUser(aUsername); }) const updateUser = async(aUsername) => { + loaded = false; aUser = await fetchUser(aUsername); }; $: aUsername, updateUser(aUsername); $: { - if (aUser === undefined) + if (!aUser) loaded = false; else loaded = true; From 1dc3ce85173c0db54e646de668ddc010afb1e4d7 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Tue, 17 Jan 2023 19:03:34 +0100 Subject: [PATCH 19/29] gameServer bugfix. BUG: In case of all the players leave Nest server never know match ended FIX: Now alway send matchEnd to Nest. --- .../game_back/src/server/class/GameSession.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcs/requirements/game_server/game_back/src/server/class/GameSession.ts b/srcs/requirements/game_server/game_back/src/server/class/GameSession.ts index 830d0844..542e763e 100644 --- a/srcs/requirements/game_server/game_back/src/server/class/GameSession.ts +++ b/srcs/requirements/game_server/game_back/src/server/class/GameSession.ts @@ -80,6 +80,10 @@ export class GameSession { s.pause(); + if (!s.matchEnded) { + s._matchEnd(en.PlayerSide.noSide, true); + } + s.spectatorsMap.forEach((client) => { clientTerminate(client); }); @@ -224,7 +228,6 @@ export class GameSession { { if (this.playersMap.size !== 2) { - this.matchEnded = true; if (this.playersMap.size != 0) { this._forfeit(); } @@ -237,7 +240,6 @@ export class GameSession { } private _forfeit() { - this.matchEnded = true; console.log("Forfeit Ending"); const gc = this.components; const luckyWinner: ClientPlayer = this.playersMap.values().next().value; @@ -307,8 +309,11 @@ export class GameSession { if (winner === en.PlayerSide.left) { console.log("Player Left WIN"); } - else { + else if (winner === en.PlayerSide.right) { console.log("Player Right WIN"); } + else { + console.log("Match end Draw"); + } } } From 11f54bde83de90839cf75cabbce1745adcd0f90d Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 19:17:45 +0100 Subject: [PATCH 20/29] fixed another small bug in ProfileUsers, improved avatar fetch error messages display, and found a new way and prolly better way to reactively load fetch things when a variable changes, await rather than onMount + a unpdate function --- .../src/pages/profile/ProfileUsers.svelte | 74 +++++++------------ .../src/pieces/GenerateUserDisplay.svelte | 34 ++++----- .../svelte/api_front/src/pieces/utils.ts | 1 + 3 files changed, 42 insertions(+), 67 deletions(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index bbb5b9af..c0f1f395 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -15,7 +15,6 @@ let blockedUsers = []; let usernameBeingViewed; let friendshipStatusFull; // date, reveiverUsername, status - // let errors = {avatar: ''}; /**** Layout variables ****/ let tabItems: string[] = [ @@ -321,12 +320,8 @@ -
- -
{#if activeTabItem === 'All Users' && allUsers} @@ -338,7 +333,7 @@ {#await fetchAvatar(aUser.username) then avatar} user avatar {:catch error} -

Avatar was unable to load

+

Avatar was unable to load

{/await}
{aUser.username}
{aUser.status}
@@ -350,23 +345,25 @@
You don't have any Friends... Yet!
{/if} {#each myFriendships as aFriendship} -
viewAUser(aFriendship.receiverUsername)}> {#if aFriendship.senderUsername !== user.username} - {#await fetchAvatar(aFriendship.senderUsername) then avatar} - user avatar - {:catch error} -

Avatar was unable to load

- {/await} -
viewAUser(aFriendship.senderUsername)}>{aFriendship.senderUsername}
+
viewAUser(aFriendship.senderUsername)}> + {#await fetchAvatar(aFriendship.senderUsername) then avatar} + user avatar + {:catch error} +

Avatar was unable to load

+ {/await} +
{aFriendship.senderUsername}
+
{:else if aFriendship.receiverUsername !== user.username} - {#await fetchAvatar(aFriendship.receiverUsername) then avatar} - user avatar - {:catch error} -

Avatar was unable to load

- {/await} -
{aFriendship.receiverUsername}
+
viewAUser(aFriendship.receiverUsername)}> + {#await fetchAvatar(aFriendship.receiverUsername) then avatar} + user avatar + {:catch error} +

Avatar was unable to load

+ {/await} +
{aFriendship.receiverUsername}
+
{/if} -

{/each} {:else if activeTabItem === 'Friend Requests' && requestsRecieved} @@ -378,7 +375,7 @@ {#await fetchAvatar(aUser.senderUsername) then avatar} user avatar {:catch error} -

Avatar was unable to load

+

Avatar was unable to load

{/await}
{aUser.senderUsername}
{aUser.status}
@@ -394,11 +391,11 @@ {#await fetchAvatar(aUser.receiverUsername) then avatar} user avatar {:catch error} -

Avatar was unable to load

+

Avatar was unable to load

{/await}
{aUser.receiverUsername}
{aUser.status}
-
+

{/each} {/if} @@ -452,21 +449,7 @@ diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index ca1aa0c4..058a4f70 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -1,28 +1,10 @@ -

2FA Sign In

use google authenticator

{#await fetchQrCodeImg}

Please Wait...

{:then data} - A QRCodeImg you must scan with google authenticator
{#if wrongCode} -
{wrongCode}
@@ -83,18 +79,13 @@ \ No newline at end of file diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index 058a4f70..198d19f0 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -3,7 +3,6 @@ export let user; let rank = ''; - let avatar; if (user.stats.loseGame > user.stats.winGame) { rank = "Come on, you can do better" @@ -47,13 +46,11 @@
{#if user}
- {#await fetchAvatar(user.username) then avatar} user avatar {:catch error}

Avatar was unable to load

{/await} -
{user.username}
Rank: @@ -102,11 +99,8 @@ text-align: center; } -/* Normal CSS stuff */ .avatar{ max-width: 150px; - /* width: 1em; */ - /* padding: 5px; */ } /* The variable rich section */ @@ -114,10 +108,8 @@ max-width: 600px; margin: 40px auto; text-align: center; - /* i think i want to use a grid? */ display: grid; grid-template-columns: repeat(3, 1fr); - /* not sure about this, maybe top should be larger? */ grid-template-rows: repeat(3, 1fr); } @@ -139,12 +131,6 @@ font-weight: bold; } - .error{ - font-size: 1vw; - font-weight: bold; - color: red; - } - .errorA{ font-size: 0.5em; font-weight: bold; @@ -173,8 +159,6 @@ } - - /* Glittery Star Stuff */ diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte index 59b67f75..66fef6e1 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte @@ -2,11 +2,6 @@ import { push } from "svelte-spa-router"; import { location } from 'svelte-spa-router'; - - // no need, it's just for links - import active from 'svelte-spa-router/active' - // or i could leave them all and not display if they're active? - $: current = $location; let handleClickLogout = async () => diff --git a/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte b/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte index 384cc84e..3f749189 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Tabs.svelte @@ -24,7 +24,6 @@ .tab.big{ margin-bottom: 50px; - /* guessing at size */ } .tab.medium{ margin-bottom: 40px; @@ -32,7 +31,6 @@ } .tab.small{ margin-bottom: 10px; - /* need it small */ } ul{ display: flex; @@ -41,15 +39,12 @@ list-style-type: none; } li{ - /* margin: 0 16px; */ - /* font-size: 18px; */ color: #555; cursor: pointer; } li.big{ margin: 0 20px; font-size: 22px; - /* guessing at size */ } li.medium{ margin: 0 16px; @@ -59,7 +54,6 @@ li.small{ margin: 8px; font-size: 10px; - /* need it small */ } .active{ @@ -79,7 +73,6 @@ li.default{ margin: 0 16px; font-size: 18px; - /* the OG size */ } @media screen and (max-width: 700px) { @@ -93,5 +86,4 @@ } } - \ No newline at end of file diff --git a/srcs/requirements/svelte/api_front/src/pieces/utils.ts b/srcs/requirements/svelte/api_front/src/pieces/utils.ts index 225b8dd1..91295b28 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/utils.ts +++ b/srcs/requirements/svelte/api_front/src/pieces/utils.ts @@ -6,7 +6,6 @@ export async function fetchAvatar(username?: string) url += `?username=${username}`; } - // throw new Error("HTTP ") return fetch(url) .then((response) => { if (!response.ok) { diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js index 87af3079..9bd7b912 100644 --- a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js +++ b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js @@ -12,11 +12,9 @@ import { fetchUser } from "../pieces/utils"; async function checkLogin(detail) { const user = await fetchUser(); if (!user || !user.username) { - // console.log('failed to be logged in') return false; } else { - // console.log('successfully logged in') return true; } } diff --git a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js index dd0dfb19..510548ed 100644 --- a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js +++ b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js @@ -5,8 +5,6 @@ import ProfileSettings from '../pages/profile/ProfileSettings.svelte'; import ProfileUsers from '../pages/profile/ProfileUsers.svelte'; import ProfileDisplayOneUser from "../pages/profile/ProfileDisplayOneUser.svelte"; -import DisplayAUser from '../pieces/DisplayAUser.svelte'; - // establishing the prefix here very clearly so we can have a coherent repeatable structure export const prefix = '/profile'; @@ -15,6 +13,5 @@ export const profileRoutes = { '/settings': ProfileSettings, '/users': ProfileUsers, '/users/:username': ProfileDisplayOneUser, - // '/users/:username': DisplayAUser, '*': NotFound }; From d0395a6d3868452771dd2bb8de86ea6f88f06a25 Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 21:41:41 +0100 Subject: [PATCH 24/29] renamed the frontend routing to be TS not JS, works just fine --- .../api_front/src/routes/{primaryRoutes.js => primaryRoutes.ts} | 0 .../api_front/src/routes/{profileRoutes.js => profileRoutes.ts} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename srcs/requirements/svelte/api_front/src/routes/{primaryRoutes.js => primaryRoutes.ts} (100%) rename srcs/requirements/svelte/api_front/src/routes/{profileRoutes.js => profileRoutes.ts} (100%) diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.ts similarity index 100% rename from srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js rename to srcs/requirements/svelte/api_front/src/routes/primaryRoutes.ts diff --git a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.ts similarity index 100% rename from srcs/requirements/svelte/api_front/src/routes/profileRoutes.js rename to srcs/requirements/svelte/api_front/src/routes/profileRoutes.ts From 78c588a8885347dee20994885b5c7a7d7ec20532 Mon Sep 17 00:00:00 2001 From: Me Date: Tue, 17 Jan 2023 22:04:41 +0100 Subject: [PATCH 25/29] brainstorming how to display match history in the front --- .../svelte/api_front/src/pages/profile/ProfileDisplay.svelte | 1 + .../api_front/src/pages/profile/ProfileDisplayOneUser.svelte | 1 + .../svelte/api_front/src/pages/profile/ProfileUsers.svelte | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte index 8553e32b..f351e1cc 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte @@ -20,6 +20,7 @@ {#if user !== undefined} + {:else}

Sorry

Failed to load current
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte index 49104ec9..a87e7663 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte @@ -20,6 +20,7 @@
{#if oneUser} + {:else}

Sorry

Failed to load user {params.username}
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte index a5f02733..e8a4c060 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte @@ -7,6 +7,7 @@ import { fetchUser, fetchAllUsers, fetchAvatar } from "../../pieces/utils"; import { clickOutside } from '../../pieces/clickOutside' + import { push } from "svelte-spa-router"; let user; let allUsers = []; @@ -441,7 +442,8 @@ {/if}
{/if} - + +
{/if}
From 778af989b088017743c4757e0a41828da27f026a Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 17 Jan 2023 23:07:35 +0100 Subject: [PATCH 26/29] =?UTF-8?q?ajout=20d'une=20m=C3=A9thode=20pour=20avo?= =?UTF-8?q?ir=20les=20r=C3=A9sultats=20des=20derniers=20match=20d'un=20jou?= =?UTF-8?q?eur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api_back/src/game/game.controller.ts | 10 +++++- .../nestjs/api_back/src/game/game.module.ts | 3 +- .../nestjs/api_back/src/game/game.service.ts | 31 +++++++++++++++++++ .../src/users/class/matchHistory.class.ts | 21 +++++++++++++ .../src/users/entities/matchHistory.entity.ts | 18 +++++++++++ .../src/users/entities/user.entity.ts | 9 ++++++ .../api_back/src/users/users.service.ts | 1 + 7 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 srcs/requirements/nestjs/api_back/src/users/class/matchHistory.class.ts create mode 100644 srcs/requirements/nestjs/api_back/src/users/entities/matchHistory.entity.ts diff --git a/srcs/requirements/nestjs/api_back/src/game/game.controller.ts b/srcs/requirements/nestjs/api_back/src/game/game.controller.ts index 57a87978..ab5f787e 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.controller.ts @@ -1,4 +1,4 @@ -import { Body, Controller, Get, HttpException, HttpStatus, Post, Req, Res, UseGuards } from '@nestjs/common'; +import { Body, Controller, Get, HttpException, HttpStatus, Param, Post, Req, Res, UseGuards } from '@nestjs/common'; import { AuthenticateGuard, TwoFactorGuard } from 'src/auth/42/guards/42guards'; import { User } from 'src/users/entities/user.entity'; import { Response } from 'express'; @@ -21,6 +21,14 @@ export class GameController { return this.gameService.getMatchesForSpectator(); } + @Get('match/history/:username') + @UseGuards(AuthenticateGuard) + @UseGuards(TwoFactorGuard) + async getMatchHistory(@Req() req, @Param('username') username: string, @Res() res) + { + return this.gameService.getMatchHistory(username, res); + } + @Get('ranking') @UseGuards(AuthenticateGuard) @UseGuards(TwoFactorGuard) diff --git a/srcs/requirements/nestjs/api_back/src/game/game.module.ts b/srcs/requirements/nestjs/api_back/src/game/game.module.ts index e834599f..ac4971eb 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.module.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.module.ts @@ -2,6 +2,7 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { Friendship } from 'src/friendship/entities/friendship.entity'; import { FriendshipService } from 'src/friendship/friendship.service'; +import { MatchHistory } from 'src/users/entities/matchHistory.entity'; import { User } from 'src/users/entities/user.entity'; import { UsersService } from 'src/users/users.service'; import { Game } from './entity/game.entity'; @@ -10,7 +11,7 @@ import { GameController } from './game.controller'; import { GameService } from './game.service'; @Module({ - imports: [TypeOrmModule.forFeature([TokenGame, User, Game, Friendship])], + imports: [TypeOrmModule.forFeature([TokenGame, User, Game, Friendship, MatchHistory])], controllers: [GameController], providers: [GameService, UsersService, FriendshipService] }) diff --git a/srcs/requirements/nestjs/api_back/src/game/game.service.ts b/srcs/requirements/nestjs/api_back/src/game/game.service.ts index 37297153..00ac5e78 100644 --- a/srcs/requirements/nestjs/api_back/src/game/game.service.ts +++ b/srcs/requirements/nestjs/api_back/src/game/game.service.ts @@ -14,6 +14,8 @@ import { CreateGameDto } from './dto/createGame.dto'; import { UpdateGameDto } from './dto/updateGame.dto'; import { FriendshipService } from 'src/friendship/friendship.service'; import { STATUS } from 'src/common/constants/constants'; +import { MatchHistory } from 'src/users/entities/matchHistory.entity'; +import { SendableMatchHistory } from 'src/users/class/matchHistory.class'; @Injectable() export class GameService { @@ -22,6 +24,8 @@ export class GameService { private readonly gameRepository : Repository, @InjectRepository(User) private readonly userRepository : Repository, + @InjectRepository(MatchHistory) + private readonly matchHistory : Repository, @InjectRepository(TokenGame) private readonly tokenGameRepository : Repository, private readonly userService : UsersService, @@ -43,6 +47,26 @@ export class GameService { return gamesToReturn; } + async getMatchHistory(username : string, @Res() res : Response) + { + const user = await this.userService.findOne(username); + if (!user) + return res.status(HttpStatus.NOT_FOUND).json({message : "History for " + username + " not found"}); + const gameHistory = await this.matchHistory + .createQueryBuilder('history') + .leftJoinAndSelect('history.playerOne', 'playerOne') + .leftJoinAndSelect('history.playerTwo', 'playerTwo') + .where('playerOne.id = :playerOneId', { playerOneId: user.id }) + .orWhere('playerTwo.id = :playerTwoId', { playerTwoId: user.id }) + .getMany(); + let sendableHistory : SendableMatchHistory[] = [] + for (const history of gameHistory) + { + sendableHistory.push(new SendableMatchHistory(history)) + } + return sendableHistory; + } + async getRankingForAllUsers(currentUser : User) { const users = await this.userRepository.createQueryBuilder("user") .leftJoinAndSelect("user.stats", "stats") @@ -293,6 +317,13 @@ export class GameService { this.userService.incrementVictories(playerOne.id) this.userService.incrementDefeats(playerTwo.id) } + const matchHistory = new MatchHistory(); + matchHistory.playerOne = playerOne; + matchHistory.playerTwo = playerTwo; + matchHistory.playerOneResult = game.playerOneUsernameResult; + matchHistory.playerTwoResult = game.playerTwoUsernameResult; + const savedHistory = await this.matchHistory.save(matchHistory); + console.log(savedHistory); return HttpStatus.OK } diff --git a/srcs/requirements/nestjs/api_back/src/users/class/matchHistory.class.ts b/srcs/requirements/nestjs/api_back/src/users/class/matchHistory.class.ts new file mode 100644 index 00000000..a0bc4a4e --- /dev/null +++ b/srcs/requirements/nestjs/api_back/src/users/class/matchHistory.class.ts @@ -0,0 +1,21 @@ + +import { match } from "assert"; +import { MatchHistory } from "../entities/matchHistory.entity"; + +export class SendableMatchHistory { + id: number; + date: Date; + playerOneUsername: string; + playerTwoUsername: string; + playerTwoResult : number; + playerOneResult : number; + + constructor(matchHistory: MatchHistory) { + this.id = matchHistory.id; + this.date = matchHistory.date + this.playerOneUsername = matchHistory.playerOne.username; + this.playerTwoUsername = matchHistory.playerTwo.username; + this.playerOneResult = matchHistory.playerOneResult; + this.playerTwoResult = matchHistory.playerTwoResult; + }; +} \ No newline at end of file diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/matchHistory.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/matchHistory.entity.ts new file mode 100644 index 00000000..c1516f25 --- /dev/null +++ b/srcs/requirements/nestjs/api_back/src/users/entities/matchHistory.entity.ts @@ -0,0 +1,18 @@ +import { Column, CreateDateColumn, Entity, ManyToOne, PrimaryColumn, PrimaryGeneratedColumn } from "typeorm"; +import { User } from "./user.entity"; + +@Entity('matchHistory') +export class MatchHistory { + @PrimaryGeneratedColumn() + id : number; + @ManyToOne(type => User, user => user.username, {onDelete: 'CASCADE'}) + playerOne: User; + @ManyToOne(type => User, user => user.username, {onDelete: 'CASCADE'}) + playerTwo: User; + @Column() + playerOneResult : number; + @Column() + playerTwoResult : number; + @CreateDateColumn() + date : Date; +} \ No newline at end of file diff --git a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts index 24a268be..f56b81ca 100644 --- a/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts +++ b/srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts @@ -2,6 +2,7 @@ import { Exclude } from "class-transformer"; import { IsEmail, Length } from "class-validator"; import { Column, Entity, JoinColumn, JoinTable, ManyToMany, OneToMany, OneToOne, PrimaryGeneratedColumn, Unique } from "typeorm"; import { Friendship } from "../../friendship/entities/friendship.entity"; +import { MatchHistory } from "./matchHistory.entity"; import { UserStats } from "./userStat.entities"; @@ -49,12 +50,20 @@ export class User { @OneToMany(type => Friendship , (friendship) => friendship.receiver, {onDelete: 'CASCADE'}) receivedFriendRequest: Friendship[]; + @OneToMany(type => MatchHistory , (matchHistory) => matchHistory.playerOne, {onDelete: 'CASCADE'}) + playerOneMatch: MatchHistory[]; + + @OneToMany(type => MatchHistory , (matchHistory) => matchHistory.playerTwo, {onDelete: 'CASCADE'}) + playerTwoMatch: MatchHistory[]; + @JoinColumn() @OneToOne(() => UserStats, { cascade: true, onDelete: 'CASCADE' }) stats: UserStats; + // ROOMS : @Column({ nullable: true }) currentRoom: string; // chatroom name + } diff --git a/srcs/requirements/nestjs/api_back/src/users/users.service.ts b/srcs/requirements/nestjs/api_back/src/users/users.service.ts index d84d81c4..f2065216 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.service.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.service.ts @@ -6,6 +6,7 @@ import { CreateUsersDto } from './dto/create-users.dto'; import { UpdateUsersDto } from './dto/update-users.dto'; import { UserStats } from './entities/userStat.entities'; import { FriendshipService } from 'src/friendship/friendship.service'; +import { MatchHistory } from './entities/matchHistory.entity'; @Injectable() export class UsersService { From 3fa0add679b8e4d99708b2c05d885b3f18db7ae5 Mon Sep 17 00:00:00 2001 From: LuckyLaszlo Date: Wed, 18 Jan 2023 00:07:05 +0100 Subject: [PATCH 27/29] Wip front match history --- .../api_front/src/pages/game/Game.svelte | 7 +- .../src/pages/game/GameSpectator.svelte | 17 +- .../src/pages/profile/ProfileDisplay.svelte | 19 +- .../profile/ProfileDisplayOneUser.svelte | 3 +- .../src/pieces/GenerateUserDisplay.svelte | 3 +- .../svelte/api_front/src/pieces/Match.ts | 11 +- .../api_front/src/pieces/MatchHistory.svelte | 163 ++++++++++++++++++ ...istElem.svelte => MatchOngoingElem.svelte} | 4 +- 8 files changed, 200 insertions(+), 27 deletions(-) create mode 100644 srcs/requirements/svelte/api_front/src/pieces/MatchHistory.svelte rename srcs/requirements/svelte/api_front/src/pieces/{MatchListElem.svelte => MatchOngoingElem.svelte} (88%) diff --git a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte index d02e162d..97eac451 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte @@ -469,10 +469,7 @@ canvas { padding: 10px; } .avatar { - min-height: 5vw; - min-width: 5vw; - - max-width: 5vw; - max-height: 5vw; + height: 5vw; + width: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte index 17f5245f..157f7cf5 100644 --- a/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte @@ -3,8 +3,8 @@ import { onMount, onDestroy } from "svelte"; import { fade, fly } from 'svelte/transition'; - import MatchListElem from "../../pieces/MatchListElem.svelte"; - import type { Match } from "../../pieces/Match"; + import MatchOngoingElem from "../../pieces/MatchOngoingElem.svelte"; + import type { MatchOngoing } from "../../pieces/Match"; import { fetchAvatar } from "../../pieces/utils"; import * as pongSpectator from "./client/pongSpectator"; @@ -22,7 +22,7 @@ //html boolean for pages let hiddenGame = true; - let matchList: Match[] = []; + let matchList: MatchOngoing[] = []; let watchGameStateInterval; const watchGameStateIntervalRate = 142; let timeoutArr = []; @@ -51,7 +51,7 @@ resetPage(); }; - async function initGameSpectator(match: Match) + async function initGameSpectator(match: MatchOngoing) { watchGameStateInterval = setInterval(watchGameState, watchGameStateIntervalRate); pongSpectator.init(match.gameOptions, sound, gameAreaId, match.gameServerIdOfTheMatch); @@ -173,7 +173,7 @@ {#if matchList.length !== 0} {#each matchList as match} - initGameSpectator(match)} /> + initGameSpectator(match)} /> {/each} {:else} @@ -268,10 +268,7 @@ canvas { font-size: 1vw; } .avatar { - min-height: 5vw; - min-width: 5vw; - - max-width: 5vw; - max-height: 5vw; + height: 5vw; + width: 5vw; } diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte index f351e1cc..d73a8a65 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte @@ -2,6 +2,7 @@ import { onMount } from 'svelte'; import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte'; + import MatchHistory from '../../pieces/MatchHistory.svelte'; import { push } from 'svelte-spa-router'; import Chat from '../../pieces/chat/Chat.svelte'; @@ -18,9 +19,9 @@
{#if user !== undefined} + - - + {:else}

Sorry

Failed to load current
@@ -30,10 +31,14 @@ diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte index a87e7663..af84b47b 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte @@ -6,6 +6,7 @@ import { onMount } from 'svelte'; import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte'; + import MatchHistory from '../../pieces/MatchHistory.svelte'; import { fetchUser } from "../../pieces/utils"; export let params; @@ -20,7 +21,7 @@
{#if oneUser} - + {:else}

Sorry

Failed to load user {params.username}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte index 198d19f0..621a21a9 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte @@ -100,7 +100,8 @@ } .avatar{ - max-width: 150px; + width: 15vw; + height: 15vw; } /* The variable rich section */ diff --git a/srcs/requirements/svelte/api_front/src/pieces/Match.ts b/srcs/requirements/svelte/api_front/src/pieces/Match.ts index 68e330f6..d738e425 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Match.ts +++ b/srcs/requirements/svelte/api_front/src/pieces/Match.ts @@ -2,9 +2,18 @@ import type { MatchOptions } from "../pages/game/client/pongSpectator"; export { MatchOptions } from "../pages/game/client/pongSpectator"; -export class Match { +export class MatchOngoing { gameServerIdOfTheMatch: string; gameOptions: MatchOptions; playerOneUsername: string; playerTwoUsername: string; } + +export class MatchHistory { + id: number; + date: Date; + playerOneUsername: string; + playerTwoUsername: string; + playerOneResult: number; + playerTwoResult: number; +} diff --git a/srcs/requirements/svelte/api_front/src/pieces/MatchHistory.svelte b/srcs/requirements/svelte/api_front/src/pieces/MatchHistory.svelte new file mode 100644 index 00000000..ba32cf9e --- /dev/null +++ b/srcs/requirements/svelte/api_front/src/pieces/MatchHistory.svelte @@ -0,0 +1,163 @@ + + + +
+
+
+ + + + + + + + + + + + + + {#each matchList as match, i} + + + {#await fetchAvatar(match.playerOneUsername) then avatar} + + {/await} + + + + {#await fetchAvatar(match.playerTwoUsername) then avatar} + + {/await} + {#if match.playerOneResult === match.playerTwoResult} + + {:else if (user.username === match.playerOneUsername && match.playerOneResult > match.playerTwoResult) + || (user.username === match.playerTwoUsername && match.playerTwoResult > match.playerOneResult)} + + {:else} + + {/if} + + {/each} + +
#Player OneVSPlayer TwoResult
{i + 1} + avatarOne +
+ {match.playerOneUsername} + 		{match.playerOneResult}VS{match.playerTwoResult} + avatarOne +
+ {match.playerTwoUsername} + 		DRAWWINLOSE
+
+
+ + + diff --git a/srcs/requirements/svelte/api_front/src/pieces/MatchListElem.svelte b/srcs/requirements/svelte/api_front/src/pieces/MatchOngoingElem.svelte similarity index 88% rename from srcs/requirements/svelte/api_front/src/pieces/MatchListElem.svelte rename to srcs/requirements/svelte/api_front/src/pieces/MatchOngoingElem.svelte index 29fbaa52..736d0d0b 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/MatchListElem.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/MatchOngoingElem.svelte @@ -1,9 +1,9 @@ -
  • - -
    • - +
    + {#await fetchAvatar(match.playerOneUsername) then avatar} + avatarOne + {/await} + + {#await fetchAvatar(match.playerTwoUsername) then avatar} + avatarTwo + {/await} +