From aeaf5e2825ff7214bd92fc35f5f459e8794d5aa7 Mon Sep 17 00:00:00 2001
From: RoryPTB <47696929+RoryPTB@users.noreply.github.com>
Date: Tue, 29 Aug 2023 16:25:06 +0200
Subject: [PATCH] Added configurable home page
---
webapp/config/HomeContent.html | 4 ++
webapp/src/components/HomePage.vue | 36 ++++++++++++++
webapp/src/components/MonitoringPage.vue | 60 ++++++++++--------------
webapp/src/components/SynopForm.vue | 25 +++++-----
webapp/src/views/Home.vue | 3 +-
5 files changed, 80 insertions(+), 48 deletions(-)
create mode 100644 webapp/config/HomeContent.html
create mode 100644 webapp/src/components/HomePage.vue
diff --git a/webapp/config/HomeContent.html b/webapp/config/HomeContent.html
new file mode 100644
index 0000000..08e4d6d
--- /dev/null
+++ b/webapp/config/HomeContent.html
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/webapp/src/components/HomePage.vue b/webapp/src/components/HomePage.vue
new file mode 100644
index 0000000..6a1ae23
--- /dev/null
+++ b/webapp/src/components/HomePage.vue
@@ -0,0 +1,36 @@
+
+
+
+ Welcome to WIS2 in a box!
+
+
+ At this page you can submit FM 12 SYNOP bulletin and monitor notifications from topics found in your wis2box.
+
+
+
+
+
+
+
+
diff --git a/webapp/src/components/MonitoringPage.vue b/webapp/src/components/MonitoringPage.vue
index c39edf8..4e55c3b 100644
--- a/webapp/src/components/MonitoringPage.vue
+++ b/webapp/src/components/MonitoringPage.vue
@@ -1,15 +1,17 @@
Monitoring Dashboard
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
diff --git a/webapp/src/components/SynopForm.vue b/webapp/src/components/SynopForm.vue
index c2ad418..c05c963 100644
--- a/webapp/src/components/SynopForm.vue
+++ b/webapp/src/components/SynopForm.vue
@@ -38,7 +38,7 @@
-
@@ -46,10 +46,10 @@
- Submit
@@ -57,7 +57,7 @@
@@ -218,9 +218,9 @@ export default defineComponent({
bulletin: "", // FM 12 data
aaxxPresent: true, // Boolean to check if AAXX is in bulletin
equalsPresent: true, // Boolean to check if = delimiter is in bulletin
- hierarchyList: ["test1", "test2", "test3"], // List of topic hierarchies
+ topicList: ["test1", "test2", "test3"], // List of topic hierarchies
// before they are obtained from discovery metadata
- hierarchy: "", // Topic hierarchy selected by user
+ topic: "", // Topic hierarchy selected by user
notificationsOnPending: true, // Realtime variable for if user has
// selected notifications or not
notificationsOn: true, // Variable that updates to the pending variable
@@ -259,14 +259,14 @@ export default defineComponent({
this.equalsPresent = this.bulletin.includes('=');
},
// Allows us to get the current topic hierarchies available
- async fetchHierarchy() {
+ async fetchTopics() {
const apiUrl = `${import.meta.env.VITE_API_URL}/collections/discovery-metadata/items?f=json`;
// check if TEST=True is set in .env file
console.log(import.meta.env);
// check if TEST_MODE is set in .env file or if VITE_API_URL is not set
if (import.meta.env.VITE_TEST_MODE === "true" || import.meta.env.VITE_API_URL == undefined) {
console.log("TEST_MODE is enabled");
- this.hierachyList = ["test1", "test2", "test3"];
+ this.topicList = ["test1", "test2", "test3"];
}
else {
console.log("Fetching topic hierarchy from:", apiUrl);
@@ -277,14 +277,15 @@ export default defineComponent({
}
else {
const data = await response.json();
+ // If the features object is in the data
if (data.features) {
// Use Array.map to create a new array of the topic hierarchies
- this.hierarchyList = data.features.map(feature => {
+ this.topicList = data.features.map(feature => {
if (feature.properties && feature.properties['wmo:topicHierarchy']) {
return feature.properties['wmo:topicHierarchy']
}
});
- console.log(this.hierarchyList)
+ console.log(this.topicList)
}
else {
console.error("API response is not an object");
@@ -363,7 +364,7 @@ export default defineComponent({
year: this.date.year, // Year of data
month: this.date.month + 1, // Month of data, +1 as JS starts
// from 0 for months
- channel: this.hierarchy, // Topic hierarchy
+ channel: this.topic, // Topic hierarchy
notify: this.notificationsOn // Boolean for WIS2 notifications
}
};
@@ -466,7 +467,7 @@ export default defineComponent({
DownloadButton
},
mounted() {
- this.fetchHierarchy();
+ this.fetchTopics();
}
});
diff --git a/webapp/src/views/Home.vue b/webapp/src/views/Home.vue
index f685572..7434f64 100644
--- a/webapp/src/views/Home.vue
+++ b/webapp/src/views/Home.vue
@@ -1,6 +1,7 @@
+
\ No newline at end of file