final edit

2043b1e3 · Omar Elkadi · c4a26cae · 2043b1e3 · 2043b1e3 · 2043b1e3
Commit 2043b1e3 authored Jul 10, 2021 by Omar Elkadi
--- a/README.md
+++ b/README.md
@@ -17,8 +17,10 @@
        - the Patient fill a form with his name Matrikel/ID number **adress**,sickness and the expected days of absence, he can also upload a files(sick notes) as a evidence.
        - the Backend saves the all patient infos in a MongoDB
        - The Frontend can retriev the data of all patients and enabele the user to filter it.
-        - the Frontend can shows the position of the patients on a map(using OpenStreetMAp API) depends on the Adress which he gives.
-        - the Frontend get a dynamic data from an API collect the data of a sensor on a room door, which count the number of the atendees.
+        - the Frontend can shows a statistics graph of the new Covid-19 patients in Deggendorf and Bayern from the Start of panadimie til the currunt day.
+		* the Data would be Provided from the Robert-Koch-Institute API
+        - the Frontend get a dynamic data from an API collect the data of a Accelometer sensor in a smartphone client app called 'Data Collector: share sensors data'
+

 ## Project setup

@@ -30,6 +32,8 @@ npm install

 ```
 npm run serve
+cd ./server
+npm run start
 ```

 ### Compiles and minifies for production

--- a/package-lock.json
+++ b/package-lock.json
@@ -1727,87 +1727,6 @@
        "webpack-chain": "^6.4.0",
        "webpack-dev-server": "^3.11.0",
        "webpack-merge": "^4.2.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.2.0",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
-          "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
-        }
      }
    },
    "@vue/cli-shared-utils": {
@@ -12681,6 +12600,87 @@
        }
      }
    },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.3.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.0.tgz",
+      "integrity": "sha512-UDgni/tUVSdwHuQo+vuBmEgamWx88SuSlEb5fgdvHrlJSPB9qMBRF6W7bfPWSqDns425Gt1wxAUif+f+h/rWjg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
    "vue-router": {
      "version": "4.0.9",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.9.tgz",

--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -47,7 +47,7 @@ class Server {
    public start(s: any, p: number): void {
        s.listen(p, () => {
            console.log(
-                "  API is running at http://localhost:%d",
+                "HTTP_Server is running on port %d",
                p
            );
        });
@@ -72,7 +72,7 @@ wss.on('connection', function connection(ws) {
 })
 // create a websocket server
 wSserver.listen(port, function() {
-  console.log(`Server is listening on ${port}!`)
+  console.log(`webSocket_Server is listening on port ${port}`)
 })

 const server = new Server();

--- a/src/components/navbar.vue
+++ b/src/components/navbar.vue
@@ -25,9 +25,9 @@
          role="tabpanel"
        >
          <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1">
-            <router-link to="/" class="nav-link" aria-current="page">
+            <a href="https://www.th-deg.de/" class="nav-link" aria-current="page">
              Home
-            </router-link>
+            </a>
            <!--vue link instead of the anchor-->
          </li>
          <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1">
@@ -35,11 +35,11 @@
              >Krakmelden</router-link
            >
          </li>
-          <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1">
+          <!-- <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1">
            <router-link to="/about" class="nav-link">About</router-link>
-          </li>
+          </li> -->
           <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1 text-nowrap">
-            <router-link to="/CoronaStat" class="nav-link">Covid-19</router-link>
+            <router-link to="/CoronaStat" class="nav-link">Covid-19 Neubefälle</router-link>
          </li>
          <li class="nav-item btn btn-outline-success mx-1 align-self-center w-100 mb-1 text-nowrap">
            <router-link to="/DynamicData" class="nav-link">Dynamic</router-link>

--- a/src/views/CoronaStat.vue
+++ b/src/views/CoronaStat.vue
@@ -184,7 +184,6 @@ export default {
          {
            label: '',
            data: [],
-            borderColor: ['Black'],
            backgroundColor: '',
            borderWidth: 0.5,
            borderRadius: 2

--- a/src/views/Home.vue
+++ b/src/views/Home.vue
 <template>
  <div class="home">
-    <img alt="Vue logo" src="../assets/logo.png" />
-    <HelloWorld msg="Welcome to Your Vue.js App" />
+    <!-- <img alt="Vue logo" src="../assets/logo.png" />
+     <HelloWorld msg="Welcome to Your Vue.js App" /> -->
  </div>
 </template>

 <script>
 // @ is an alias to /src
-import HelloWorld from '@/components/HelloWorld.vue'
+// import HelloWorld from '@/components/HelloWorld.vue'
 export default {
  name: 'home',
  components: {
-    HelloWorld
+    // HelloWorld
  }
 }
 </script>
--- a/vue.config.js
+++ b/vue.config.js
 module.exports = {
-    devServer: {
-        host: '0.0.0.0'
-      }
-}
\ No newline at end of file
+  devServer: {
+    host: '0.0.0.0'
+  }
+}