From e2583720e32fb00a470392b25fc08a628b45043f Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Fri, 15 Mar 2024 16:47:41 -0400 Subject: [PATCH 01/10] about route, added to footer/copyright too --- src/components/Copyright.vue | 7 ++++++ src/router/index.js | 6 ++++++ src/views/About.vue | 42 ++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 src/views/About.vue diff --git a/src/components/Copyright.vue b/src/components/Copyright.vue index f9cadf9..b0e7690 100644 --- a/src/components/Copyright.vue +++ b/src/components/Copyright.vue @@ -10,6 +10,13 @@ An RCOS project
+ + About + diff --git a/src/router/index.js b/src/router/index.js index 4852953..d0cfe3a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,7 @@ import Home from '../views/Home.vue' import PrivacyPolicy from "../views/PrivacyPolicy"; import PageNotFound from "../views/PageNotFound"; import Dashboard from "../views/Dashboard"; +import About from "../views/About"; Vue.use(VueRouter) @@ -27,6 +28,11 @@ const routes = [ path: '*', name: 'PageNotFound', component: PageNotFound + }, + { + path: '/about', + name: 'About', + component: About } ] diff --git a/src/views/About.vue b/src/views/About.vue new file mode 100644 index 0000000..860552c --- /dev/null +++ b/src/views/About.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file From e03fee08977d358b47b26ee99875def0d05870c6 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Fri, 15 Mar 2024 17:03:00 -0400 Subject: [PATCH 02/10] about page information --- src/views/About.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/About.vue b/src/views/About.vue index 860552c..f1cc4d7 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -11,7 +11,9 @@

About

- Hello + Welcome to Shuttle Tracker, your go-to destination for + real-time RPI shuttle tracking and navigation. Our platform + is designed to make your journey around campus simpler.

