From cd291d82c10453b17e4c7703df254a25f8ad67e0 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sat, 20 Aug 2022 01:45:45 +0530 Subject: [PATCH] refactor(gui-v2): ui changes Signed-off-by: Pranav C --- .../smartsheet-toolbar/ColumnFilterMenu.vue | 2 +- .../components/smartsheet-toolbar/FieldsMenu.vue | 2 +- .../components/smartsheet-toolbar/ShareView.vue | 2 +- .../smartsheet-toolbar/SortListMenu.vue | 2 +- .../smartsheet-toolbar/ViewActions.vue | 10 +++++----- .../nc-gui-v2/components/smartsheet/Toolbar.vue | 2 +- .../components/smartsheet/sidebar/MenuBottom.vue | 16 +++++++++------- .../smartsheet/sidebar/RenameableMenuItem.vue | 2 +- .../components/smartsheet/sidebar/index.vue | 2 +- .../smartsheet/sidebar/toolbar/ToggleDrawer.vue | 12 ++++++++---- .../smartsheet/sidebar/toolbar/index.vue | 6 +++--- .../nc-gui-v2/components/tabs/Smartsheet.vue | 2 +- packages/nc-gui-v2/utils/viewUtils.ts | 4 ++-- 13 files changed, 35 insertions(+), 29 deletions(-) diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue index 3886d3eaa2..958e98fc44 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilterMenu.vue @@ -39,7 +39,7 @@ const applyChanges = async () => await filterComp.value?.applyChanges()
- {{ $t('activity.filter') }} + {{ $t('activity.filter') }}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue index 71ef93d591..2070043b7a 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue @@ -86,7 +86,7 @@ const onMove = (event: { moved: { newIndex: number } }) => { - {{ $t('objects.fields') }} + {{ $t('objects.fields') }} diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue index a44cb3cd24..ea16354a6a 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue @@ -126,7 +126,7 @@ onMounted(() => {
- {{ $t('activity.shareView') }} + {{ $t('activity.shareView') }}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue index 3f6784db96..88363ac637 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/SortListMenu.vue @@ -40,7 +40,7 @@ watch( >
- {{ $t('activity.sort') }} + {{ $t('activity.sort') }}
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ViewActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ViewActions.vue index fccc21a092..17c3b8a01e 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/ViewActions.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ViewActions.vue @@ -136,10 +136,10 @@ async function changeLockType(type: LockType) { - {{ selectedView?.title }} - + {{ selectedView?.title }} + @@ -162,7 +162,7 @@ async function changeLockType(type: LockType) { - +
@@ -307,6 +307,6 @@ async function changeLockType(type: LockType) { diff --git a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue index 88e9b72f20..07a55852a4 100644 --- a/packages/nc-gui-v2/components/smartsheet/Toolbar.vue +++ b/packages/nc-gui-v2/components/smartsheet/Toolbar.vue @@ -31,7 +31,7 @@ const { isOpen } = useSidebar() - +
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue index 0f6bb8716a..ffe9b72f44 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/MenuBottom.vue @@ -36,6 +36,7 @@ function onOpenModal(type: ViewTypes, title = '') {
- +
{{ $t('objects.viewType.grid') }}
@@ -74,7 +75,7 @@ function onOpenModal(type: ViewTypes, title = '') {
- +
{{ $t('objects.viewType.gallery') }}
@@ -97,7 +98,7 @@ function onOpenModal(type: ViewTypes, title = '') {
- +
{{ $t('objects.viewType.form') }}
@@ -107,9 +108,10 @@ function onOpenModal(type: ViewTypes, title = '') {
+ +
-
@@ -129,7 +131,7 @@ function onOpenModal(type: ViewTypes, title = '') { - + + <!– todo: add project cost –> - + --> diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue index ba9bfeb33c..5d00d5d02a 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/RenameableMenuItem.vue @@ -160,7 +160,7 @@ function onStopEdit() {
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue index 77aee05197..a52c69777b 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue @@ -99,13 +99,13 @@ function onCreate(view: GridType | FormType | KanbanType | GalleryType) { class="relative shadow-md h-full" theme="light" > - - - -
Views
- +
+ +
+ + Views +
+ +
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 9dfe67a22e..1a000589fe 100644 --- a/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue +++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue @@ -22,7 +22,7 @@ const { isOpen } = useSidebar({ storageKey: 'nc-right-sidebar' }) -

{{ $t('objects.views') }}

+ @@ -60,7 +60,7 @@ const { isOpen } = useSidebar({ storageKey: 'nc-right-sidebar' }) - +
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue index c695b6090e..f9f285bf6a 100644 --- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue +++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue @@ -83,10 +83,10 @@ watch(isLocked, (nextValue) => (treeViewIsLockedInj.value = nextValue), { immedi
- + diff --git a/packages/nc-gui-v2/utils/viewUtils.ts b/packages/nc-gui-v2/utils/viewUtils.ts index 53df82bb51..46a0d43c3f 100644 --- a/packages/nc-gui-v2/utils/viewUtils.ts +++ b/packages/nc-gui-v2/utils/viewUtils.ts @@ -8,8 +8,8 @@ import MdiKanbanIcon from '~icons/mdi/tablet-dashboard' import MdiEyeIcon from '~icons/mdi/eye-circle-outline' export const viewIcons = { - [ViewTypes.GRID]: { icon: MdiGridIcon, color: 'blue' }, - [ViewTypes.FORM]: { icon: MdiFormIcon, color: 'pink' }, + [ViewTypes.GRID]: { icon: MdiGridIcon, color: '#8f96f2' }, + [ViewTypes.FORM]: { icon: MdiFormIcon, color: '#ec4899' }, calendar: { icon: MdiCalendarIcon, color: 'purple' }, [ViewTypes.GALLERY]: { icon: MdiGalleryIcon, color: 'orange' }, [ViewTypes.KANBAN]: { icon: MdiKanbanIcon, color: 'green' },