From c96e1edd30b4583436f99bc53113e43609797165 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 17:02:51 +0800 Subject: [PATCH 001/106] fix(gui-v2): resize header option dropdown --- packages/nc-gui-v2/components/api-client/Headers.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui-v2/components/api-client/Headers.vue b/packages/nc-gui-v2/components/api-client/Headers.vue index e465ffcdfc..7d5685275b 100644 --- a/packages/nc-gui-v2/components/api-client/Headers.vue +++ b/packages/nc-gui-v2/components/api-client/Headers.vue @@ -85,7 +85,7 @@ const deleteHeaderRow = (idx: number) => vModel.value.splice(idx, 1) - + @@ -94,7 +94,7 @@ const deleteHeaderRow = (idx: number) => vModel.value.splice(idx, 1) - + From bab571e2765fe987ed0f498d1fe6a0a62443c230 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 17:11:37 +0800 Subject: [PATCH 002/106] fix(gui-v2): add scrollbar for listing --- packages/nc-gui-v2/components/webhook/List.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/components/webhook/List.vue b/packages/nc-gui-v2/components/webhook/List.vue index c05cfdaa50..42e07b55e3 100644 --- a/packages/nc-gui-v2/components/webhook/List.vue +++ b/packages/nc-gui-v2/components/webhook/List.vue @@ -58,7 +58,11 @@ onMounted(() => {
- + + + +
+ +
+
diff --git a/packages/nc-gui-v2/package-lock.json b/packages/nc-gui-v2/package-lock.json index 39f21c9386..d3a429e9e7 100644 --- a/packages/nc-gui-v2/package-lock.json +++ b/packages/nc-gui-v2/package-lock.json @@ -23,6 +23,7 @@ "url": "^0.11.0", "util": "^0.12.4", "vue-dompurify-html": "^3.0.0", + "vue-github-button": "^3.0.3", "vue-i18n": "^9.1.10", "vuedraggable": "^4.1.0", "vuetify": "^3.0.0-alpha.13", @@ -7596,6 +7597,11 @@ "git-up": "^4.0.0" } }, + "node_modules/github-buttons": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/github-buttons/-/github-buttons-2.22.0.tgz", + "integrity": "sha512-N5bk01s1WgK1FVtoeSUVkRkJpkaSu8yHMPcjye+PTa0jsRjMRNrYqVLgpUf2RA5Kvec05DfHYAT6/68fwkdqPw==" + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -14596,6 +14602,14 @@ "node": ">=4.0" } }, + "node_modules/vue-github-button": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vue-github-button/-/vue-github-button-3.0.3.tgz", + "integrity": "sha512-O2Kv5HxRMn1qqgt2sSy8N7y2C6WGOeICzgGj6y+JFcnLjorTTzNR8vY5abiPOYDiW03WZ/9hUIn7Gm9CG9pIuA==", + "dependencies": { + "github-buttons": "^2.21.1" + } + }, "node_modules/vue-i18n": { "version": "9.1.10", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz", @@ -20865,6 +20879,11 @@ "git-up": "^4.0.0" } }, + "github-buttons": { + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/github-buttons/-/github-buttons-2.22.0.tgz", + "integrity": "sha512-N5bk01s1WgK1FVtoeSUVkRkJpkaSu8yHMPcjye+PTa0jsRjMRNrYqVLgpUf2RA5Kvec05DfHYAT6/68fwkdqPw==" + }, "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -26088,6 +26107,14 @@ } } }, + "vue-github-button": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vue-github-button/-/vue-github-button-3.0.3.tgz", + "integrity": "sha512-O2Kv5HxRMn1qqgt2sSy8N7y2C6WGOeICzgGj6y+JFcnLjorTTzNR8vY5abiPOYDiW03WZ/9hUIn7Gm9CG9pIuA==", + "requires": { + "github-buttons": "^2.21.1" + } + }, "vue-i18n": { "version": "9.1.10", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.10.tgz", diff --git a/packages/nc-gui-v2/package.json b/packages/nc-gui-v2/package.json index efa84dabdc..3e22e01819 100644 --- a/packages/nc-gui-v2/package.json +++ b/packages/nc-gui-v2/package.json @@ -29,6 +29,7 @@ "url": "^0.11.0", "util": "^0.12.4", "vue-dompurify-html": "^3.0.0", + "vue-github-button": "^3.0.3", "vue-i18n": "^9.1.10", "vuedraggable": "^4.1.0", "vuetify": "^3.0.0-alpha.13", From b5fc45e7553c08006a791ec34e39812114c59009 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 18:04:15 +0800 Subject: [PATCH 005/106] feat(gui-v2): share button on right top in navbar --- packages/nc-gui-v2/layouts/base.vue | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/nc-gui-v2/layouts/base.vue b/packages/nc-gui-v2/layouts/base.vue index a99c63a5cf..70c15dead4 100644 --- a/packages/nc-gui-v2/layouts/base.vue +++ b/packages/nc-gui-v2/layouts/base.vue @@ -8,6 +8,10 @@ const route = useRoute() const email = computed(() => user.value?.email ?? '---') +const { isUIAllowed } = useUIPermission() + +const showUserModal = $ref(false) + const logout = () => { signOut() navigateTo('/signin') @@ -41,6 +45,22 @@ const logout = () => {
+
+ +
+ +
{{ $t('activity.share') }}
+
+
+ +
+ From 1023854ac4ea34ff349d59c99cea1a2128173a0d Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 18:35:49 +0800 Subject: [PATCH 006/106] feat(gui-v2): add sponsors --- .../nc-gui-v2/components/general/Sponsors.vue | 47 +++-- packages/nc-gui-v2/pages/index/index.vue | 193 +++++++++--------- 2 files changed, 125 insertions(+), 115 deletions(-) diff --git a/packages/nc-gui-v2/components/general/Sponsors.vue b/packages/nc-gui-v2/components/general/Sponsors.vue index a1e6378b9a..4452dff71f 100644 --- a/packages/nc-gui-v2/components/general/Sponsors.vue +++ b/packages/nc-gui-v2/components/general/Sponsors.vue @@ -1,37 +1,36 @@ - - diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue index 75bc87d53a..5a1d4c36e4 100644 --- a/packages/nc-gui-v2/pages/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index.vue @@ -58,97 +58,108 @@ onMounted(() => { From 9140cdccbc648fd16a945b7b203278370c4ab670 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 19:25:08 +0800 Subject: [PATCH 007/106] feat(gui-v2): add social card --- .../components/general/SocialCard.vue | 73 +++++++++++++++++++ packages/nc-gui-v2/pages/index/index.vue | 9 ++- 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 packages/nc-gui-v2/components/general/SocialCard.vue diff --git a/packages/nc-gui-v2/components/general/SocialCard.vue b/packages/nc-gui-v2/components/general/SocialCard.vue new file mode 100644 index 0000000000..4b2e51ad51 --- /dev/null +++ b/packages/nc-gui-v2/components/general/SocialCard.vue @@ -0,0 +1,73 @@ + + + diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue index 5a1d4c36e4..a95a9fbafa 100644 --- a/packages/nc-gui-v2/pages/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index.vue @@ -156,8 +156,13 @@ onMounted(() => { - - + +
+ +
+
+ +
From 2f2eff4d788c020462bd2c7c630ed9a76c62ebe1 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 19:25:19 +0800 Subject: [PATCH 008/106] fix(gui-v2): sponsors --- .../nc-gui-v2/components/general/Sponsors.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/nc-gui-v2/components/general/Sponsors.vue b/packages/nc-gui-v2/components/general/Sponsors.vue index 4452dff71f..ccc2c7b5b8 100644 --- a/packages/nc-gui-v2/components/general/Sponsors.vue +++ b/packages/nc-gui-v2/components/general/Sponsors.vue @@ -7,7 +7,7 @@ const { nav = false } = defineProps() From 73f780d298d0aed824531882c84b5d92f35c0306 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 19:25:30 +0800 Subject: [PATCH 009/106] chore(gui-v2): add icons --- packages/nc-gui-v2/components.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 8f4944d7d0..ed4036cf39 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -86,12 +86,14 @@ declare module '@vue/runtime-core' { MdiAccountIcon: typeof import('~icons/mdi/account-icon')['default'] MdiAccountOutline: typeof import('~icons/mdi/account-outline')['default'] MdiAccountPlusOutline: typeof import('~icons/mdi/account-plus-outline')['default'] + MdiAccountSupervisorOutline: typeof import('~icons/mdi/account-supervisor-outline')['default'] MdiAlphaA: typeof import('~icons/mdi/alpha-a')['default'] MdiApi: typeof import('~icons/mdi/api')['default'] MdiArrowExpand: typeof import('~icons/mdi/arrow-expand')['default'] MdiArrowLeftBold: typeof import('~icons/mdi/arrow-left-bold')['default'] MdiAt: typeof import('~icons/mdi/at')['default'] MdiCalculator: typeof import('~icons/mdi/calculator')['default'] + MdiCalendarMonth: typeof import('~icons/mdi/calendar-month')['default'] MdiCardsHeart: typeof import('~icons/mdi/cards-heart')['default'] MdiCellphoneMessage: typeof import('~icons/mdi/cellphone-message')['default'] MdiChat: typeof import('~icons/mdi/chat')['default'] @@ -118,6 +120,7 @@ declare module '@vue/runtime-core' { MdiFolder: typeof import('~icons/mdi/folder')['default'] MdiFunction: typeof import('~icons/mdi/function')['default'] MdiGestureDoubleTap: typeof import('~icons/mdi/gesture-double-tap')['default'] + MdiGithub: typeof import('~icons/mdi/github')['default'] MdiHeart: typeof import('~icons/mdi/heart')['default'] MdiHook: typeof import('~icons/mdi/hook')['default'] MdiInformation: typeof import('~icons/mdi/information')['default'] @@ -143,6 +146,7 @@ declare module '@vue/runtime-core' { MdiShieldLockOutline: typeof import('~icons/mdi/shield-lock-outline')['default'] MdiSlack: typeof import('~icons/mdi/slack')['default'] MdiStar: typeof import('~icons/mdi/star')['default'] + MdiStarOutline: typeof import('~icons/mdi/star-outline')['default'] MdiStore: typeof import('~icons/mdi/store')['default'] MdiTable: typeof import('~icons/mdi/table')['default'] MdiTableArrowRight: typeof import('~icons/mdi/table-arrow-right')['default'] @@ -150,6 +154,7 @@ declare module '@vue/runtime-core' { MdiText: typeof import('~icons/mdi/text')['default'] MdiThumbUp: typeof import('~icons/mdi/thumb-up')['default'] MdiTrashCan: typeof import('~icons/mdi/trash-can')['default'] + MdiTwitter: typeof import('~icons/mdi/twitter')['default'] MdiWhatsapp: typeof import('~icons/mdi/whatsapp')['default'] MdiXml: typeof import('~icons/mdi/xml')['default'] MdiZomm: typeof import('~icons/mdi/zomm')['default'] From 46224f0f4e43bdd140d350addfdce1a41f76fb99 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Sat, 13 Aug 2022 19:58:15 +0800 Subject: [PATCH 010/106] feat(gui-v2): export cache --- .../smartsheet/sidebar/toolbar/index.vue | 57 ++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue index 10888ad6f3..a5061e11c0 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue @@ -1,14 +1,69 @@