From 758300ad186060b7f2abcefee09da47cb9a3d3d1 Mon Sep 17 00:00:00 2001 From: KanniShashankh Date: Fri, 15 Sep 2023 02:31:44 +0530 Subject: [PATCH 1/8] Updated Client Side Cron Regex --- src/lib/elements/forms/inputCron.svelte | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index 484b92756..96f088582 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -18,7 +18,19 @@ let element: HTMLInputElement; let error: string; - const pattern = String.raw`^[^]+\s+[^]+\s+[^]+\s+[^]+\s+[^]+`; + /* + Below is a regex pattern which allows us to validate the cron string. + The pattern is not perfect, but it is a good start. + Allowed values: + - minute: 0-59 + - hour: 0-23 + - day of month: 1-31 + - month: 1-12 + - day of week: 0-6 + - wildcard * + - step values + */ + const pattern = "^(\\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\\*\\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\\*|([0-9]|1[0-9]|2[0-3])|\\*\\/([0-9]|1[0-9]|2[0-3])) (\\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\\*\\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\\*|([1-9]|1[0-2])|\\*\\/([1-9]|1[0-2])) (\\*|([0-6])|\\*\\/([0-6]))$"; onMount(() => { if (element && autofocus) { From c3faa36259084d6633a188471c95b9ec96091e79 Mon Sep 17 00:00:00 2001 From: Shashankh Kanni Date: Wed, 11 Oct 2023 18:35:15 +0530 Subject: [PATCH 2/8] unit tests still faulty --- src/lib/elements/forms/inputCron.svelte | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index 96f088582..e0e048f29 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -18,20 +18,7 @@ let element: HTMLInputElement; let error: string; - /* - Below is a regex pattern which allows us to validate the cron string. - The pattern is not perfect, but it is a good start. - Allowed values: - - minute: 0-59 - - hour: 0-23 - - day of month: 1-31 - - month: 1-12 - - day of week: 0-6 - - wildcard * - - step values - */ - const pattern = "^(\\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\\*\\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\\*|([0-9]|1[0-9]|2[0-3])|\\*\\/([0-9]|1[0-9]|2[0-3])) (\\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\\*\\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\\*|([1-9]|1[0-2])|\\*\\/([1-9]|1[0-2])) (\\*|([0-6])|\\*\\/([0-6]))$"; - + const pattern = String.raw`/^(\*|\?|[0-5]?\d)(\,(\*|\?|[0-5]?\d)|\-(\*|\?|[0-5]?\d)|\/\d+)?\s+(\*|\?|[01]?\d|2[0-3])(\,(\*|\?|[01]?\d|2[0-3])|\-(\*|\?|[01]?\d|2[0-3])|\/\d+)?\s+(\*|\?|[1-9]|[12]\d|3[01])(W?)(\,(\*|\?|[1-9]|[12]\d|3[01])|\-(\*|\?|[1-9]|[12]\d|3[01])|\/\d+)?\s+(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(\,(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)|\-(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)|\/\d+)?\s+(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)(\,(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)|\-(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)|\/\d((\#?)(\d?))(\w?)+)?$/i`; onMount(() => { if (element && autofocus) { element.focus(); @@ -66,6 +53,7 @@
Date: Wed, 11 Oct 2023 18:38:29 +0530 Subject: [PATCH 3/8] changes --- src/lib/elements/forms/inputCron.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index e0e048f29..4df98ed16 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -53,7 +53,6 @@
Date: Wed, 11 Oct 2023 18:46:03 +0530 Subject: [PATCH 4/8] simplified regex --- src/lib/elements/forms/inputCron.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index 4df98ed16..736b19f53 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -18,7 +18,7 @@ let element: HTMLInputElement; let error: string; - const pattern = String.raw`/^(\*|\?|[0-5]?\d)(\,(\*|\?|[0-5]?\d)|\-(\*|\?|[0-5]?\d)|\/\d+)?\s+(\*|\?|[01]?\d|2[0-3])(\,(\*|\?|[01]?\d|2[0-3])|\-(\*|\?|[01]?\d|2[0-3])|\/\d+)?\s+(\*|\?|[1-9]|[12]\d|3[01])(W?)(\,(\*|\?|[1-9]|[12]\d|3[01])|\-(\*|\?|[1-9]|[12]\d|3[01])|\/\d+)?\s+(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)(\,(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)|\-(\*|\?|[1-9]|1[0-2]|jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)|\/\d+)?\s+(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)(\,(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)|\-(\*|\?|[0-7]((\#?)(\d?))(\w?)|sun|mon|tue|wed|thu|fri|sat)|\/\d((\#?)(\d?))(\w?)+)?$/i`; + const pattern = String.raw`^.*\s+.*\s+.*\s+.*\s+.*`; onMount(() => { if (element && autofocus) { element.focus(); From 004cd6d5a4da0847be33a1f7df9aad4e1c3a87ae Mon Sep 17 00:00:00 2001 From: K Shashankh Vasudev <63902267+KanniShashankh@users.noreply.github.com> Date: Wed, 11 Oct 2023 19:44:49 +0530 Subject: [PATCH 5/8] Added a space :) --- src/lib/elements/forms/inputCron.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte index 736b19f53..48d71b7d5 100644 --- a/src/lib/elements/forms/inputCron.svelte +++ b/src/lib/elements/forms/inputCron.svelte @@ -19,6 +19,7 @@ let error: string; const pattern = String.raw`^.*\s+.*\s+.*\s+.*\s+.*`; + onMount(() => { if (element && autofocus) { element.focus(); From a0e05844256a7921a6c4b2598fc8aaa58882cce2 Mon Sep 17 00:00:00 2001 From: wess Date: Mon, 16 Oct 2023 12:01:32 -0400 Subject: [PATCH 6/8] Adds a couple of env ignores User Verify button shows "Verify" until both email and password are verified. Runs formatter --- .gitignore | 135 +++++++++++++++++- .../auth/user-[user]/updateStatus.svelte | 3 +- 2 files changed, 136 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 183c55563..b48046270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .DS_Store +.envrc +.vscode node_modules /build /.svelte-kit @@ -14,4 +16,135 @@ node_modules/ dist/ .vercel -*.swp \ No newline at end of file +*.swp +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test +.env.production + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +### Node Patch ### +# Serverless Webpack directories +.webpack/ + +# Optional stylelint cache +.stylelintcache + +# SvelteKit build / generate output +.svelte-kit + + diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte index 80fe968c8..6c155ae4e 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -139,7 +139,8 @@ updateVerificationEmail()}> From 779db3026211168772723083fa6e5c97667df946 Mon Sep 17 00:00:00 2001 From: wess Date: Mon, 16 Oct 2023 12:10:14 -0400 Subject: [PATCH 7/8] Changes Logout to Sign out on User sessions view --- src/routes/console/account/sessions/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte index 399792e04..9268f0506 100644 --- a/src/routes/console/account/sessions/+page.svelte +++ b/src/routes/console/account/sessions/+page.svelte @@ -48,7 +48,7 @@ Sessions
@@ -100,7 +100,7 @@ {session.ip} - + {/each} From 80289f2de401c326978173730d23ad4e35a61bbc Mon Sep 17 00:00:00 2001 From: wess Date: Mon, 16 Oct 2023 14:40:06 -0400 Subject: [PATCH 8/8] Adding data privacy fields --- src/lib/components/status.svelte | 2 +- src/lib/layout/header.svelte | 4 ++-- src/routes/console/account/+page.svelte | 2 +- .../organization-[organization]/deleteOrganization.svelte | 2 +- .../console/organization-[organization]/settings/+page.svelte | 2 +- .../overview/keys/[key]/+page@project-[project].svelte | 4 ++-- .../console/project-[project]/settings/deleteProject.svelte | 2 +- .../settings/migrations/(import)/step1.svelte | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/components/status.svelte b/src/lib/components/status.svelte index ca140ceb9..00ed3353e 100644 --- a/src/lib/components/status.svelte +++ b/src/lib/components/status.svelte @@ -18,5 +18,5 @@ {#if status} {/if} - +
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index dbaff6206..54422dd82 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -133,9 +133,9 @@ +

{/if} {:else if $provider.provider === 'supabase'}