From d7dcd34493c7488ec2a942c9c69899a3438fba0a Mon Sep 17 00:00:00 2001 From: Conor McNamara Date: Thu, 16 Mar 2023 19:39:58 +0000 Subject: [PATCH 1/2] Implement 404 handling --- dist/index.html | 4 ++-- src/pages/404Page.vue | 17 +++++++++++++++++ src/pages/MapPage.vue | 11 +++++------ src/router/routes.js | 12 +++++++----- 4 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 src/pages/404Page.vue diff --git a/dist/index.html b/dist/index.html index 6b73c73..eff343d 100644 --- a/dist/index.html +++ b/dist/index.html @@ -10,6 +10,6 @@
- + - + \ No newline at end of file diff --git a/src/pages/404Page.vue b/src/pages/404Page.vue new file mode 100644 index 0000000..2a4774f --- /dev/null +++ b/src/pages/404Page.vue @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/src/pages/MapPage.vue b/src/pages/MapPage.vue index e64ef90..387d70b 100644 --- a/src/pages/MapPage.vue +++ b/src/pages/MapPage.vue @@ -46,11 +46,10 @@ + - -
@@ -485,11 +484,11 @@ export default { height: 19px; cursor: pointer; } -#dropdownMenuButton1{ +#dropdownMenuButton1 { box-shadow: 0 0 5px 2px #6e757dbe; } -#dropMenu{ +#dropMenu { /*In case we want to edit dropdown menu*/ font-size: 15px; } @@ -502,7 +501,7 @@ export default { } -#sidebar{ +#sidebar { position: absolute; height: 80%; width: 20%; @@ -523,7 +522,7 @@ export default { transition: all 0.8s; } -.slideLeft-enter-from, .slideLeft-leave-to{ +.slideLeft-enter-from, .slideLeft-leave-to { opacity: 0; transform: translateX(-100px); } diff --git a/src/router/routes.js b/src/router/routes.js index b36cc01..074e778 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -20,9 +20,11 @@ function loadPage(component) { } export default [ - {path: "/", component:loadPage("MapPage")}, - {path: "/insights", component:loadPage("InsightsPage")}, - {path: "/account", component:loadPage('AccountPage'), beforeEnter: isAuth}, - {path: "/signup", component:loadPage('SignUpPage')}, - {path: "/login", component:loadPage('LoginPage')}, + { path: "/", component:loadPage("MapPage") }, + { path: "/insights", component:loadPage("InsightsPage") }, + { path: "/account", component:loadPage('AccountPage'), beforeEnter: isAuth }, + { path: "/signup", component:loadPage('SignUpPage') }, + { path: "/login", component:loadPage('LoginPage') }, + { path: "/404", component:loadPage('404Page') }, + { path: "/:catchAll(.*)", component:loadPage('404Page') } ] \ No newline at end of file From 242dbd862c6fb07742f2e36c18aba84948ef6993 Mon Sep 17 00:00:00 2001 From: J-Lennox10 Date: Fri, 17 Mar 2023 00:40:34 +0000 Subject: [PATCH 2/2] Improved dropdown, made 404 fun --- src/pages/404Page.vue | 2 +- src/pages/InsightsPage.vue | 4 +-- src/pages/MapPage.vue | 54 +++++++++++++++++++++++++------------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/pages/404Page.vue b/src/pages/404Page.vue index 2a4774f..3be56fe 100644 --- a/src/pages/404Page.vue +++ b/src/pages/404Page.vue @@ -1,6 +1,6 @@