From 26db45d3dc37d09d49a7270fbcd32a148a226b2a Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Wed, 6 Dec 2023 16:21:14 +0100 Subject: [PATCH 1/9] Update push preview to look like a mobile device --- .../message-[message]/pushPreview.svelte | 4 +- .../push-notification-preview-dark.svg | 36 ++++++++++ .../push-notification-preview-light.svg | 35 ++++++++++ .../messaging/pushPhone.svelte | 67 +++++++++++++++++-- .../messaging/wizard/pushFormList.svelte | 11 ++- 5 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg create mode 100644 src/routes/console/project-[project]/messaging/push-notification-preview-light.svg diff --git a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte index e632394d5c..b5695ed3fb 100644 --- a/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte +++ b/src/routes/console/project-[project]/messaging/message-[message]/pushPreview.svelte @@ -8,7 +8,9 @@
Preview - +
+ +
diff --git a/src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg b/src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg new file mode 100644 index 0000000000..777dec2679 --- /dev/null +++ b/src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/console/project-[project]/messaging/push-notification-preview-light.svg b/src/routes/console/project-[project]/messaging/push-notification-preview-light.svg new file mode 100644 index 0000000000..7fd66545dd --- /dev/null +++ b/src/routes/console/project-[project]/messaging/push-notification-preview-light.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/console/project-[project]/messaging/pushPhone.svelte b/src/routes/console/project-[project]/messaging/pushPhone.svelte index 2acfc19f85..a6fb893f77 100644 --- a/src/routes/console/project-[project]/messaging/pushPhone.svelte +++ b/src/routes/console/project-[project]/messaging/pushPhone.svelte @@ -1,16 +1,73 @@ - -
-

{title}

-

{body}

+
+
+
+
+ {$project.name} +
+
now
+
+
+

{title || 'Message Title'}

+

+ {body || 'Enter your message in the input field on the left to see it here'} +

+
+
diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte index 49ec8bfcad..9329272b46 100644 --- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte @@ -97,7 +97,7 @@
- + + body={$messageParams[$providerType]['body']} + classes="is-only-desktop" /> +
+
+
From 48babe9e0ffa7334fd8a9d833ebc6b9ce80d8a5b Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Tue, 12 Dec 2023 13:30:19 -0800 Subject: [PATCH 2/9] Update SMS preview to look like a mobile device --- .../messaging/bubble-tail-dark.svg | 3 + .../messaging/bubble-tail-light.svg | 3 + .../messaging/sms-preview-dark.svg | 46 +++++++ .../messaging/sms-preview-light.svg | 41 ++++++ .../messaging/smsPhone.svelte | 118 +++++++++++++++++- .../messaging/wizard/smsFormList.svelte | 7 +- 6 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 src/routes/console/project-[project]/messaging/bubble-tail-dark.svg create mode 100644 src/routes/console/project-[project]/messaging/bubble-tail-light.svg create mode 100644 src/routes/console/project-[project]/messaging/sms-preview-dark.svg create mode 100644 src/routes/console/project-[project]/messaging/sms-preview-light.svg diff --git a/src/routes/console/project-[project]/messaging/bubble-tail-dark.svg b/src/routes/console/project-[project]/messaging/bubble-tail-dark.svg new file mode 100644 index 0000000000..b5e7c0ba72 --- /dev/null +++ b/src/routes/console/project-[project]/messaging/bubble-tail-dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/routes/console/project-[project]/messaging/bubble-tail-light.svg b/src/routes/console/project-[project]/messaging/bubble-tail-light.svg new file mode 100644 index 0000000000..9dcbbe34f4 --- /dev/null +++ b/src/routes/console/project-[project]/messaging/bubble-tail-light.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/routes/console/project-[project]/messaging/sms-preview-dark.svg b/src/routes/console/project-[project]/messaging/sms-preview-dark.svg new file mode 100644 index 0000000000..cafc7a33bc --- /dev/null +++ b/src/routes/console/project-[project]/messaging/sms-preview-dark.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/console/project-[project]/messaging/sms-preview-light.svg b/src/routes/console/project-[project]/messaging/sms-preview-light.svg new file mode 100644 index 0000000000..9e9099038a --- /dev/null +++ b/src/routes/console/project-[project]/messaging/sms-preview-light.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/routes/console/project-[project]/messaging/smsPhone.svelte b/src/routes/console/project-[project]/messaging/smsPhone.svelte index c7db28c112..dfa2f82615 100644 --- a/src/routes/console/project-[project]/messaging/smsPhone.svelte +++ b/src/routes/console/project-[project]/messaging/smsPhone.svelte @@ -1,14 +1,124 @@ - -
- {content} +
+
+ {getIntials($project.name)} +
+
{$project.name}
+
+
+ Today {getTime()} +
+
+
+ {content || 'Enter your message in the input field on the left to see it here'} +
+
+
diff --git a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte index 02de8c60f0..2ae489e6b2 100644 --- a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte @@ -61,7 +61,7 @@
- +
{/if} - + +
+
+
From cfcf17f0555811785bde16413b4d2fc5dd395e7b Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 14 Dec 2023 12:57:15 -0800 Subject: [PATCH 3/9] Fix export of the Filters component --- src/lib/components/filters/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/filters/index.ts b/src/lib/components/filters/index.ts index e2684f988f..223e43ebfa 100644 --- a/src/lib/components/filters/index.ts +++ b/src/lib/components/filters/index.ts @@ -1 +1,2 @@ -export { default as filters } from './filters.svelte'; +export { default as Filters } from './filters.svelte'; +export { hasPageQueries, queryParamToMap, queries } from '$lib/components/filters/store'; From 03852e1705f5a25018aece2561ca329268376500 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 14 Dec 2023 12:58:03 -0800 Subject: [PATCH 4/9] Create a component to handle 0 results from filtering --- src/lib/components/emptyFilter.svelte | 26 ++++++++++++++++++++++++++ src/lib/components/index.ts | 1 + 2 files changed, 27 insertions(+) create mode 100644 src/lib/components/emptyFilter.svelte diff --git a/src/lib/components/emptyFilter.svelte b/src/lib/components/emptyFilter.svelte new file mode 100644 index 0000000000..5515fbdd10 --- /dev/null +++ b/src/lib/components/emptyFilter.svelte @@ -0,0 +1,26 @@ + + + +
+
+ Sorry, we couldn't find any {resource}. +

