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

fix some errors in make_env, and in svelte replace instances of domain url by a variable

Browse Source
This commit is contained in:
hugogogo
2022-12-30 20:45:26 +01:00
parent 9961c6c529
commit 8824868ff9
22 changed files with 424 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/requirements/svelte/api_front/src/Constantes.svelte Normal file
View File

@@ -0,0 +1,4 @@
<script context="module">
export const Domain = "transcendance";
export const Port = 8080;
</script>

7
srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
View File

@@ -3,12 +3,13 @@
import { push } from "svelte-spa-router";
import { onMount } from 'svelte';
import { get } from "svelte/store";
import { Domain } from "../Constantes.svelte";
let user;
onMount(async () => {
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:8080/api/v2/user')
.then((resp) => resp.json())
// i mean i could do a failed to load user or some shit, maybe with a .catch or something? but atm why bother
@@ -32,14 +33,14 @@
});
const login = async() => {
window.location.href = 'http://transcendance:8080/api/v2/auth';
window.location.href = 'http://{Domain}:8080/api/v2/auth';
console.log('you are now logged in');
}
// i could prolly put this in it's own compoent, i seem to use it in several places... or maybe just some JS? like no need for html
// we could .then( () => replace('/') ) need the func so TS compatible...
const logout = async() => {
await fetch('http://transcendance:8080/api/v2/auth/logout', {
await fetch('http://{Domain}:8080/api/v2/auth/logout', {
method: 'POST',
});
user = undefined;

7
srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
View File

@@ -1,9 +1,10 @@
<script lang="ts">
import { onMount } from "svelte";
import { push } from "svelte-spa-router";
import { Domain, Port } from "../Constantes.svelte";
// onMount( async() => {
// await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
// await fetch("http://{Domain}:{Port}/api/v2/auth/2fa/generate",
// {
// method: 'POST',
// })
@@ -19,7 +20,7 @@
let qrCode = "";
let wrongCode = "";
const fetchQrCodeImg = (async() => {
await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
await fetch("http://{Domain}:{Port}/api/v2/auth/2fa/generate",
{
method: 'POST',
})
@@ -31,7 +32,7 @@
})()
const submitCode = async() => {
const response = await fetch("http://transcendance:8080/api/v2/auth/2fa/check",
const response = await fetch("http://{Domain}:{Port}/api/v2/auth/2fa/check",
{
method : 'POST',
headers : {

13
srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
View File

@@ -3,6 +3,7 @@
import { onMount, onDestroy } from "svelte";
import Header from '../../pieces/Header.svelte';
import { fade, fly } from 'svelte/transition';
import { Domain, Port } from "../../Constantes.svelte";
import * as pong from "./client/pong";
@@ -36,9 +37,9 @@
let idOfIntevalCheckTerminationOfTheMatch;
onMount( async() => {
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( x => x.json() );
allUsers = await fetch('http://transcendance:8080/api/v2/user/all')
allUsers = await fetch('http://{Domain}:{Port}/api/v2/user/all')
.then( x => x.json() );
options.playerOneUsername = user.username;
})
@@ -68,7 +69,7 @@
idOfIntevalCheckTerminationOfTheMatch = setInterval(matchTermitation, 1000);
const matchOptions = pong.computeMatchOptions(options);
const responseWhenGrantToken = fetch("http://transcendance:8080/api/v2/game/ticket", {
const responseWhenGrantToken = fetch("http://{Domain}:{Port}/api/v2/game/ticket", {
method : "POST",
headers : {'Content-Type': 'application/json'},
body : JSON.stringify({
@@ -173,13 +174,13 @@
const showInvitation = async() => {
showGameOption = false;
showInvitations = true;
invitations = await fetch("http://transcendance:8080/api/v2/game/invitations")
invitations = await fetch("http://{Domain}:{Port}/api/v2/game/invitations")
.then(x => x.json())
invitations.length !== 0 ? isThereAnyInvitation = true : isThereAnyInvitation = false
}
const rejectInvitation = async(invitation) => {
await fetch("http://transcendance:8080/api/v2/game/decline",{
await fetch("http://{Domain}:{Port}/api/v2/game/decline",{
method: "POST",
headers: { 'Content-Type': 'application/json'},
body: JSON.stringify({
@@ -192,7 +193,7 @@
}
const acceptInvitation = async(invitation : any) => {
const res = await fetch("http://transcendance:8080/api/v2/game/accept",{
const res = await fetch("http://{Domain}:{Port}/api/v2/game/accept",{
method: "POST",
headers: { 'Content-Type': 'application/json'},
body: JSON.stringify({

5
srcs/requirements/svelte/api_front/src/pages/game/GameSpectator.svelte
View File

@@ -3,6 +3,7 @@
import { onMount, onDestroy } from "svelte";
import Header from '../../pieces/Header.svelte';
import { fade, fly } from 'svelte/transition';
import { Domain, Port } from "../../Constantes.svelte";
import * as pongSpectator from "./client/pongSpectator";
@@ -20,9 +21,9 @@
let hiddenGame = true;
onMount( async() => {
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( x => x.json() );
allUsers = await fetch('http://transcendance:8080/api/v2/user/all')
allUsers = await fetch('http://{Domain}:{Port}/api/v2/user/all')
.then( x => x.json() );
})

9
srcs/requirements/svelte/api_front/src/pages/game/Ranking.svelte
View File

@@ -1,16 +1,17 @@
<script lang="ts">
import { onMount, onDestroy } from "svelte";
import Header from "../../pieces/Header.svelte";
import Header from "../../pieces/Header.svelte";
import { Domain, Port } from "../../Constantes.svelte";
//user's stuff
let currentUser;
let allUsers = [];
let idInterval;
onMount( async() => {
currentUser = await fetch('http://transcendance:8080/api/v2/user')
currentUser = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( x => x.json() );
allUsers = await fetch('http://transcendance:8080/api/v2/game/ranking')
allUsers = await fetch('http://{Domain}:{Port}/api/v2/game/ranking')
.then( x => x.json() );
idInterval = setInterval(fetchScores, 10000);
})
@@ -20,7 +21,7 @@
})
function fetchScores() {
fetch('http://transcendance:8080/api/v2/game/ranking')
fetch('http://{Domain}:{Port}/api/v2/game/ranking')
.then( x => x.json() )
.then( x => allUsers = x );
}

3
srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte
View File

@@ -2,6 +2,7 @@
import { onMount } from 'svelte';
import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte';
import { Domain, Port } from "../../Constantes.svelte";
import Chat from '../../pieces/chat/Chat.svelte';
@@ -9,7 +10,7 @@
onMount( async() => {
// console.log('mounting profile display')
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( (x) => x.json() );
})

23
srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte
View File

@@ -1,7 +1,8 @@
<script lang="ts">
import { onMount } from "svelte";
import { binding_callbacks } from "svelte/internal";
import { binding_callbacks } from "svelte/internal";
import { Domain, Port } from "../../Constantes.svelte";
import Button from "../../pieces/Button.svelte";
import DisplayAUser from "../../pieces/DisplayAUser.svelte";
@@ -38,7 +39,7 @@ could be a list of friends and if they're active but i can't see that yet
onMount( async() => {
// yea no idea what
// i mean do i fetch user? i will for now
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( (x) => x.json() );
// userBeingViewed = user;
@@ -46,26 +47,26 @@ could be a list of friends and if they're active but i can't see that yet
// console.log(user)
// console.log(user.username)
myFriends = await fetch("http://transcendance:8080/api/v2/network/myfriends")
myFriends = await fetch("http://{Domain}:{Port}/api/v2/network/myfriends")
.then( (x) => x.json() );
// console.log('my friends')
// console.log(myFriends)
requestsMade = await fetch('http://transcendance:8080/api/v2/network/pending')
requestsMade = await fetch('http://{Domain}:{Port}/api/v2/network/pending')
.then( x => x.json() );
// console.log('Requests pending ');
// console.log(requestsMade);
requestsRecieved = await fetch('http://transcendance:8080/api/v2/network/received')
requestsRecieved = await fetch('http://{Domain}:{Port}/api/v2/network/received')
.then( x => x.json() );
// console.log('Requests received ');
// console.log(requestsRecieved);
allUsers = await fetch('http://transcendance:8080/api/v2/user/all')
allUsers = await fetch('http://{Domain}:{Port}/api/v2/user/all')
.then( x => x.json() );
// console.log('got all users ' + allUsers)
@@ -74,20 +75,20 @@ could be a list of friends and if they're active but i can't see that yet
const displayAllUsers = async() => {
allUsers = await fetch('http://transcendance:8080/api/v2/user/all')
allUsers = await fetch('http://{Domain}:{Port}/api/v2/user/all')
.then( x => x.json() );
// console.log('got all users ' + allUsers)
};
const displayAllFriends = async() => {
myFriends = await fetch('http://transcendance:8080/api/v2/network/myfriends')
myFriends = await fetch('http://{Domain}:{Port}/api/v2/network/myfriends')
.then( x => x.json() );
// console.log('got all friends ' + allFriends)
};
const displayRequestsMade = async() => {
requestsMade = await fetch('http://transcendance:8080/api/v2/network/pending')
requestsMade = await fetch('http://{Domain}:{Port}/api/v2/network/pending')
.then( x => x.json() );
// console.log('got requests made ' + requestsMade)
};
@@ -106,7 +107,7 @@ could be a list of friends and if they're active but i can't see that yet
}
if (valid) {
sentFriendRequest = await fetch("http://transcendance:8080/api/v2/network/myfriends", {
sentFriendRequest = await fetch("http://{Domain}:{Port}/api/v2/network/myfriends", {
method : "POST",
headers: { 'Content-Type': 'application/json'},
body: JSON.stringify({
@@ -124,7 +125,7 @@ could be a list of friends and if they're active but i can't see that yet
// sendUsername = userBeingViewed.username;
// prolly like fetch if you're friends or not?
// GET http://transcendance:8080/api/v2/networks/myfriends?username=aUser but i need to make that as long as Cherif
// GET http://{Domain}:{Port}/api/v2/networks/myfriends?username=aUser but i need to make that as long as Cherif
// doesn't have a better option
// like i want this thing to return the Friendship ID ideally
};

11
srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
View File

@@ -3,6 +3,7 @@
import Card from '../../pieces/Card.svelte';
import {onMount} from 'svelte';
import { push } from 'svelte-spa-router';
import { Domain, Port } from "../../Constantes.svelte";
import Button from '../../pieces/Button.svelte';
let user;
@@ -16,7 +17,7 @@
let success = {username: '', avatar: '' };
onMount( async() => {
user = await fetch('http://transcendance:8080/api/v2/user')
user = await fetch('http://{Domain}:{Port}/api/v2/user')
.then( (x) => x.json() );
// do a .catch?
@@ -33,7 +34,7 @@
// console.log('this is what is in the avatar before fetch')
// console.log(avatar)
await fetch("http://transcendance:8080/api/v2/user/avatar", {method: "GET"})
await fetch("http://{Domain}:{Port}/api/v2/user/avatar", {method: "GET"})
.then(response => {return response.blob()})
.then(data => {
const url = URL.createObjectURL(data);
@@ -63,7 +64,7 @@
else {
errors.username = '';
}
await fetch('http://transcendance:8080/api/v2/user',{
await fetch('http://{Domain}:{Port}/api/v2/user',{
method: 'PATCH',
headers: {
'Content-Type': 'application/json'
@@ -100,7 +101,7 @@
// tmp
console.log(data);
await fetch("http://transcendance:8080/api/v2/user/avatar",
await fetch("http://{Domain}:{Port}/api/v2/user/avatar",
{
method : 'POST',
body : data,
@@ -108,7 +109,7 @@
.then(() => uploadAvatarSuccess = true ) // for some reason it needs to be a function, i think a TS thing, not a promis otherwise
.then(() => success.avatar = 'Your changes have been saved')
.catch(() => errors.avatar = 'Sorry failed to upload your new Avatar' );
await fetch("http://transcendance:8080/api/v2/user/avatar", {method: "GET"})
await fetch("http://{Domain}:{Port}/api/v2/user/avatar", {method: "GET"})
.then(response => {return response.blob()})
.then(data => {
const url = URL.createObjectURL(data);

2
srcs/requirements/svelte/api_front/src/pieces/Button.svelte
View File

@@ -45,4 +45,4 @@
background: white;
border: 2px solid #45c496;
}
</style>
</style>

15
srcs/requirements/svelte/api_front/src/pieces/DisplayAUser.svelte
View File

@@ -2,6 +2,7 @@
import { onMount } from 'svelte';
import GenerateUserDisplay from './GenerateUserDisplay.svelte';
import { Domain, Port } from "../Constantes.svelte";
// import {updateGeneratedUser} from './GenerateUserDisplay.svelte';
export let aUsername;
@@ -9,8 +10,8 @@
onMount( async() => {
console.log('Display aUser username: '+ aUsername)
// http://transcendance:8080/api/v2/user?username=NomDuUserATrouver
user = await fetch(`http://transcendance:8080/api/v2/user?username=${aUsername}`)
// http://{Domain}:{Port}/api/v2/user?username=NomDuUserATrouver
user = await fetch(`http://{Domain}:{Port}/api/v2/user?username=${aUsername}`)
.then( (x) => x.json() );
// console.log('Display a user: ')
@@ -26,15 +27,15 @@
const updateUser = async(updatedUser) => {
console.log('Display Update aUser username: '+ updateUser)
// http://transcendance:8080/api/v2/user?username=NomDuUserATrouver
user = await fetch(`http://transcendance:8080/api/v2/user?username=${updateUser}`)
// http://{Domain}:{Port}/api/v2/user?username=NomDuUserATrouver
user = await fetch(`http://{Domain}:{Port}/api/v2/user?username=${updateUser}`)
.then( (x) => x.json() );
};
// export const updateUser = async(updatedUser) => {
// console.log('Display Update aUser username: '+ updateUser)
// // http://transcendance:8080/api/v2/user?username=NomDuUserATrouver
// user = await fetch(`http://transcendance:8080/api/v2/user?username=${updateUser}`)
// // http://{Domain}:{Port}/api/v2/user?username=NomDuUserATrouver
// user = await fetch(`http://{Domain}:{Port}/api/v2/user?username=${updateUser}`)
// .then( (x) => x.json() );
// updateGeneratedUser(updateUser);
@@ -56,4 +57,4 @@
<style>
</style>
</style>

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

@@ -1,6 +1,7 @@
<script lang="ts">
import { onMount } from 'svelte';
import { Domain, Port } from "../Constantes.svelte";
export let user;
export let primary;
@@ -11,7 +12,7 @@
onMount( async() => {
// using this for now cuz for some reason there is yet to be a way to fet another person's avatar
if (primary) {
await fetch("http://transcendance:8080/api/v2/user/avatar", {method: "GET"})
await fetch("http://{Domain}:{Port}/api/v2/user/avatar", {method: "GET"})
.then(response => {return response.blob()})
.then(data => {
const url = URL.createObjectURL(data);
@@ -253,4 +254,4 @@
white-space: nowrap;
}
</style>
</style>

3
srcs/requirements/svelte/api_front/src/pieces/Header.svelte
View File

@@ -1,13 +1,14 @@
<script lang="ts">
import { push } from "svelte-spa-router";
import { location } from 'svelte-spa-router';
import { Domain, Port } from "../Constantes.svelte";
import active from 'svelte-spa-router/active'
// or i could leave them all and not display if they're active?
let handleClickLogout = async () => {
await fetch('http://transcendance:8080/api/v2/auth/logout', {
await fetch('http://{Domain}:{Port}/api/v2/auth/logout', {
method: 'POST',
})
// .then(resp => resp.json)

3
srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte
View File

@@ -2,13 +2,14 @@
<script lang="ts">
import Layouts from './Chat_layouts.svelte';
import { Domain, Port } from "../Constantes.svelte";
export let color = "transparent";
/* web sockets with socket.io
*/
import { onMount } from 'svelte';
import io from 'socket.io-client';
const socket = io('http://transcendance:8080', {
const socket = io('http://{Domain}:{Port}', {
path: '/chat'
});
onMount(async => {