42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Me
2023-01-17 03:04:36 +01:00
parent 68bf406834
commit 29b6042cda
6 changed files with 22 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
View File

@@ -1,9 +1,6 @@
import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm'; import { InjectRepository } from '@nestjs/typeorm';
import { User } from 'src/users/entities/user.entity'; import { User } from 'src/users/entities/user.entity';
import { SendableUser } from 'src/users/sendableUsers';
import { Repository, Brackets } from 'typeorm'; import { Repository, Brackets } from 'typeorm';
import { CreateFriendshipDto } from './dto/create-friendship.dto'; import { CreateFriendshipDto } from './dto/create-friendship.dto';
import { Friendship, FriendshipStatus } from './entities/friendship.entity'; import { Friendship, FriendshipStatus } from './entities/friendship.entity';
@@ -77,7 +74,6 @@ export class FriendshipService {
) )
}), }),
) )
// .andWhere('friendship.status != :status', {status : FriendshipStatus.BLOCKED})
.getOne() .getOne()
// console.log('END Find one friend by username: ') // console.log('END Find one friend by username: ')
@@ -85,8 +81,6 @@ export class FriendshipService {
if (!friendship) { if (!friendship) {
throw new HttpException(`There is no such friendship`, HttpStatus.NOT_FOUND); 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); return new SendableFriendship(friendship);
} }

34
srcs/requirements/svelte/api_front/src/pages/profile/ProfileUsers.svelte
View File

@@ -60,6 +60,8 @@
myFriendships = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`) myFriendships = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
if (response.status === 404)
return []
throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
return response.json(); return response.json();
@@ -74,6 +76,8 @@
requestsMade = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/pending`) requestsMade = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/pending`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
if (response.status === 404)
return []
throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
return response.json(); return response.json();
@@ -88,6 +92,8 @@
requestsRecieved = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/received`) requestsRecieved = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/received`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
if (response.status === 404)
return []
throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
return response.json(); return response.json();
@@ -102,6 +108,8 @@
blockedUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/blocked`) blockedUsers = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/blocked`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
if (response.status === 404)
return []
throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
return response.json(); 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}`) friendshipStatusFull = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/network/myfriends?username=${aUsername}`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
console.log("response not ok : ") if (response.status === 404)
console.log({...response}) return []
// throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
// else {
console.log("response ok : ")
console.log({...response})
return response.json(); return response.json();
// }
}) })
.catch((error) => { .catch((error) => {
console.log("catching things")
console.log("catch fetchFriendshipFull: ", error); console.log("catch fetchFriendshipFull: ", error);
return []; return [];
}); });
// console.log('friendshipFull: ')
// console.log({...friendshipStatusFull})
}; };
const sendFriendRequest = async (aUsername) => { const sendFriendRequest = async (aUsername) => {
@@ -303,17 +304,6 @@
await fetchAllUsers_Wrapper(); await fetchAllUsers_Wrapper();
fetchFriendshipFull(usernameBeingViewed); fetchFriendshipFull(usernameBeingViewed);
} }
// if (usernameBeingViewed) {
// let found = allUsers.find(
// (e) => e.username === usernameBeingViewed
// );
// if (!found) {
// usernameBeingViewed = null;
// friendshipStatusFull = null;
// }
// }
}; };
</script> </script>
@@ -382,6 +372,8 @@
</div> </div>
<!-- This next bit needs to all be in a window thing above the whatever -->
<div class="main-display"> <div class="main-display">
{#if usernameBeingViewed} {#if usernameBeingViewed}
<DisplayAUser aUsername={usernameBeingViewed} bind:loaded={loadedUser}/> <DisplayAUser aUsername={usernameBeingViewed} bind:loaded={loadedUser}/>

14
srcs/requirements/svelte/api_front/src/pieces/GenerateUserDisplay.svelte
View File

@@ -2,14 +2,14 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { fetchAvatar } from "./utils"; import { fetchAvatar } from "./utils.js";
export let user; export let user;
let rank = ''; let rank = '';
let avatar; let avatar;
// avatar needs to be updated!!!
console.log('Generate User Display user:') // console.log('Generate User Display user:')
console.log({...user}) // console.log({...user})
// console.log(user) // console.log(user)
let errors = {avatar: ''}; let errors = {avatar: ''};
@@ -23,8 +23,6 @@
$: user, updateAvatar(); $: user, updateAvatar();
/**** THIS IS BASICALLY ALL THE RANK LOGIC ERIC HAS MADE ****/
if (user.stats.loseGame > user.stats.winGame) { if (user.stats.loseGame > user.stats.winGame) {
rank = "Come on, you can do better" rank = "Come on, you can do better"
} else if (user.stats.loseGame === user.stats.winGame) { } else if (user.stats.loseGame === user.stats.winGame) {
@@ -64,12 +62,10 @@
</script> </script>
<!-- is this if excessive? -->
<div class="outer"> <div class="outer">
{#if user} {#if user}
<main> <main>
<!-- <img class="icon" src="img/default_user_icon.png" alt="default user icon"> -->
<!-- <img class="icon" src="{user.image_url}" alt="default user icon"> -->
<img class="avatar" src="{avatar}" alt="user avatar"> <img class="avatar" src="{avatar}" alt="user avatar">
<div class="error">{errors.avatar}</div> <div class="error">{errors.avatar}</div>
<div class="username">{user.username}</div> <div class="username">{user.username}</div>

40
srcs/requirements/svelte/api_front/src/pieces/ScrollTo.svelte
View File

@@ -1,40 +0,0 @@
<script lang="ts">
// trying something...
// const element = document.getElementById("bottom-half");
export let element;
// is this too JS for me?
const scrollTo= () => {
element.scrollIntoView({behavior: "smooth"});
console.log('supposed to scroll');
// Maybe eventually i can do this in a more svelte way, on:scroll={someEvent} ... whatever
};
</script>
<!-- <svelte:window bind:scrollY={y}/> -->
<!-- wait actually i don't want this... -->
<!-- <svelte:window on:scroll={handleOnScroll} /> -->
<!-- a div instead? -->
<!-- <button>Login</button> -->
<div class="to-login" on:click={scrollTo}>Login</div>
<style>
.to-login{
display: inline-block;
/* color: bisque; */
color: blue;
margin-left: 10px;
}
.to-login:hover{
font-weight: bold;
color: black;
cursor: pointer;
}
</style>

2
srcs/requirements/svelte/api_front/src/pieces/utils.ts
View File

@@ -47,6 +47,8 @@ export async function fetchAllUsers()
return fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`) return fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/user/all`)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
if (response.status === 404)
return [];
throw new Error("HTTP " + response.status); throw new Error("HTTP " + response.status);
} }
return response.json(); return response.json();

4
srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
View File

@@ -12,11 +12,11 @@ import { fetchUser } from "../pieces/utils";
async function checkLogin(detail) { async function checkLogin(detail) {
const user = await fetchUser(); const user = await fetchUser();
if (!user || !user.username) { if (!user || !user.username) {
console.log('failed to be logged in') // console.log('failed to be logged in')
return false; return false;
} }
else { else {
console.log('successfully logged in') // console.log('successfully logged in')
return true; return true;
} }
} }