Home Page
From 300147d7452768b281777a85dc5100311e37554c Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Tue, 19 Mar 2024 17:09:08 -0400 Subject: [PATCH 03/10] icons --- src/views/About.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/About.vue b/src/views/About.vue index f1cc4d7..89c8660 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -6,6 +6,18 @@
+
+
+ + Download on the App Store + +
+
+ + Get it on Google Play + +
+
@@ -40,5 +52,8 @@ export default { \ No newline at end of file From 3cb183cde207ea039d6c4eba93edc9122b5dc7dd Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Fri, 22 Mar 2024 16:50:20 -0400 Subject: [PATCH 04/10] spacing and some text --- src/views/About.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 89c8660..0266cb4 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -6,13 +6,17 @@
+
+

Simplify Your RPI

+

Campus Commute

+
Download on the App Store
-
+
Get it on Google Play @@ -20,7 +24,7 @@
-
+

About

Welcome to Shuttle Tracker, your go-to destination for @@ -30,9 +34,9 @@ Home Page

-
- -
+
+ +
From da80a1348ed78b805732c56b0f19b384a31e10d6 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Tue, 26 Mar 2024 16:31:46 -0400 Subject: [PATCH 05/10] home icon --- src/views/About.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 0266cb4..29a88be 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -2,8 +2,16 @@
-
+
+
@@ -44,13 +52,16 @@ From 04ca1b04a2c100fa3ca5cebe02d51ca594ff7b62 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Tue, 26 Mar 2024 16:51:21 -0400 Subject: [PATCH 06/10] dark mode support but no button to change yet --- src/views/About.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 29a88be..6f82c30 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -4,12 +4,12 @@
- @@ -39,7 +39,6 @@ real-time RPI shuttle tracking and navigation. Our platform is designed to make your journey around campus simpler.

- Home Page
From 669fd515083960c9a1339eea4f44045493071a52 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Tue, 26 Mar 2024 17:00:09 -0400 Subject: [PATCH 07/10] darkmode button --- src/views/About.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 6f82c30..0e493f9 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -8,7 +8,11 @@ - +
+ + +
+
@@ -51,7 +55,7 @@ From bbccd6e4b47a5e816ff9177207456077ee376018 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Fri, 29 Mar 2024 16:42:57 -0400 Subject: [PATCH 08/10] separated divs temporarily for major change --- src/views/About.vue | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index 0e493f9..b2a80f0 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -18,20 +18,27 @@
-
-

Simplify Your RPI

-

Campus Commute

-
-
-
- - Download on the App Store - +
+
+
+

Simplify Your RPI

+

Campus Commute

+
+
+
+ + Download on the App Store + +
+
+ + Get it on Google Play + +
+
-
- - Get it on Google Play - +
+
@@ -39,15 +46,12 @@

About

- Welcome to Shuttle Tracker, your go-to destination for - real-time RPI shuttle tracking and navigation. Our platform - is designed to make your journey around campus simpler. + Welcome to Shuttle Tracker, your go-to destination for + real-time RPI shuttle tracking and navigation. Our platform + is designed to make your journey around campus simpler.

-
- -
@@ -84,4 +88,7 @@ img { max-width: 100%; height: auto; } +#map > .mk-map-view { + border-radius: 7px; +} \ No newline at end of file From e9534573500ac329c05cb0d6442e535b2266c6b0 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Thu, 11 Apr 2024 14:59:23 -0400 Subject: [PATCH 09/10] map working --- src/components/Tracker.vue | 132 +++++++++++++++++++------------------ src/views/About.vue | 12 ++-- 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/src/components/Tracker.vue b/src/components/Tracker.vue index 978a325..795de72 100644 --- a/src/components/Tracker.vue +++ b/src/components/Tracker.vue @@ -11,78 +11,78 @@ style="height: 75vh" :class="{ 'h-100': fullscreen }" >
- - -
- - - - - - - {{ fullscreen ? "Exit" : "Enter" }} Full-Screen Mode - - - - - -
-
-
- {{ r.name }} +
+ +
+ + + + + + + {{ fullscreen ? "Exit" : "Enter" }} Full-Screen Mode + + + + + +
+
+
+ {{ r.name }} +
-
- -
-
-
-
-
- - {{ bus.icon }} - - - {{ bus.icon }} - + +
+
+
+
+
+ + {{ bus.icon }} + + + {{ bus.icon }} + +
+ {{ bus.name }}
- {{ bus.name }} -
-
+
+
-
- -
-
-
- {{ b }} + +
+
+
+ {{ b }} +
-
- -
- -
-
- + +
+ +
+
+ +
-
- - - + + +
@@ -104,7 +104,11 @@ Vue.use(VueFullscreen); export default { name: "Tracker", props: { - trace_history: Boolean + trace_history: Boolean, + only_map: { + type: Boolean, + default: false, + }, }, components: { Status, diff --git a/src/views/About.vue b/src/views/About.vue index b2a80f0..adaa5fc 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -19,7 +19,7 @@
-
+

Simplify Your RPI

Campus Commute

@@ -37,13 +37,13 @@
-
-
+
+
-
+

About

Welcome to Shuttle Tracker, your go-to destination for @@ -61,6 +61,7 @@ import Header from "../components/Header"; import {BIconGithub, BIconHouseFill, BIconSun, BIconMoon} from 'bootstrap-vue' import mixin from "../mixins/mixins"; +import Tracker from "../components/Tracker"; export default { name: "About", @@ -70,7 +71,8 @@ export default { BIconGithub, BIconHouseFill, BIconSun, - BIconMoon + BIconMoon, + Tracker }, methods: { toLightMode() { From 478d2c765482abdaeae9254e355239224097c0b6 Mon Sep 17 00:00:00 2001 From: michaelni678 Date: Fri, 12 Apr 2024 16:31:35 -0400 Subject: [PATCH 10/10] purged unnecessary code --- src/views/About.vue | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/About.vue b/src/views/About.vue index adaa5fc..d6b3f67 100644 --- a/src/views/About.vue +++ b/src/views/About.vue @@ -41,16 +41,14 @@

-
-
-
-

About

-

- Welcome to Shuttle Tracker, your go-to destination for - real-time RPI shuttle tracking and navigation. Our platform - is designed to make your journey around campus simpler. -

-
+
+
+

About

+

+ Welcome to Shuttle Tracker, your go-to destination for + real-time RPI shuttle tracking and navigation. Our platform + is designed to make your journey around campus simpler. +

@@ -90,7 +88,4 @@ img { max-width: 100%; height: auto; } -#map > .mk-map-view { - border-radius: 7px; -} \ No newline at end of file