From 5f48cfd86db7f688c75a647d7fd510292e03b764 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:05:47 +0200 Subject: [PATCH 01/14] chore(gui-v2): style updates --- packages/nc-gui-v2/layouts/base.vue | 2 +- packages/nc-gui-v2/pages/index/index.vue | 10 +- .../pages/index/user/index/index.vue | 17 +- .../nc-gui-v2/pages/project/index/[id].vue | 101 +++-- .../pages/project/index/create-external.vue | 378 ++++++++++-------- .../nc-gui-v2/pages/project/index/create.vue | 101 +++-- packages/nc-gui-v2/pages/signin.vue | 2 +- 7 files changed, 378 insertions(+), 233 deletions(-) diff --git a/packages/nc-gui-v2/layouts/base.vue b/packages/nc-gui-v2/layouts/base.vue index d1d3a55cc0..d63ce17307 100644 --- a/packages/nc-gui-v2/layouts/base.vue +++ b/packages/nc-gui-v2/layouts/base.vue @@ -40,7 +40,7 @@ hooks.hook('page:finish', () => { class="flex !bg-primary items-center text-white pl-4 pr-5 shadow-lg" >
diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue index 9d95950fb0..c8ff85fad0 100644 --- a/packages/nc-gui-v2/pages/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index.vue @@ -68,7 +68,7 @@ onMounted(() => { - + {{ $t('labels.serverCA') }} @@ -370,13 +365,13 @@ onMounted(() => { - + {{ type }} - + {{ type }} @@ -439,12 +434,12 @@ onMounted(() => { :deep(.ant-input-affix-wrapper), :deep(.ant-input), :deep(.ant-select) { - @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded; + @apply !appearance-none border-1 border-solid border-primary/50 rounded; } - .nc-extdb-host-password { + :deep(.ant-input-password) { input { - @apply !border-none; + @apply !border-none my-0; } } } From 2b890228483139bc23548c400092a3a268ab86a8 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:42:10 +0200 Subject: [PATCH 08/14] chore(gui-v2): remove colored border from inputs --- packages/nc-gui-v2/pages/index/index/[id].vue | 2 +- packages/nc-gui-v2/pages/index/index/create-external.vue | 2 +- packages/nc-gui-v2/pages/index/index/create.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui-v2/pages/index/index/[id].vue b/packages/nc-gui-v2/pages/index/index/[id].vue index a28250f406..ceacb2aea5 100644 --- a/packages/nc-gui-v2/pages/index/index/[id].vue +++ b/packages/nc-gui-v2/pages/index/index/[id].vue @@ -107,7 +107,7 @@ await getProject() .update-project { .ant-input-affix-wrapper, .ant-input { - @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded; + @apply !appearance-none my-1 border-1 border-solid rounded; } .submit { diff --git a/packages/nc-gui-v2/pages/index/index/create-external.vue b/packages/nc-gui-v2/pages/index/index/create-external.vue index cefa7d99d5..81a222cb7c 100644 --- a/packages/nc-gui-v2/pages/index/index/create-external.vue +++ b/packages/nc-gui-v2/pages/index/index/create-external.vue @@ -434,7 +434,7 @@ onMounted(() => { :deep(.ant-input-affix-wrapper), :deep(.ant-input), :deep(.ant-select) { - @apply !appearance-none border-1 border-solid border-primary/50 rounded; + @apply !appearance-none border-1 border-solid rounded; } :deep(.ant-input-password) { diff --git a/packages/nc-gui-v2/pages/index/index/create.vue b/packages/nc-gui-v2/pages/index/index/create.vue index 991840691c..2c3edbd051 100644 --- a/packages/nc-gui-v2/pages/index/index/create.vue +++ b/packages/nc-gui-v2/pages/index/index/create.vue @@ -98,7 +98,7 @@ onMounted(async () => { .create { .ant-input-affix-wrapper, .ant-input { - @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded; + @apply !appearance-none my-1 border-1 border-solid rounded; } .submit { From 890b31c018e3aa469bdb06f07fef7bb491322076 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:55:25 +0200 Subject: [PATCH 09/14] fix(gui-v2): use correct route names in sharebase btn and remove font color --- packages/nc-gui-v2/components/general/ShareBaseButton.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui-v2/components/general/ShareBaseButton.vue b/packages/nc-gui-v2/components/general/ShareBaseButton.vue index 9ea4f224c0..b53892f0fb 100644 --- a/packages/nc-gui-v2/components/general/ShareBaseButton.vue +++ b/packages/nc-gui-v2/components/general/ShareBaseButton.vue @@ -14,15 +14,16 @@ const { isUIAllowed } = useUIPermission() v-if=" isUIAllowed('newUser') && route.name !== 'index' && - route.name !== 'project-index-create' && - route.name !== 'project-index-create-external' && + route.name !== 'index-index-create' && + route.name !== 'index-index-create-external' && route.name !== 'index-user-index' " @click="showUserModal = true" > -
+
From a643cf3ea3ea87dd52426d06aa2bd098c3077fb4 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Mon, 22 Aug 2022 11:20:51 +0200 Subject: [PATCH 10/14] chore(gui-v2): hide links on create / update pages --- .../components/general/ShareBaseButton.vue | 2 +- packages/nc-gui-v2/layouts/base.vue | 2 +- packages/nc-gui-v2/pages/index/index.vue | 26 +++++++++++++------ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/packages/nc-gui-v2/components/general/ShareBaseButton.vue b/packages/nc-gui-v2/components/general/ShareBaseButton.vue index b53892f0fb..16d36223c5 100644 --- a/packages/nc-gui-v2/components/general/ShareBaseButton.vue +++ b/packages/nc-gui-v2/components/general/ShareBaseButton.vue @@ -1,5 +1,5 @@ +