There are no {resource} that match your filters.

+
+
+ +
+
+ diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index 781ce567c5..854ddb8df2 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -15,6 +15,7 @@ export { default as UploadBox } from './uploadBox.svelte'; export { default as List } from './list.svelte'; export { default as ListItem } from './listItem.svelte'; export { default as Empty } from './empty.svelte'; +export { default as EmptyFilter } from './emptyFilter.svelte'; export { default as EmptySearch } from './emptySearch.svelte'; export { default as Drop } from './drop.svelte'; export { default as DropList } from './dropList.svelte'; From 4158a8a5be63bdc321643c50a9a4a500282a31ef Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 14 Dec 2023 12:58:47 -0800 Subject: [PATCH 5/9] Allow controlling whether a column should be filterable --- src/lib/components/filters/content.svelte | 10 ++++++---- src/lib/helpers/types.ts | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte index 6da14dcc69..1f6717663c 100644 --- a/src/lib/components/filters/content.svelte +++ b/src/lib/components/filters/content.svelte @@ -118,10 +118,12 @@
({ - label: c.title, - value: c.id - }))} + options={$columns + .filter((c) => c.filter !== false) + .map((c) => ({ + label: c.title, + value: c.id + }))} placeholder="Select column" bind:value={columnId} /> Date: Thu, 14 Dec 2023 13:03:00 -0800 Subject: [PATCH 6/9] Update tables to show EmptyFilter if filter returns 0 results --- .../collection-[collection]/+page.svelte | 3 +-- .../database-[database]/collection-[collection]/+page.ts | 2 +- .../console/project-[project]/messaging/+page.svelte | 5 ++++- src/routes/console/project-[project]/messaging/+page.ts | 2 +- .../project-[project]/messaging/providers/+page.svelte | 7 +++++-- .../console/project-[project]/messaging/providers/+page.ts | 2 +- .../project-[project]/messaging/topics/+page.svelte | 7 +++++-- .../console/project-[project]/messaging/topics/+page.ts | 2 +- .../topics/topic-[topic]/subscribers/+page.svelte | 7 +++++-- .../messaging/topics/topic-[topic]/subscribers/+page.ts | 2 +- 10 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte index c622114491..e2948ef64b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte @@ -1,8 +1,7 @@ - +