webapp fix

fablabs-ch · Sep 20, 2018 · ea5a22f · ea5a22f
1 parent 43cf7f3
commit ea5a22f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/angular-app/src/app/bar-status/bar-status.component.html b/angular-app/src/app/bar-status/bar-status.component.html
@@ -5,11 +5,11 @@
 	<input matInput placeholder="QueueSize" [value]="status?.queueSize" [disabled]="true">
 </mat-form-field>
 <mat-form-field>
-	<input matInput placeholder="Position" [value]="status?.position" [disabled]="true">
+	<input matInput placeholder="Position (mm)" [value]="status?.position" [disabled]="true">
 </mat-form-field>
 <mat-form-field>
-	<input matInput placeholder="Pression" [value]="status?.pression" [disabled]="true">
+	<input matInput placeholder="Pression (mBar)" [value]="status?.pression" [disabled]="true">
 </mat-form-field>
 <mat-form-field>
-	<input matInput placeholder="Weight" [value]="status?.weight" [disabled]="true">
+	<input matInput placeholder="Weight (gr)" [value]="status?.weight" [disabled]="true">
 </mat-form-field>
diff --git a/angular-app/src/app/cocktail-item/cocktail-item.component.html b/angular-app/src/app/cocktail-item/cocktail-item.component.html
@@ -2,7 +2,7 @@
 	<mat-card-header>
 		<div mat-card-avatar></div>
 		<mat-card-title>{{cocktail.name}}</mat-card-title>
-		<mat-card-subtitle>Dog Breed</mat-card-subtitle>
+		<mat-card-subtitle>{{cocktail.description}}</mat-card-subtitle>
 	</mat-card-header>
 	<img mat-card-image [src]="cocktail.image" alt="">
 	<!--<mat-card-content>-->

diff --git a/angular-app/src/app/cocktail-item/cocktail-item.component.ts b/angular-app/src/app/cocktail-item/cocktail-item.component.ts
@@ -16,14 +16,18 @@ export class CocktailItem {
 }
 
 export class Cocktail {
-	constructor(private _name: string, private _image: string, private _items: CocktailItem[]) {
+	constructor(private _name: string, private _description, private _image: string, private _items: CocktailItem[]) {
 
 	}
 
 	get name(): string {
 		return this._name;
 	}
 
+	get description() {
+		return this._description;
+	}
+
 	get items(): CocktailItem[] {
 		return this._items;
 	}

diff --git a/angular-app/src/app/cocktail-list/cocktail-list.component.ts b/angular-app/src/app/cocktail-list/cocktail-list.component.ts
@@ -3,15 +3,23 @@ import {Cocktail, CocktailItem} from '../cocktail-item/cocktail-item.component';
 
 
 export const COCKTAILS_LIST: Cocktail[] = [
-	new Cocktail('cocktail1', 'https://www.maliburumdrinks.com/globalassets/images/cocktail-recipe-images/malibu-island-cosmo.png/CocktailHero', [
-		new CocktailItem(0, 100),
-		new CocktailItem(1, 100)
-	]),
-	new Cocktail('cocktail2', 'http://i.f1g.fr/media/ext/1900x1900/madame.lefigaro.fr/sites/default/files/img/2017/12/cocktail-vodka-thym--pamplemousse.jpg', [
-		new CocktailItem(1, 100),
-		new CocktailItem(0, 100),
-		new CocktailItem(1, 100)
+	new Cocktail('cocktail1', '70cl',
+		'https://www.maliburumdrinks.com/globalassets/images/cocktail-recipe-images/malibu-island-cosmo.png/CocktailHero', [
+		new CocktailItem(0, 50),
+		new CocktailItem(1, 20)
 	]),
+	new Cocktail('cocktail2', '110cl',
+		'http://i.f1g.fr/media/ext/1900x1900/madame.lefigaro.fr/sites/default/files/img/2017/12/cocktail-vodka-thym--pamplemousse.jpg', [
+			new CocktailItem(1, 20),
+			new CocktailItem(0, 60),
+			new CocktailItem(1, 30)
+		]),
+	new Cocktail('cocktail', '230cl',
+		'https://az826390.vo.msecnd.net/cdn/media/home/inspiring_recipes/recipes/new_-_c/cocktail-melon-miel-et-concombre-1160x650-bs007548--pub-67290-01.ashx?la=fr&mw=1160&w=1160&hash=7C2118A37A34E66FF25FC1145F6D5B76AED9F6AB', [
+			new CocktailItem(0, 100),
+			new CocktailItem(1, 50),
+			new CocktailItem(0, 100)
+		]),
 ];
 
 @Component({