From 1b0bb22da75997e64d9ed709f2b3b9baad69f2c8 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 27 Dec 2022 07:27:14 +0100 Subject: [PATCH] fix layout for sveltekit 1.0 --- frontend/package-lock.json | 34 ++++++ frontend/package.json | 3 +- frontend/src/lib/logout.ts | 1 - .../src/routes/(root)/(logged)/+layout.svelte | 1 - .../user/{ => (user)}/+layout@(root).svelte | 0 .../accept_invite/+page.svelte} | 0 .../create_workspace/+page.svelte | 0 .../(logged)/user/{ => (user)}/login/+page.js | 0 .../user/{ => (user)}/login/+page.svelte | 112 +++++++++--------- .../user/{ => (user)}/workspaces/+page.js | 0 .../user/{ => (user)}/workspaces/+page.svelte | 0 frontend/src/routes/+layout.svelte | 1 + .../[job]/[resume]}/[hmac]/+page.svelte | 0 13 files changed, 92 insertions(+), 60 deletions(-) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/+layout@(root).svelte (100%) rename frontend/src/routes/(root)/(logged)/user/{accept_invite/+page@user.svelte => (user)/accept_invite/+page.svelte} (100%) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/create_workspace/+page.svelte (100%) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/login/+page.js (100%) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/login/+page.svelte (62%) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/workspaces/+page.js (100%) rename frontend/src/routes/(root)/(logged)/user/{ => (user)}/workspaces/+page.svelte (100%) rename frontend/src/routes/{ => approve/[workspace]/[job]/[resume]}/[hmac]/+page.svelte (100%) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 346e57d5e0..4fc7794aa2 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -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", diff --git a/frontend/package.json b/frontend/package.json index 03b8d5f444..7522d322cd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -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", diff --git a/frontend/src/lib/logout.ts b/frontend/src/lib/logout.ts index 4871747fee..c2e9a6380d 100644 --- a/frontend/src/lib/logout.ts +++ b/frontend/src/lib/logout.ts @@ -24,6 +24,5 @@ async function clearUser() { clearStores() await UserService.logout() } catch (error) { - console.error(error) } } \ No newline at end of file diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte index 959dce176c..f009d219ca 100644 --- a/frontend/src/routes/(root)/(logged)/+layout.svelte +++ b/frontend/src/routes/(root)/(logged)/+layout.svelte @@ -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' diff --git a/frontend/src/routes/(root)/(logged)/user/+layout@(root).svelte b/frontend/src/routes/(root)/(logged)/user/(user)/+layout@(root).svelte similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/+layout@(root).svelte rename to frontend/src/routes/(root)/(logged)/user/(user)/+layout@(root).svelte diff --git a/frontend/src/routes/(root)/(logged)/user/accept_invite/+page@user.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/accept_invite/+page.svelte similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/accept_invite/+page@user.svelte rename to frontend/src/routes/(root)/(logged)/user/(user)/accept_invite/+page.svelte diff --git a/frontend/src/routes/(root)/(logged)/user/create_workspace/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/create_workspace/+page.svelte rename to frontend/src/routes/(root)/(logged)/user/(user)/create_workspace/+page.svelte diff --git a/frontend/src/routes/(root)/(logged)/user/login/+page.js b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.js similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/login/+page.js rename to frontend/src/routes/(root)/(logged)/user/(user)/login/+page.js diff --git a/frontend/src/routes/(root)/(logged)/user/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte similarity index 62% rename from frontend/src/routes/(root)/(logged)/user/login/+page.svelte rename to frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte index f13f4c16fb..c115500101 100644 --- a/frontend/src/routes/(root)/(logged)/user/login/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte @@ -116,68 +116,66 @@ } -
- - -
- {#each providers as { type, icon, name }} - {#if logins.includes(type)} - - {/if} - {/each} - {#each logins.filter((x) => !providersType.includes(x)) as login} + + +
+ {#each providers as { type, icon, name }} + {#if logins.includes(type)} - {/each} -
-
- !providersType.includes(x)) as login} +
- {#if showPassword} -
-

- 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. -

- - -
- -
+ {login} + + {/each} +
+
+ +
+ {#if showPassword} +
+

+ 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. +

+ + +
+
- {/if} - -
+
+ {/if} + diff --git a/frontend/src/routes/(root)/(logged)/user/workspaces/+page.js b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.js similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/workspaces/+page.js rename to frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.js diff --git a/frontend/src/routes/(root)/(logged)/user/workspaces/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte similarity index 100% rename from frontend/src/routes/(root)/(logged)/user/workspaces/+page.svelte rename to frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index 2041aec94d..0523c1e4a8 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -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 = { diff --git a/frontend/src/routes/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte similarity index 100% rename from frontend/src/routes/[hmac]/+page.svelte rename to frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte