From b618eeaa485d4286fc89ef71a50b76e329c1f2b7 Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Mon, 4 Mar 2024 02:51:50 +0530 Subject: [PATCH 1/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/router/index.js | 14 ++++-- ui/src/views/404/NotFound.vue | 83 +++++++++++++++++++++++++++++++++++ ui/src/views/NotFoundView.vue | 30 ------------- 3 files changed, 93 insertions(+), 34 deletions(-) create mode 100644 ui/src/views/404/NotFound.vue delete mode 100644 ui/src/views/NotFoundView.vue diff --git a/ui/src/router/index.js b/ui/src/router/index.js index 0b9f104b1..1d0e4f5b6 100644 --- a/ui/src/router/index.js +++ b/ui/src/router/index.js @@ -19,7 +19,6 @@ import { createRouter, createWebHistory } from 'vue-router' import Header from '@/components/Header/index.vue' -import NotFoundView from '../views/NotFoundView.vue' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -161,12 +160,19 @@ const router = createRouter({ // will match everything path: '/:pathMatch(.*)', name: 'NotFound', - component: NotFoundView, + component: Header, meta: { keepAlive: false, - } + }, + children: [ + { + path: '/:pathMatch(.*)', + name: 'property', + component: () => import('@/views/404/NotFound.vue'), + } + ] }, ] }) -export default router +export default router \ No newline at end of file diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/404/NotFound.vue new file mode 100644 index 000000000..479d09594 --- /dev/null +++ b/ui/src/views/404/NotFound.vue @@ -0,0 +1,83 @@ + + + + + + + + diff --git a/ui/src/views/NotFoundView.vue b/ui/src/views/NotFoundView.vue deleted file mode 100644 index 1e786759d..000000000 --- a/ui/src/views/NotFoundView.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - - From 9b2027e530bbda85f1fddabe1d1ca87933ba8939 Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Mon, 4 Mar 2024 23:14:36 +0530 Subject: [PATCH 2/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/assets/banyan-db.svg | 16 ++++++++++++++++ ui/src/views/404/NotFound.vue | 30 ++++++++++++++++++------------ 2 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 ui/src/assets/banyan-db.svg diff --git a/ui/src/assets/banyan-db.svg b/ui/src/assets/banyan-db.svg new file mode 100644 index 000000000..0266bdb32 --- /dev/null +++ b/ui/src/assets/banyan-db.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/404/NotFound.vue index 479d09594..fe72411db 100644 --- a/ui/src/views/404/NotFound.vue +++ b/ui/src/views/404/NotFound.vue @@ -19,19 +19,21 @@ @@ -41,14 +43,18 @@ import userImg from '@/assets/banyandb_small.jpg' display: flex; justify-content: center; align-items: center; - gap: 2rem; height: 100%; } +.inner-component { + display: flex; + justify-content: center; + align-items: center; + gap: 2rem; +} + .display-image { - border-radius: 40%; - overflow: hidden; - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); + height: 200px; } .display-message { From 30ae2f309f752ca7c7de1ba97ce0091e2456c4c3 Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Mon, 4 Mar 2024 23:19:09 +0530 Subject: [PATCH 3/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/views/404/NotFound.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/404/NotFound.vue index fe72411db..91519f601 100644 --- a/ui/src/views/404/NotFound.vue +++ b/ui/src/views/404/NotFound.vue @@ -54,7 +54,7 @@ import userImg from '@/assets/banyan-db.svg' } .display-image { - height: 200px; + height: 12rem; } .display-message { From d774afceb1a48fb6a28a1b5e1cc98b524443db3f Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Tue, 5 Mar 2024 10:37:35 +0530 Subject: [PATCH 4/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/assets/banyan-db.svg | 19 +++++++++++++++++++ ui/src/views/404/NotFound.vue | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ui/src/assets/banyan-db.svg b/ui/src/assets/banyan-db.svg index 0266bdb32..8b4c1904b 100644 --- a/ui/src/assets/banyan-db.svg +++ b/ui/src/assets/banyan-db.svg @@ -1,3 +1,22 @@ + + diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/404/NotFound.vue index 91519f601..654ffe937 100644 --- a/ui/src/views/404/NotFound.vue +++ b/ui/src/views/404/NotFound.vue @@ -18,7 +18,7 @@ --> From 5ec4886b44279465dd74f23eeb6210cab4d434e2 Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Tue, 5 Mar 2024 10:39:51 +0530 Subject: [PATCH 5/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/assets/{banyan-db.svg => banyandb.svg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ui/src/assets/{banyan-db.svg => banyandb.svg} (100%) diff --git a/ui/src/assets/banyan-db.svg b/ui/src/assets/banyandb.svg similarity index 100% rename from ui/src/assets/banyan-db.svg rename to ui/src/assets/banyandb.svg From b2648566193989203c130852201a5627f9a0397a Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Tue, 5 Mar 2024 10:40:22 +0530 Subject: [PATCH 6/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/views/404/NotFound.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/404/NotFound.vue index 654ffe937..17c0a7068 100644 --- a/ui/src/views/404/NotFound.vue +++ b/ui/src/views/404/NotFound.vue @@ -19,7 +19,7 @@ - + - Vite App + Banyan DB
diff --git a/ui/public/banyandb.ico b/ui/public/banyandb.ico new file mode 100644 index 0000000000000000000000000000000000000000..fe19c13e9272e01720364944ba8f1f8f466ba9bb GIT binary patch literal 4286 zcmdT`TS(Pu5I?4ovfh#u!-sm3CCey!3PrnMWj>fDS}&d zojZ5X*4Bo5_wM2G}(Vk7Rr8WYb*HOy?Ym@PMyNbmoHIUTZ`1x zRCIK7h?$CGZ8Oh^)Y#Z4x|5QUaQ5t3L`6j*HZ~TQE?q)aRu;<3%f%jle}8m#cH;Q) z<2ZKg7-&aMPL6yT85y{6;R4Q|KaYfj1f->C<@e;sruO zLk0WBjT;CI3`AvRCGzw0QB+ify1F`CzkVG@jvPTtOAA6mLIgK2FAo(J6`&8aojPvb zyeV*ui{(i1=@WgXFJHcV!SL`fzJ2?K`T2Q#`0xRb+e(x(*Tpf3 zy1Kf$dwWD}$Y#9fE^{<^3rW_chP(-SQn6^E!%) zi-kqymEV?LW%+g;930Tz-Y()ihxGJx`1$$4-Q8WzV)yRdxP1At+yURrh7B9!?NUJX z{0cVj*V)+_gM))2o|~I1=RhCLKb{Te>({SGLqh{TfBp^Q{jI3<&>|Cr?CP^~z+GM)?jOJ}h~Vtc-2u zfZMlk+36i6Q8*2)~yp;IHvu~-2njsf~I;`fi}IDckkXwoWFYY zO4x}_Vy^6k93CDnb)ItO_&TQD8V7s}larGYFN{%=>X*qfjp|{p^YQVK_$Hg? zamF0;pZOZcs+a#Wh|h2T{{6zYWy=;cH#f^z^~+?LMsXN(#BXY9`YAcZKX>k&3IFNS zr&1?3ZQ6vdU%!eT)xQk1X-RG5|1IWt67Qd~+MAgF8fbjz8@O`iitOy#wF~?&MpC^p zS*1}M=@auC>ko@<07t>p3PT<+=e-G7bF1ylLbuw=`Iy#zSjymWE zZDUV9J$t@O&6o6_`KPC+M<7(+N_fky>v>TJ|68#3GcS{@ebG7d-NAzgrEY26Q9UAP zW23SY6BCkq=@a#{_OLGUJ@CKSty{Nn=+Ggl0nCkKV`GA(@;1U+u=DKn{CK{6%R6@L zz~;@H;pyoK)??NR=Ip+{K9Mz-u~7Dl6Y8_}h4ILD#onCAr}mn!uf>>p8E@A5S6crW KOk=M4Pw7u5nYera literal 0 HcmV?d00001 diff --git a/ui/src/components/Header/components/header.vue b/ui/src/components/Header/components/header.vue index f34107d2d..d57727917 100644 --- a/ui/src/components/Header/components/header.vue +++ b/ui/src/components/Header/components/header.vue @@ -110,14 +110,7 @@ initData() Property -
- - - - - - -
Admin
+
@@ -154,9 +147,8 @@ initData() justify-content: center; } -.person { +.flex-block { width: 140px; - height: 100%; margin-right: 30px; } From ba75f6ff8d2e731e0e157594bc1b67bc20ae1b54 Mon Sep 17 00:00:00 2001 From: sivasathyaseeelan Date: Wed, 6 Mar 2024 12:57:12 +0530 Subject: [PATCH 9/9] UI improved in Not Found View Signed-off-by: sivasathyaseeelan --- ui/src/router/index.js | 2 +- ui/src/views/{404 => Errors}/NotFound.vue | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ui/src/views/{404 => Errors}/NotFound.vue (100%) diff --git a/ui/src/router/index.js b/ui/src/router/index.js index 1d0e4f5b6..e74fc69ce 100644 --- a/ui/src/router/index.js +++ b/ui/src/router/index.js @@ -168,7 +168,7 @@ const router = createRouter({ { path: '/:pathMatch(.*)', name: 'property', - component: () => import('@/views/404/NotFound.vue'), + component: () => import('@/views/Errors/NotFound.vue'), } ] }, diff --git a/ui/src/views/404/NotFound.vue b/ui/src/views/Errors/NotFound.vue similarity index 100% rename from ui/src/views/404/NotFound.vue rename to ui/src/views/Errors/NotFound.vue