From 3841731a65b372b2c752be4168dc32f4df2cc4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20H=C3=BCgin?= Date: Sat, 23 May 2020 11:21:57 +0200 Subject: [PATCH 1/3] Set names and icons for the bottom tab-bar --- package.json | 2 +- src/app/tabs/tabs.page.html | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 6c67ac6..12cf731 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "@angular-devkit/build-angular": "~0.901.5", - "@angular/cli": "~9.1.5", + "@angular/cli": "9.1.7", "@angular/compiler": "~9.1.6", "@angular/compiler-cli": "~9.1.6", "@angular/language-service": "~9.1.6", diff --git a/src/app/tabs/tabs.page.html b/src/app/tabs/tabs.page.html index 0995c40..e30ea8a 100644 --- a/src/app/tabs/tabs.page.html +++ b/src/app/tabs/tabs.page.html @@ -1,19 +1,19 @@ - - - - Tab 1 + + + + Suche - - - Tab 2 + + + Karte - - - Tab 3 + + + Chat From 05cefd6efc3827472a7ccea229f555957ca2b67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20H=C3=BCgin?= Date: Sat, 23 May 2020 11:51:51 +0200 Subject: [PATCH 2/3] Set names and headings of the three main-tabs --- src/app/tab1/tab1.page.html | 6 +++--- src/app/tab2/tab2.page.html | 6 +++--- src/app/tab3/tab3.page.html | 6 +++--- src/app/tabs/tabs-routing.module.ts | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/tab1/tab1.page.html b/src/app/tab1/tab1.page.html index 22e11e4..803c067 100644 --- a/src/app/tab1/tab1.page.html +++ b/src/app/tab1/tab1.page.html @@ -1,7 +1,7 @@ - Tab 1 + Suche durchführen @@ -9,9 +9,9 @@ - Tab 1 + Suche durchführen - + diff --git a/src/app/tab2/tab2.page.html b/src/app/tab2/tab2.page.html index 38b153e..f33c3b2 100644 --- a/src/app/tab2/tab2.page.html +++ b/src/app/tab2/tab2.page.html @@ -1,7 +1,7 @@ - Tab 2 + Präventions-Angebote in der Nähe @@ -9,9 +9,9 @@ - Tab 2 + Präventions-Angebote in der Nähe - + diff --git a/src/app/tab3/tab3.page.html b/src/app/tab3/tab3.page.html index 222333d..be00617 100644 --- a/src/app/tab3/tab3.page.html +++ b/src/app/tab3/tab3.page.html @@ -1,7 +1,7 @@ - Tab 3 + Probier den Chat-Bot aus! @@ -9,9 +9,9 @@ - Tab 3 + Chat-Bot - + diff --git a/src/app/tabs/tabs-routing.module.ts b/src/app/tabs/tabs-routing.module.ts index 468f849..935d5dd 100644 --- a/src/app/tabs/tabs-routing.module.ts +++ b/src/app/tabs/tabs-routing.module.ts @@ -8,15 +8,15 @@ const routes: Routes = [ component: TabsPage, children: [ { - path: 'tab1', + path: 'tab_search', loadChildren: () => import('../tab1/tab1.module').then(m => m.Tab1PageModule) }, { - path: 'tab2', + path: 'tab_map', loadChildren: () => import('../tab2/tab2.module').then(m => m.Tab2PageModule) }, { - path: 'tab3', + path: 'tab_chat', loadChildren: () => import('../tab3/tab3.module').then(m => m.Tab3PageModule) }, { From 9a966f28097273cd8e76529ff8fc1a6a529802a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20H=C3=BCgin?= Date: Sat, 23 May 2020 12:18:26 +0200 Subject: [PATCH 3/3] Fix problems with tab-routing --- src/app/tabs/tabs-routing.module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/tabs/tabs-routing.module.ts b/src/app/tabs/tabs-routing.module.ts index 935d5dd..468f849 100644 --- a/src/app/tabs/tabs-routing.module.ts +++ b/src/app/tabs/tabs-routing.module.ts @@ -8,15 +8,15 @@ const routes: Routes = [ component: TabsPage, children: [ { - path: 'tab_search', + path: 'tab1', loadChildren: () => import('../tab1/tab1.module').then(m => m.Tab1PageModule) }, { - path: 'tab_map', + path: 'tab2', loadChildren: () => import('../tab2/tab2.module').then(m => m.Tab2PageModule) }, { - path: 'tab_chat', + path: 'tab3', loadChildren: () => import('../tab3/tab3.module').then(m => m.Tab3PageModule) }, {