fix layout for sveltekit 1.0

This commit is contained in:
Ruben Fiszel
2022-12-27 07:27:14 +01:00
parent b24f3472d1
commit 1b0bb22da7
13 changed files with 92 additions and 60 deletions
+34
View File
@@ -32,6 +32,7 @@
"@playwright/test": "^1.28.0",
"@sveltejs/adapter-static": "^1.0.0",
"@sveltejs/kit": "^1.0.0-next.589",
"@sveltejs/package": "^1.0.1",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.8",
"@types/node": "^18.11.9",
@@ -824,6 +825,27 @@
"vite": "^4.0.0"
}
},
"node_modules/@sveltejs/package": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@sveltejs/package/-/package-1.0.1.tgz",
"integrity": "sha512-iYoDz4AEJQUfdKUfBcwtYEGYkf4NMByQL3Sl2ESnu+IXsLNsHvhH0zUDhAmUmAgcrH8fVjiR7FuJeyh+7EQtiw==",
"dev": true,
"dependencies": {
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
"sade": "^1.8.1",
"svelte2tsx": "~0.5.20"
},
"bin": {
"svelte-package": "svelte-package.js"
},
"engines": {
"node": "^16.14 || >=18"
},
"peerDependencies": {
"svelte": "^3.44.0"
}
},
"node_modules/@sveltejs/vite-plugin-svelte": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.0.2.tgz",
@@ -7601,6 +7623,18 @@
"undici": "5.14.0"
}
},
"@sveltejs/package": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@sveltejs/package/-/package-1.0.1.tgz",
"integrity": "sha512-iYoDz4AEJQUfdKUfBcwtYEGYkf4NMByQL3Sl2ESnu+IXsLNsHvhH0zUDhAmUmAgcrH8fVjiR7FuJeyh+7EQtiw==",
"dev": true,
"requires": {
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
"sade": "^1.8.1",
"svelte2tsx": "~0.5.20"
}
},
"@sveltejs/vite-plugin-svelte": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-2.0.2.tgz",
+2 -1
View File
@@ -9,7 +9,7 @@
"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "prettier --ignore-path .gitignore --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .",
"format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. .",
"package": "svelte-kit package && cd package && rm README.md && rm README_DEV.md && sed -i -e 's/windmill/windmill-components/g' package.json",
"package": "svelte-package && cd package && rm README.md && rm README_DEV.md && sed -i -e 's/windmill/windmill-components/g' package.json",
"generate-backend-client": "openapi --input ../backend/windmill-api/openapi.yaml --output ./src/lib/gen --useOptions && sed -i '213 i \\ request.referrerPolicy = \"no-referrer\"\n' src/lib/gen/core/request.ts",
"pretest": "tsc --incremental -p tests/tsconfig.json",
"test": "playwright test --config=tests-out/playwright.config.js"
@@ -18,6 +18,7 @@
"@playwright/test": "^1.28.0",
"@sveltejs/adapter-static": "^1.0.0",
"@sveltejs/kit": "^1.0.0-next.589",
"@sveltejs/package": "^1.0.1",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.8",
"@types/vscode": "~1.74.0",
-1
View File
@@ -24,6 +24,5 @@ async function clearUser() {
clearStores()
await UserService.logout()
} catch (error) {
console.error(error)
}
}
@@ -9,7 +9,6 @@
import WorkspaceMenu from '$lib/components/sidebar/WorkspaceMenu.svelte'
import SidebarContent from '$lib/components/sidebar/SidebarContent.svelte'
import '$lib/assets/app.css'
import { starStore, superadmin, usageStore, userStore, workspaceStore } from '$lib/stores'
import CenteredModal from '$lib/components/CenteredModal.svelte'
import { beforeNavigate, goto } from '$app/navigation'
@@ -116,68 +116,66 @@
}
</script>
<div class="min-h-screen antialiased text-gray-900">
<!-- Enable submit form on enter -->
<CenteredModal title="Login">
<div class="justify-center text-center flex flex-col">
{#each providers as { type, icon, name }}
{#if logins.includes(type)}
<Button
color="dark"
variant="border"
endIcon={{ icon }}
btnClasses="mt-2 w-full"
on:click={() => storeRedirect(type)}
>
{name}
</Button>
{/if}
{/each}
{#each logins.filter((x) => !providersType.includes(x)) as login}
<!-- Enable submit form on enter -->
<CenteredModal title="Login">
<div class="justify-center text-center flex flex-col">
{#each providers as { type, icon, name }}
{#if logins.includes(type)}
<Button
color="dark"
variant="border"
endIcon={{ icon }}
btnClasses="mt-2 w-full"
on:click={() => storeRedirect(login)}
on:click={() => storeRedirect(type)}
>
{login}
{name}
</Button>
{/each}
</div>
<div class="flex flex-row-reverse w-full">
<button
class="my-6 text-xs text-blue-400 m-auto"
id="showPassword"
on:click={() => {
showPassword = !showPassword
}}>login without third-party</button
{/if}
{/each}
{#each logins.filter((x) => !providersType.includes(x)) as login}
<Button
color="dark"
variant="border"
btnClasses="mt-2 w-full"
on:click={() => storeRedirect(login)}
>
</div>
{#if showPassword}
<div transition:slide>
<p class="text-xs text-gray-400 italic my-2">
To get credentials without the OAuth providers above, you can send us an email at
contact@windmill.dev or your admin owners if this instance is self-hosted and you will
receive credentials that you can use below.
</p>
<label class="block pb-2">
<span class="text-gray-700">email</span>
<input type="text" bind:value={email} class="mt-1" id="email" />
</label>
<label class="block ">
<span class="text-gray-700">password</span>
<input
type="password"
on:keyup={handleKeyUp}
bind:value={password}
class="mt-1"
id="password"
/>
</label>
<div class="flex justify-end pt-4">
<Button id="login2" on:click={login}>Login</Button>
</div>
{login}
</Button>
{/each}
</div>
<div class="flex flex-row-reverse w-full">
<button
class="my-6 text-xs text-blue-400 m-auto"
id="showPassword"
on:click={() => {
showPassword = !showPassword
}}>login without third-party</button
>
</div>
{#if showPassword}
<div transition:slide>
<p class="text-xs text-gray-400 italic my-2">
To get credentials without the OAuth providers above, you can send us an email at
contact@windmill.dev or your admin owners if this instance is self-hosted and you will
receive credentials that you can use below.
</p>
<label class="block pb-2">
<span class="text-gray-700">email</span>
<input type="text" bind:value={email} class="mt-1" id="email" />
</label>
<label class="block ">
<span class="text-gray-700">password</span>
<input
type="password"
on:keyup={handleKeyUp}
bind:value={password}
class="mt-1"
id="password"
/>
</label>
<div class="flex justify-end pt-4">
<Button id="login2" on:click={login}>Login</Button>
</div>
{/if}
</CenteredModal>
</div>
</div>
{/if}
</CenteredModal>
+1
View File
@@ -7,6 +7,7 @@
import { page } from '$app/stores'
import { SvelteToast } from '@zerodevx/svelte-toast'
import '$lib/assets/app.css'
// Default toast options
const toastOptions = {