Merge branch 'master' of ssh://lab.theresno.cloud:1251/hackathon-fr-20/plana

master
Felix Pankratz 5 years ago
commit 7c00ccf603

@ -30,7 +30,7 @@
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.901.5", "@angular-devkit/build-angular": "~0.901.5",
"@angular/cli": "~9.1.5", "@angular/cli": "9.1.7",
"@angular/compiler": "~9.1.6", "@angular/compiler": "~9.1.6",
"@angular/compiler-cli": "~9.1.6", "@angular/compiler-cli": "~9.1.6",
"@angular/language-service": "~9.1.6", "@angular/language-service": "~9.1.6",

@ -1,7 +1,7 @@
<ion-header [translucent]="true"> <ion-header [translucent]="true">
<ion-toolbar> <ion-toolbar>
<ion-title> <ion-title>
Tab 1 Suche durchführen
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
@ -9,9 +9,9 @@
<ion-content [fullscreen]="true"> <ion-content [fullscreen]="true">
<ion-header collapse="condense"> <ion-header collapse="condense">
<ion-toolbar> <ion-toolbar>
<ion-title size="large">Tab 1</ion-title> <ion-title size="large">Suche durchführen</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<app-explore-container name="Tab 1 page"></app-explore-container> <app-explore-container name="Suche durchführen"></app-explore-container>
</ion-content> </ion-content>

@ -1,7 +1,7 @@
<ion-header [translucent]="true"> <ion-header [translucent]="true">
<ion-toolbar> <ion-toolbar>
<ion-title> <ion-title>
Tab 2 Präventions-Angebote in der Nähe
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
@ -9,9 +9,9 @@
<ion-content [fullscreen]="true"> <ion-content [fullscreen]="true">
<ion-header collapse="condense"> <ion-header collapse="condense">
<ion-toolbar> <ion-toolbar>
<ion-title size="large">Tab 2</ion-title> <ion-title size="large">Präventions-Angebote in der Nähe</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<app-explore-container name="Tab 2 page"></app-explore-container> <app-explore-container name="Präventions-Angebote in der Nähe"></app-explore-container>
</ion-content> </ion-content>

@ -1,7 +1,7 @@
<ion-header [translucent]="true"> <ion-header [translucent]="true">
<ion-toolbar> <ion-toolbar>
<ion-title> <ion-title>
Tab 3 Probier den Chat-Bot aus!
</ion-title> </ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
@ -9,9 +9,9 @@
<ion-content [fullscreen]="true"> <ion-content [fullscreen]="true">
<ion-header collapse="condense"> <ion-header collapse="condense">
<ion-toolbar> <ion-toolbar>
<ion-title size="large">Tab 3</ion-title> <ion-title size="large">Chat-Bot</ion-title>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<app-explore-container name="Tab 3 page"></app-explore-container> <app-explore-container name="Chat-Bot"></app-explore-container>
</ion-content> </ion-content>

@ -1,19 +1,19 @@
<ion-tabs> <ion-tabs>
<ion-tab-bar slot="bottom"> <ion-tab-bar slot="tabBar_Bottom">
<ion-tab-button tab="tab1"> <ion-tab-button tab="tab_search">
<ion-icon name="triangle"></ion-icon> <ion-icon name="search-outline"></ion-icon>
<ion-label>Tab 1</ion-label> <ion-label>Suche</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button tab="tab2"> <ion-tab-button tab="tab_map">
<ion-icon name="ellipse"></ion-icon> <ion-icon name="map-outline"></ion-icon>
<ion-label>Tab 2</ion-label> <ion-label>Karte</ion-label>
</ion-tab-button> </ion-tab-button>
<ion-tab-button tab="tab3"> <ion-tab-button tab="tab_chat">
<ion-icon name="square"></ion-icon> <ion-icon name="chatbubbles-outline"></ion-icon>
<ion-label>Tab 3</ion-label> <ion-label>Chat</ion-label>
</ion-tab-button> </ion-tab-button>
</ion-tab-bar> </ion-tab-bar>

Loading…
Cancel
Save