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

Merge remote-tracking branch 'origin/master' into eric_front_and_back

Browse Source
This commit is contained in:
Me
2023-01-17 12:32:05 +01:00
parent 926fc1dd67 d8317350b0
commit 822543da3d
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,19 +390,20 @@
{/if}
{/if}
<div id="preload_font">.</div>
</div> <!-- div "game_page" -->
<style>
@font-face {
#preload_font {
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;
opacity:0;
height:0;
width:0;
display:inline-block;
}
.dim_background {
background-color: #222;
}

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

@@ -175,19 +175,19 @@
</div>
{/if}
<div id="preload_font">.</div>
</div> <!-- div "game_page" -->
<!-- -->
<style>
@font-face {
#preload_font {
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;
opacity:0;
height:0;
width:0;
display:inline-block;
}
.dim_background {

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

@@ -51,7 +51,7 @@
.then((response) => {
if (!response.ok) {
success.username = ''
errors.username = "Something went wrong";
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.`;
}
@@ -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 @@
<div class="label">Pick a new Avatar</div>
<input type="file" bind:files={newAvatar}/>
<div class="error">{errors.avatar}</div>
<div class="success">{success.avatar}</div>
</div>
<Button type={!newAvatar ? "primary" : "secondary"}>Upload Avatar</Button>
</form>
@@ -189,6 +192,7 @@
.form-field {
padding: 10px;
color: #333;
}
.label {