Compare commits

..

No commits in common. "ad2c91db4d536f2822d3961fd9089b83dd95b2b3" and "dfa933fb878ba2f1138fa765cdf110db32753f66" have entirely different histories.

3 changed files with 11 additions and 22 deletions

View File

@ -12,7 +12,7 @@
UserSettingsSolid,
} from "flowbite-svelte-icons";
import ezppLogo from "../public/favicon.png";
import { currentPage, currentUser, launching } from "./storage/localStore";
import { currentPage, currentUser } from "./storage/localStore";
import { Page } from "./consts/pages";
import Login from "./pages/Login.svelte";
import Launch from "./pages/Launch.svelte";
@ -65,9 +65,7 @@
</DropdownHeader>
<DropdownItem
class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
on:click={() => {
if (!$launching) currentPage.set(Page.Settings);
}}
on:click={() => currentPage.set(Page.Settings)}
>
<UserSettingsSolid class="select-none outline-none border-none" />
Settings
@ -76,9 +74,7 @@
{#if loggedIn}
<DropdownItem
class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
on:click={() => {
if (!$launching) logout();
}}
on:click={logout}
>
<ArrowRightFromBracketSolid
class="select-none outline-none border-none"
@ -88,9 +84,7 @@
{:else}
<DropdownItem
class="flex flex-row gap-2 border-0 dark:!bg-gray-700 dark:active:!bg-gray-900 dark:hover:!bg-gray-800 transition-colors"
on:click={() => {
if (!$launching) currentPage.set(Page.Login);
}}
on:click={() => currentPage.set(Page.Login)}
>
<ArrowRightToBracketSolid
class="select-none outline-none border-none"

View File

@ -1,8 +1,9 @@
<script lang="ts">
import { Button, Checkbox } from "flowbite-svelte";
import Progressbar from "../lib/Progressbar.svelte";
import { launching, patch } from "./../storage/localStore";
let progressbarFix = true;
let launching = false;
let patch = true;
setTimeout(() => {
progressbarFix = false;
@ -18,19 +19,15 @@
<Button
color="light"
size="xl"
class="dark:active:!bg-gray-900 {$launching
class="dark:active:!bg-gray-900 {launching
? ''
: 'active:scale-95 '}transition-transform duration-75"
disabled={$launching}
on:click={() => launching.set(!$launching)}>Launch</Button
>
<Checkbox
disabled={$launching}
bind:checked={$patch}
on:click={() => patch.set(!$patch)}>Patch</Checkbox
disabled={launching}
on:click={() => (launching = !launching)}>Launch</Button
>
<Checkbox disabled={launching} bind:checked={patch}>Patch</Checkbox>
<div
class="w-full flex flex-col justify-center items-center gap-2 mt-2 {$launching
class="w-full flex flex-col justify-center items-center gap-2 mt-2 {launching
? 'animate-fadeIn '
: 'animate-fadeOut '}{progressbarFix ? '!opacity-0' : 'opacity-0'}"
>

View File

@ -3,7 +3,5 @@ import { Page } from "../consts/pages";
import type { User } from "../types/user";
export const startup = writable(false);
export const launching = writable(false);
export const patch = writable(true);
export const currentUser: Writable<undefined | User> = writable(undefined);
export const currentPage = writable(Page.Login);