diff --git a/srcs/requirements/nestjs/api_back/src/friendship/friendship.controller.ts b/srcs/requirements/nestjs/api_back/src/friendship/friendship.controller.ts index 75b10f93..225f1b4a 100644 --- a/srcs/requirements/nestjs/api_back/src/friendship/friendship.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/friendship/friendship.controller.ts @@ -14,6 +14,9 @@ export class FriendshipController { @UseGuards(TwoFactorGuard) findEmpty(@Req() req) { const user = req.user; + + console.log("WHAT IS UP MY GUYS IT IS YOUR BOI THAT IDIOT YOU HATE 11111"); + return this.friendshipService.findAllFriends(user.id); } @@ -33,7 +36,13 @@ export class FriendshipController { @UseGuards(TwoFactorGuard) create(@Body() createFriendshipDto: CreateFriendshipDto, @Req() req) { const user = req.user; - console.log(`User id: ${user.id}\nFriend id: ${createFriendshipDto.requesterId}\nStatus: ${createFriendshipDto.status}`); + + console.log("WHAT IS UP MY GUYS IT IS YOUR BOI THAT IDIOT YOU HATE 22222"); + + // console.log(`User id: ${user.id}\nFriend id: ${createFriendshipDto.requesterId}\nStatus: ${createFriendshipDto.status}`); + // console.log(`My User id: ${createFriendshipDto.requesterId}`) + console.log(`My User id: ${user.id}`) + console.log(`User id: ${user.id}\nFriend id: ${createFriendshipDto.addresseeId}\nStatus: ${createFriendshipDto.status}`); if (user.id === +createFriendshipDto.requesterId) return this.friendshipService.create(createFriendshipDto, user); return new HttpException('You can\'t request a frienship for another user', HttpStatus.FORBIDDEN); @@ -73,6 +82,9 @@ export class FriendshipController { @UseGuards(TwoFactorGuard) findAllPendantFriendshipRequested(@Req() req) { const user = req.user; + + console.log("WHAT IS UP MY GUYS IT IS YOUR BOI THAT IDIOT YOU HATE Pending 33333"); + return this.friendshipService.findAllPendantRequestsForFriendship(user.id); } diff --git a/srcs/requirements/svelte/api_front/src/pages/GamePage.svelte b/srcs/requirements/svelte/api_front/src/pages/GamePage.svelte index 19e7de40..5e08c6f4 100644 --- a/srcs/requirements/svelte/api_front/src/pages/GamePage.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/GamePage.svelte @@ -1,10 +1,10 @@ + +

Friendship page

+ +{#if user && user.username} +
You are {user.username}
+{/if} + + + + + +{#if allUsers !== undefined} + {#each allUsers as user} +
{user.username}
+ {/each} +{/if} + +
+ + +{#if allFriends !== undefined} +
{allFriends}
+ {#each allFriends as friend} +
{friend}{friend.username}
+ {/each} +{/if} + +
+ +
Make a Friend!
+
friendUserByUsername(set.friendUsername)}> + +
{errors.friendRequest}
+ +
+ +

+ + + + +

+ + + + +{#if requestsMade !== undefined} + {#each requestsMade as requestMade} +
{requestMade}
+ {/each} +{/if} + + + + \ No newline at end of file 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 b664dc84..58cbc9fa 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -130,7 +130,7 @@ -
{success.username}
+
{success.username}
{errors.username}
diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte index 2804b2f5..dee06c62 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte @@ -34,6 +34,7 @@ + diff --git a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js index 6de8ea41..28511620 100644 --- a/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js +++ b/srcs/requirements/svelte/api_front/src/routes/profileRoutes.js @@ -2,6 +2,7 @@ import NotFound from "../pages/NotFound.svelte"; import ProfileDisplay from '../pages/profile/ProfileDisplay.svelte'; import ProfileSettings from '../pages/profile/ProfileSettings.svelte'; +import ProfileFriends from '../pages/profile/ProfileFriends.svelte'; import { wrap } from 'svelte-spa-router/wrap' // establishing the prefix here very clearly so we can have a coherent repeatable structure @@ -10,6 +11,7 @@ export const prefix = '/profile'; export const profileRoutes = { '/': ProfileDisplay, '/settings': ProfileSettings, + '/friends': ProfileFriends, '*': NotFound }; diff --git a/srcs/requirements/svelte/api_front/tsconfig.json b/srcs/requirements/svelte/api_front/tsconfig.json index 586dc267..b082e968 100644 --- a/srcs/requirements/svelte/api_front/tsconfig.json +++ b/srcs/requirements/svelte/api_front/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "@tsconfig/svelte/tsconfig.json", - "include": ["src/**/*", "src/**/*.ts", "src/**/*.tsx"], + "include": ["src/**/*"], "exclude": ["node_modules/*", "__sapper__/*", "public/*"] } \ No newline at end of file