From 51debc3182aa942d9a0cd906d077fb9eb97cd4a9 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Fri, 7 Oct 2022 23:31:14 -0400 Subject: [PATCH 1/4] Clean up login/register forms --- src/routes/(nolayout)/login/+page.svelte | 27 +++----------- src/routes/(nolayout)/register/+page.svelte | 41 ++++----------------- 2 files changed, 13 insertions(+), 55 deletions(-) diff --git a/src/routes/(nolayout)/login/+page.svelte b/src/routes/(nolayout)/login/+page.svelte index 8b6191f..88cf6e5 100644 --- a/src/routes/(nolayout)/login/+page.svelte +++ b/src/routes/(nolayout)/login/+page.svelte @@ -3,25 +3,10 @@
diff --git a/src/routes/(nolayout)/register/+page.svelte b/src/routes/(nolayout)/register/+page.svelte index 34471a9..5bd5149 100644 --- a/src/routes/(nolayout)/register/+page.svelte +++ b/src/routes/(nolayout)/register/+page.svelte @@ -3,39 +3,12 @@Create an Account!
- - - - - - From d17acceec8a7d5fc5f7853920a5335209b6376db Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Fri, 7 Oct 2022 23:41:12 -0400 Subject: [PATCH 2/4] Fix env vars --- vite.config.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vite.config.js b/vite.config.js index e103e0a..fc9d5f4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,10 +1,7 @@ import { sveltekit } from "@sveltejs/kit/vite"; const config = { - plugins: [sveltekit()], - define: { - "process.env": process.env - } + plugins: [sveltekit()] }; export default config; From 578a21b669a4db3ebec0c927cf0d5a107a4307ae Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Fri, 7 Oct 2022 23:45:37 -0400 Subject: [PATCH 3/4] Actually fix env vars this time --- src/hooks.server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks.server.js b/src/hooks.server.js index 9351322..f9698bd 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -1,6 +1,6 @@ /** @type {import('@sveltejs/kit').Handle} */ export async function handle({ event, resolve }) { - if (event.url.pathname !== "/maintenance" && process.env.MAINTENANCE == "true" && process.env.PRODUCTION == "true") { + if (event.url.pathname !== "/maintenance" && process.env.MAINTENANCE) { return new Response("", { status: 302, headers: { Location: "/maintenance" } }); } From 578ac7297cad9dfe8e087963b46bf660d0600380 Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Fri, 7 Oct 2022 23:48:04 -0400 Subject: [PATCH 4/4] Disable ci/cd --- .github/workflows/production.yml | 3 --- .github/workflows/sitetest.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index bcb416f..af3571f 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -2,9 +2,6 @@ name: "production deploy" on: workflow_dispatch: - push: - branches: - - master jobs: deploy: diff --git a/.github/workflows/sitetest.yml b/.github/workflows/sitetest.yml index 5b0eec2..8d32f86 100644 --- a/.github/workflows/sitetest.yml +++ b/.github/workflows/sitetest.yml @@ -2,9 +2,6 @@ name: "sitetest deploy" on: workflow_dispatch: - push: - branches: - - sitetest jobs: deploy: