From 2e3f495f4985b39e90227e522fb43ebf23a17cdf Mon Sep 17 00:00:00 2001 From: DavidB Date: Wed, 25 Mar 2020 15:48:36 +0100 Subject: [PATCH 01/17] Added LandingPage v1. Unreliable App.vue --- client/src/App.vue | 89 +++++++++++++++++++-------- client/src/components/LandingPage.vue | 67 ++++++++++++++++++++ client/src/components/Navigation.vue | 14 ++--- client/src/routes/routes.js | 25 +++++--- package-lock.json | 11 ---- 5 files changed, 154 insertions(+), 52 deletions(-) create mode 100644 client/src/components/LandingPage.vue delete mode 100644 package-lock.json diff --git a/client/src/App.vue b/client/src/App.vue index 4e4f6093..d6b4bfa8 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -1,35 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/client/src/components/LandingPage.vue b/client/src/components/LandingPage.vue new file mode 100644 index 00000000..2a92c4d1 --- /dev/null +++ b/client/src/components/LandingPage.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/client/src/components/Navigation.vue b/client/src/components/Navigation.vue index c73827a2..93e28d9e 100644 --- a/client/src/components/Navigation.vue +++ b/client/src/components/Navigation.vue @@ -13,33 +13,33 @@ const items = [ { key: "1", - url: "/register-patient", + url: "/prototype/register-patient", type: "user-add", text: "Patient Registrieren" }, { key: "2", - url: "/link-sample-and-patient", + url: "/prototype/link-sample-and-patient", type: "deployment-unit", text: "Probe Zuordnen" }, { key: "3", - url: "/link-test-result", + url: "/prototype/link-test-result", type: "experiment", text: "Laborresultate" }, - { key: "4", url: "/patient-overview", type: "user", text: "Patienten-Daten" }, - { key: "5", url: "/all-data", type: "team", text: "Alle Patienten" }, + { key: "4", url: "/prototype/patient-overview", type: "user", text: "Patienten-Daten" }, + { key: "5", url: "/prototype/all-data", type: "team", text: "Alle Patienten" }, { key: "6", - url: "/public-statistics", + url: "/prototype/public-statistics", type: "stock", text: "Öffentliche Statistiken" }, { key: "7", - url: "/register-institution", + url: "/prototype/register-institution", type: "home", text: "Instutition Registrieren" } diff --git a/client/src/routes/routes.js b/client/src/routes/routes.js index a3165056..4a218b19 100644 --- a/client/src/routes/routes.js +++ b/client/src/routes/routes.js @@ -6,35 +6,44 @@ import RegisterPatientPage from "../components/page/RegisterPatientPage"; import ViewAllDataComponent from "../components/ViewAllDataComponent.vue"; import PublicStatisticsComponent from "../components/PublicStatisticsComponent"; import PatientOverviewComponent from "../components/PatientOverviewComponent.vue"; +import LandingPage from "../components/LandingPage"; export const routes = [ - { path: "*", redirect: "/register-patient" }, + { path: "*", redirect: "/home" }, { - path: "/link-test-result", + path: "/home", + component: LandingPage + }, + { + path: "/prototype", + component: RegisterPatientPage + }, + { + path: "/prototype/link-test-result", component: LinkTestResultAndPatientPage }, { - path: "/register-institution", + path: "/prototype/register-institution", component: RegisterInstitutionPage }, { - path: "/public-statistics", + path: "/prototype/public-statistics", component: PublicStatisticsComponent }, { - path: "/register-patient", + path: "/prototype/register-patient", component: RegisterPatientPage }, { - path: "/patient-overview", + path: "/prototype/patient-overview", component: PatientOverviewComponent }, { - path: "/all-data", + path: "/prototype/all-data", component: ViewAllDataComponent }, { - path: "/link-sample-and-patient", + path: "/prototype/link-sample-and-patient", component: LinkSampleAndPatientPage } ]; diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index c08805f0..00000000 --- a/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "vue-router": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz", - "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==" - } - } -} From f3260b1acaf1df8c201c39bd66f38144bd4d9e80 Mon Sep 17 00:00:00 2001 From: luxn Date: Wed, 25 Mar 2020 21:22:18 +0100 Subject: [PATCH 02/17] navigation path fix --- client/src/components/Navigation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/Navigation.vue b/client/src/components/Navigation.vue index d44b0459..9f9ad2ed 100644 --- a/client/src/components/Navigation.vue +++ b/client/src/components/Navigation.vue @@ -19,7 +19,7 @@ const items = [ }, { key: "2", - url: "prototype/link-test-and-patient", + url: "/prototype/link-test-and-patient", type: "deployment-unit", text: "Test Zuordnen" }, From c1a21b6d43aebc95f30908b2d72727765052ff33 Mon Sep 17 00:00:00 2001 From: luxn Date: Wed, 25 Mar 2020 21:25:03 +0100 Subject: [PATCH 03/17] disabled backend call to /exampleEntities --- client/src/components/PublicStatisticsComponent.vue | 8 ++++---- client/src/components/ViewAllDataComponent.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/components/PublicStatisticsComponent.vue b/client/src/components/PublicStatisticsComponent.vue index 1c1eaf59..3bad2499 100644 --- a/client/src/components/PublicStatisticsComponent.vue +++ b/client/src/components/PublicStatisticsComponent.vue @@ -119,7 +119,7 @@ create(e) { e.preventDefault(); if (this.content.length > 0) { - fetch('/exampleEntities', + /*fetch('/exampleEntities', { method: 'POST', body: JSON.stringify({ content: this.content }), @@ -132,19 +132,19 @@ }) .then((entity) => { this.entities.push(entity); - }); + });*/ this.content = ""; } } }, created() { - fetch('/exampleEntities') + /*fetch('/exampleEntities') .then((response) => { return response.json(); }) .then((entities) => { this.entities.push(...entities); - }); + });*/ } } diff --git a/client/src/components/ViewAllDataComponent.vue b/client/src/components/ViewAllDataComponent.vue index 20527a8d..bc949635 100644 --- a/client/src/components/ViewAllDataComponent.vue +++ b/client/src/components/ViewAllDataComponent.vue @@ -370,7 +370,7 @@ export default { create(e) { e.preventDefault(); if (this.content.length > 0) { - fetch("/exampleEntities", { + /*fetch("/exampleEntities", { method: "POST", body: JSON.stringify({ content: this.content }), headers: { @@ -382,19 +382,19 @@ export default { }) .then(entity => { this.entities.push(entity); - }); + });*/ this.content = ""; } } }, created() { - fetch("/exampleEntities") + /*fetch("/exampleEntities") .then(response => { return response.json(); }) .then(entities => { this.entities.push(...entities); - }); + });*/ } }; From 91d8d06adb205d827a85317c97f641effceacbf4 Mon Sep 17 00:00:00 2001 From: lukaskoeller Date: Wed, 25 Mar 2020 21:38:09 +0100 Subject: [PATCH 04/17] Add new svg logo to assets --- client/src/assets/imis-logo.svg | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 client/src/assets/imis-logo.svg diff --git a/client/src/assets/imis-logo.svg b/client/src/assets/imis-logo.svg new file mode 100644 index 00000000..c87c1212 --- /dev/null +++ b/client/src/assets/imis-logo.svg @@ -0,0 +1,19 @@ + + + + imis-logo + Created with Sketch. + + + + + + + \ No newline at end of file From c91ecc8882db61247027f52b68ea25e97769389c Mon Sep 17 00:00:00 2001 From: lukaskoeller Date: Wed, 25 Mar 2020 21:39:52 +0100 Subject: [PATCH 05/17] Change route of LP from /home to / --- client/src/App.vue | 2 +- client/src/routes/routes.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/App.vue b/client/src/App.vue index ed6950db..dbe846c7 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -1,6 +1,6 @@