From 0bdbdd5bd7b4e1f8793164b2a43658098bfecc24 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Mon, 22 Aug 2022 10:03:15 +0200 Subject: [PATCH] refactor(gui-v2): make create and update project pages subpages of dashboard --- packages/nc-gui-v2/pages/index/index.vue | 235 +-------- .../pages/{project => index}/index/[id].vue | 53 +- .../pages/index/index/create-external.vue | 451 ++++++++++++++++++ .../pages/{project => index}/index/create.vue | 51 +- .../nc-gui-v2/pages/index/index/index.vue | 211 ++++++++ packages/nc-gui-v2/pages/project/index.vue | 5 - .../pages/project/index/create-external.vue | 450 ----------------- 7 files changed, 718 insertions(+), 738 deletions(-) rename packages/nc-gui-v2/pages/{project => index}/index/[id].vue (63%) create mode 100644 packages/nc-gui-v2/pages/index/index/create-external.vue rename packages/nc-gui-v2/pages/{project => index}/index/create.vue (60%) create mode 100644 packages/nc-gui-v2/pages/index/index/index.vue delete mode 100644 packages/nc-gui-v2/pages/project/index.vue delete mode 100644 packages/nc-gui-v2/pages/project/index/create-external.vue diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue index b75f1280c5..26177d3819 100644 --- a/packages/nc-gui-v2/pages/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index.vue @@ -1,201 +1,14 @@ - - - - diff --git a/packages/nc-gui-v2/pages/project/index/[id].vue b/packages/nc-gui-v2/pages/index/index/[id].vue similarity index 63% rename from packages/nc-gui-v2/pages/project/index/[id].vue rename to packages/nc-gui-v2/pages/index/index/[id].vue index 850ca86ba0..a28250f406 100644 --- a/packages/nc-gui-v2/pages/project/index/[id].vue +++ b/packages/nc-gui-v2/pages/index/index/[id].vue @@ -56,8 +56,6 @@ const renameProject = async () => { // select and focus title field on load onMounted(async () => { - await getProject() - await nextTick(() => { // todo: replace setTimeout and follow better approach setTimeout(() => { @@ -69,34 +67,39 @@ onMounted(async () => { }, 500) }) }) + +await getProject() @@ -107,12 +110,6 @@ onMounted(async () => { @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded; } - .password { - input { - @apply !border-none; - } - } - .submit { @apply z-1 relative color-transition rounded p-3 text-white shadow-sm; diff --git a/packages/nc-gui-v2/pages/index/index/create-external.vue b/packages/nc-gui-v2/pages/index/index/create-external.vue new file mode 100644 index 0000000000..30adf3f2fd --- /dev/null +++ b/packages/nc-gui-v2/pages/index/index/create-external.vue @@ -0,0 +1,451 @@ + + + + + diff --git a/packages/nc-gui-v2/pages/project/index/create.vue b/packages/nc-gui-v2/pages/index/index/create.vue similarity index 60% rename from packages/nc-gui-v2/pages/project/index/create.vue rename to packages/nc-gui-v2/pages/index/index/create.vue index e7df003d31..991840691c 100644 --- a/packages/nc-gui-v2/pages/project/index/create.vue +++ b/packages/nc-gui-v2/pages/index/index/create.vue @@ -63,29 +63,34 @@ onMounted(async () => { @@ -96,12 +101,6 @@ onMounted(async () => { @apply !appearance-none my-1 border-1 border-solid border-primary/50 rounded; } - .password { - input { - @apply !border-none; - } - } - .submit { @apply z-1 relative color-transition rounded p-3 text-white shadow-sm; diff --git a/packages/nc-gui-v2/pages/index/index/index.vue b/packages/nc-gui-v2/pages/index/index/index.vue new file mode 100644 index 0000000000..00063525f0 --- /dev/null +++ b/packages/nc-gui-v2/pages/index/index/index.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/packages/nc-gui-v2/pages/project/index.vue b/packages/nc-gui-v2/pages/project/index.vue deleted file mode 100644 index f8eacfa737..0000000000 --- a/packages/nc-gui-v2/pages/project/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/packages/nc-gui-v2/pages/project/index/create-external.vue b/packages/nc-gui-v2/pages/project/index/create-external.vue deleted file mode 100644 index 6d4bf62a26..0000000000 --- a/packages/nc-gui-v2/pages/project/index/create-external.vue +++ /dev/null @@ -1,450 +0,0 @@ - - - - -