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