Rory wip (#1)

Latest changes from Rory
wmo-im · Aug 25, 2023 · 27a721c · 27a721c
1 parent 1f4f270
commit 27a721c
Show file tree

Hide file tree

Showing 25 changed files with 1,226 additions and 672 deletions.
diff --git a/webapp/index.html b/webapp/index.html
@@ -3,9 +3,9 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon" href="/src/assets/logo-small.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>FM-12 Form</title>
+  <title>wis2box</title>
 </head>
 
 <body>

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -11,10 +11,12 @@
   "dependencies": {
     "@mdi/font": "7.0.96",
     "@vuepic/vue-datepicker": "^5.4.0",
+    "apexcharts": "^3.41.1",
     "core-js": "^3.29.0",
     "roboto-fontface": "*",
     "vue": "^3.2.0",
     "vue-router": "^4.0.0",
+    "vue3-apexcharts": "^1.4.4",
     "vuetify": "^3.0.0",
     "webfontloader": "^1.0.0"
   },

diff --git a/webapp/public/favicon.ico b/webapp/public/favicon.ico
diff --git a/webapp/src/App_old.vue b/webapp/src/App_old.vue
diff --git a/webapp/src/assets/banner.png b/webapp/src/assets/banner.png
diff --git a/webapp/src/assets/foot.png b/webapp/src/assets/foot.png
diff --git a/webapp/src/assets/logo-large.png b/webapp/src/assets/logo-large.png
diff --git a/webapp/src/assets/logo-small.png b/webapp/src/assets/logo-small.png
diff --git a/webapp/src/assets/logo.png b/webapp/src/assets/logo.png
diff --git a/webapp/src/assets/logo.svg b/webapp/src/assets/logo.svg
diff --git a/webapp/src/components/DownloadButton.vue b/webapp/src/components/DownloadButton.vue
@@ -1,9 +1,9 @@
 <template>
-  <v-btn color="primary" @click="downloadFile">Download</v-btn>
+  <v-btn color="#00BD9D" append-icon="mdi-download" @click="downloadFile">Download</v-btn>
 </template>
 
 <script>
-import { defineComponent, ref } from 'vue';
+import { defineComponent } from 'vue';
 import { VBtn } from 'vuetify/lib/components/index.mjs';
 
 export default defineComponent({
@@ -18,11 +18,11 @@ export default defineComponent({
         VBtn
     },
     setup(props) {
-        const fileName = ref("");
+        // Extract the file name from the URL
+        const fileName = props.fileUrl.split('/').pop();
+
         // function to download file
         const downloadFile = () => {
-            // Extract the file name from the URL
-            fileName.value = props.fileUrl.substring(props.fileUrl.lastIndexOf('/') + 1);
             // Create a temporary anchor element to initiate the download
             const link = document.createElement('a');
             link.href = props.fileUrl;
@@ -31,8 +31,8 @@ export default defineComponent({
             link.click();
         };
         return {
-            downloadFile,
-            fileName
+            fileName,
+            downloadFile
         };
     },
 });