From ae34fd1cb62bf37168f2ccc6a073d1a25dd70842 Mon Sep 17 00:00:00 2001 From: Me Date: Mon, 16 Jan 2023 13:44:49 +0100 Subject: [PATCH 1/2] a few small fixes --- .../nestjs/api_back/src/friendship/friendship.service.ts | 2 +- .../src/pages/profile/ProfileDisplayOneUser.svelte | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 1219c2ba..2a325e0b 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts @@ -310,7 +310,7 @@ export class FriendshipService { if (relation.receiver && relation.receiver.id === user.id) { // console.log('friendship.service blockFriendship trying to delete and recreate a friendship with block') // console.log({...relation}) - const newFriendshipDto = {"receiverUsername": relation.sender.username, "receiverId": relation.sender.id, "status": FriendshipStatus.BLOCKED}; + const newFriendshipDto = {"receiverUsername": relation.sender.username, "status": FriendshipStatus.BLOCKED}; await this.removeFriendship(relationshipId, user); return await this.create(newFriendshipDto, user); } else { 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 537c8646..f20dbade 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplayOneUser.svelte @@ -21,6 +21,12 @@ console.log({...user}) }) + export const updateUser = async() => { + user = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user?username=${params.username}`) + .then( (x) => x.json() ); + }; + + $: params.username, updateUser(); From 3f3a445d8c3dbe2840b5ece34daacce788d9828b Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 16 Jan 2023 14:07:54 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Suppression=20des=20variables=20flex=20dans?= =?UTF-8?q?=20le=20css=20global=20afin=20d'=C3=A9viter=20des=20probl=C3=A8?= =?UTF-8?q?mes=20sur=20certaines=20pages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srcs/requirements/svelte/api_front/public/global.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcs/requirements/svelte/api_front/public/global.css b/srcs/requirements/svelte/api_front/public/global.css index ef988c0e..151d0d36 100644 --- a/srcs/requirements/svelte/api_front/public/global.css +++ b/srcs/requirements/svelte/api_front/public/global.css @@ -13,8 +13,6 @@ body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; /* tmp? */ background-color: #333; - display: flex; - flex-direction: column; } @font-face {