Merge branch 'master' of bitbucket.org:LuckyLaszlo/ft_transcendence
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
{#if user !== undefined}
|
{#if user !== undefined}
|
||||||
<GenerateUserDisplay user={user}/>
|
<GenerateUserDisplay user={user}/>
|
||||||
<button on:click={() => (push('/profile/settings'))}>Profile Settings</button>
|
<button on:click={() => (push('/profile/settings'))}>Profile Settings</button>
|
||||||
|
<!-- Match History -->
|
||||||
{:else}
|
{:else}
|
||||||
<h2>Sorry</h2>
|
<h2>Sorry</h2>
|
||||||
<div>Failed to load current</div>
|
<div>Failed to load current</div>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
<div class="background-pages">
|
<div class="background-pages">
|
||||||
{#if oneUser}
|
{#if oneUser}
|
||||||
<GenerateUserDisplay user={oneUser}/>
|
<GenerateUserDisplay user={oneUser}/>
|
||||||
|
<!-- Match history -->
|
||||||
{:else}
|
{:else}
|
||||||
<h2>Sorry</h2>
|
<h2>Sorry</h2>
|
||||||
<div>Failed to load user {params.username}</div>
|
<div>Failed to load user {params.username}</div>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
import { fetchUser, fetchAllUsers, fetchAvatar } from "../../pieces/utils";
|
import { fetchUser, fetchAllUsers, fetchAvatar } from "../../pieces/utils";
|
||||||
|
|
||||||
import { clickOutside } from '../../pieces/clickOutside'
|
import { clickOutside } from '../../pieces/clickOutside'
|
||||||
|
import { push } from "svelte-spa-router";
|
||||||
|
|
||||||
let user;
|
let user;
|
||||||
let allUsers = [];
|
let allUsers = [];
|
||||||
@@ -441,6 +442,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
<button on:click={() => push(`/profile/users/${usernameBeingViewed}`)}>Profile Page</button>
|
||||||
<button on:click={() => unViewAUser()}>Close</button>
|
<button on:click={() => unViewAUser()}>Close</button>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
Reference in New Issue
Block a user