Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hiding incomplete elements #187

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+44 −43
Open

Hiding incomplete elements #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions src/lib/components/select/account.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
opacity: 1
}}
>
<h2 use:melt={$title} class="h3 mb-0">{network}</h2>
<h2 use:melt={$title} class="h3 mb-8">{network.chain.name}</h2>
<section>
<Stack class="">
{#if context.wharf.session}
Expand All @@ -135,15 +135,12 @@
<p class="truncate">{String(context.wharf.session.chain.id)}</p>
</Stack>
</Stack>
{:else}
Not logged in
{/if}

<h2 class="h2">Controls</h2>
<Button onclick={addSession} variant="secondary">Login</Button>
<Button href={`/${network}/signup`} onclick={closeDrawer} variant="secondary"
<!-- <Button href={`/${network}/signup`} onclick={closeDrawer} variant="secondary"
>Signup</Button
>
> -->
{#if context.wharf.session}
<Button onclick={() => removeSession(currentSession)} variant="secondary">
Logout ({context.wharf.session.actor})
Expand All @@ -153,29 +150,33 @@
<Button onclick={removeAllSessions} variant="secondary">Logout (All Accounts)</Button>
{/if}

<h2 class="h2">Sessions</h2>
<p>The available sessions that can be used.</p>
{#each context.wharf.sessions as session}
{#if network.chain.id.equals(session.chain)}
<Button onclick={() => switchSession(session)} variant="secondary">
<span class="self-start">
{session.actor}@{session.permission}
</span>
<span class="truncate">
({chainMapper.toShortName(String(session.chain))})
</span>
{#if context.wharf.sessions.length}
<h2 class="h2">Sessions</h2>
<p>The available sessions that can be used.</p>
{#each context.wharf.sessions as session}
{#if network.chain.id.equals(session.chain)}
<Button onclick={() => switchSession(session)} variant="secondary">
<span class="self-start">
{session.actor}@{session.permission}
</span>
<span class="truncate">
({chainMapper.toShortName(String(session.chain))})
</span>
</Button>
{/if}
{/each}
{/if}

<div class="hidden">
<h2 class="h2">Switch Network</h2>
{#each chainShortNames as chain}
{@const isCurrent = chain === String(network)}
<Button variant={isCurrent ? 'secondary' : 'primary'} href={`/${chain}`}>
{chain}
{isCurrent ? '(Selected)' : ''}
</Button>
{/if}
{/each}

<h2 class="h2">Switch Network</h2>
{#each chainShortNames as chain}
{@const isCurrent = chain === String(network)}
<Button variant={isCurrent ? 'secondary' : 'primary'} href={`/${chain}`}>
{chain}
{isCurrent ? '(Selected)' : ''}
</Button>
{/each}
{/each}
</div>
</Stack>
</section>
<button
Expand Down
8 changes: 4 additions & 4 deletions src/routes/[network]/(account)/ram/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
<Button
variant="outline"
class="flex-1 bg-blue-500 hover:bg-blue-600"
href="/{String(data.network)}/ram/sell"
href="/{String(data.network)}/ram/buy"
>
Sell
Buy
</Button>
</div>
<div class="mb-4 w-1/2">
Expand All @@ -101,9 +101,9 @@
<Button
variant="outline"
class="flex-1 bg-blue-500 hover:bg-blue-600"
href="/{String(data.network)}/ram/buy"
href="/{String(data.network)}/ram/sell"
>
Buy
Sell
</Button>
</div>
</Card>
Expand Down
20 changes: 10 additions & 10 deletions src/routes/[network]/(homepage)/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
<p class="mb-2 text-balance text-xl leading-tight text-white/60 md:text-2xl md:leading-tight">
Stake, Send, Manage Tokens, and Explore EOS – all with ease
</p>
<Button href={`/${data.network}/signup`}>Create your EOS account now</Button>
<!-- <Button href={`/${data.network}/signup`}>Create your EOS account now</Button> -->
<Button disabled>Create your EOS account (Coming Soon)</Button>
</Stack>

<!-- Network logo -->
Expand Down Expand Up @@ -88,7 +89,7 @@

<!-- Carousel -->

<section class="col-span-full @container">
<section class="col-span-full hidden @container">
<div class="grid min-h-72 rounded-2xl bg-mineShaft-950 px-4 @xl:grid-cols-2 @xl:gap-4">
<div class="grid place-items-center">
<svg
Expand Down Expand Up @@ -138,7 +139,7 @@
</div>
</section>

<section class="col-span-full grid grid-cols-subgrid gap-8">
<section class="col-span-full grid hidden grid-cols-subgrid gap-8">
<!-- Text -->
<div
class="z-20 col-span-full row-start-1 max-w-md place-self-center justify-self-start text-balance xs:col-span-1 sm:col-span-full sm:justify-self-auto md:row-span-2 md:row-start-1 md:max-w-md lg:col-span-4 lg:row-auto lg:content-center"
Expand All @@ -147,8 +148,8 @@
title: `Stake your tokens for ${APY}% APY`,
text: 'TODO: The APY is an estimate, and may fluctuate based on how many and much others are staking. Your 21 day lockup period starts when you unstake your EOS. You will always get back your staked EOS.',
button: {
text: 'Get a free account',
href: `/${data.network}/signup`
text: 'My Staking',
href: `/${data.network}/staking`
}
})}
</div>
Expand All @@ -162,22 +163,21 @@
</section>

<!-- Charts -->
<section class="col-span-full">
<section class="col-span-full hidden">
<Switcher>
<div>
{@render textblock({
title: `EOS Token`,
title: `RAM Market`,
text: 'TODO: The APY is an estimate, and may fluctuate based on how many and much others are staking. Your 21 day lockup period starts when you unstake your EOS. You will always get back your staked EOS.',
button: {
text: 'Live network overview',
href: `#`
}
})}
</div>

<div>
{@render textblock({
title: `RAM Market`,
title: `EOS Token`,
text: 'TODO: The APY is an estimate, and may fluctuate based on how many and much others are staking. Your 21 day lockup period starts when you unstake your EOS. You will always get back your staked EOS.',
button: {
text: 'Live network overview',
Expand All @@ -189,7 +189,7 @@
</section>

<!-- Performance grid -->
<section class="col-span-full grid grid-cols-subgrid gap-8">
<section class="col-span-full grid hidden hidden grid-cols-subgrid gap-8">
<!-- Text -->
<div class=" col-span-full grid items-center text-balance lg:col-span-3 lg:row-start-1">
{@render textblock({
Expand Down
2 changes: 1 addition & 1 deletion src/routes/[network]/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
{@render children()}
</main>

<Footer />
<!-- <Footer /> -->
</div>

<!-- This wrapper sets up the bottom menu on mobile, becomes hidden on desktop -->
Expand Down
Loading