diff --git a/Frontend/src/app/components/about-us/about-us.component.html b/Frontend/src/app/components/about-us/about-us.component.html index 6fa5b2e..02cbb14 100644 --- a/Frontend/src/app/components/about-us/about-us.component.html +++ b/Frontend/src/app/components/about-us/about-us.component.html @@ -10,8 +10,8 @@
-

text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries

-

text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries

+

You follow the same passion as we do and you want to find alternatives to the de-facto monopolist Amazon?

+

In this case, welcome aboard! We’re happy that you share our passion and hope that we can help you achieving this goal with the website

diff --git a/Frontend/src/app/components/auth/registration/registration.component.html b/Frontend/src/app/components/auth/registration/registration.component.html index c18e6e0..e203b31 100644 --- a/Frontend/src/app/components/auth/registration/registration.component.html +++ b/Frontend/src/app/components/auth/registration/registration.component.html @@ -6,7 +6,7 @@
-

Konto erstellen

+

Registration

@@ -22,17 +22,17 @@
- +
- +
- Sich anmelden +

Have an account?Log In

diff --git a/Frontend/src/app/components/auth/signin/signin.component.html b/Frontend/src/app/components/auth/signin/signin.component.html index 358f183..fb5992e 100644 --- a/Frontend/src/app/components/auth/signin/signin.component.html +++ b/Frontend/src/app/components/auth/signin/signin.component.html @@ -6,7 +6,7 @@
-

Anmelden

+

Sign In

@@ -18,12 +18,12 @@
- +
- Konto erstellen +

No account yet?sign up

diff --git a/Frontend/src/app/components/bottom-bar/bottom-bar.component.html b/Frontend/src/app/components/bottom-bar/bottom-bar.component.html index 039881b..9059db7 100644 --- a/Frontend/src/app/components/bottom-bar/bottom-bar.component.html +++ b/Frontend/src/app/components/bottom-bar/bottom-bar.component.html @@ -5,24 +5,22 @@

Location

- 70376 Stuttgart + 76133 Karlsruhe

-

FOLGE UNS

- - - - +

FOLLOW UNS

+ +
-

SOME INFO

+

CONTACT US

- text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + betterzon-contact@mueller-patrick.tech

diff --git a/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html b/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html index 7a43211..37474da 100644 --- a/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html +++ b/Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html @@ -1,7 +1,7 @@
-

TOP-ANGEBOTE

+

TOP-SEARCHES

diff --git a/Frontend/src/app/components/kunden/kunden.component.html b/Frontend/src/app/components/kunden/kunden.component.html index 0012423..0fde734 100644 --- a/Frontend/src/app/components/kunden/kunden.component.html +++ b/Frontend/src/app/components/kunden/kunden.component.html @@ -1,7 +1,7 @@
-

SIE VERTRAUEN UNS

+

THEY TRUST US

diff --git a/Frontend/src/app/components/product-list/product-list.component.ts b/Frontend/src/app/components/product-list/product-list.component.ts index 5fe6432..1f1bdd3 100644 --- a/Frontend/src/app/components/product-list/product-list.component.ts +++ b/Frontend/src/app/components/product-list/product-list.component.ts @@ -61,24 +61,25 @@ export class ProductListComponent implements OnInit { } getPrices(): void { - const productIds: number[] = []; this.products.forEach( - product => productIds.push(product.product_id) - ) - this.apiService.getProductsByIds(productIds).subscribe( - prices => { - prices.forEach(price => { - this.pricesMap[price.product_id] = price; - }) + product => { + this.apiService.getLowestPrices(product.product_id).subscribe( + prices => { + this.pricesMap[product.product_id] = prices[prices.length - 1]; + } + ); } - ) + ); } getSearchedProducts(): void { - this.apiService.getProductsByQuery(this.searchQuery).subscribe(products => this.products = products); + this.apiService.getProductsByQuery(this.searchQuery).subscribe(products => { + this.products = products; + this.getPrices(); + }); } - + clickedProduct(product: Product): void { this.router.navigate([('/product/' + product.product_id)]); } diff --git a/Frontend/src/app/components/profile/profile.component.html b/Frontend/src/app/components/profile/profile.component.html index 4d94c9f..c08a7d9 100644 --- a/Frontend/src/app/components/profile/profile.component.html +++ b/Frontend/src/app/components/profile/profile.component.html @@ -24,7 +24,7 @@ - bootnipets + {{currentUser.username}} @@ -48,7 +48,7 @@ - noreply@email.com + {{currentUser.email}} @@ -59,7 +59,7 @@ - 20 jul 20014 + {{currentUser.registration_date}} @@ -76,10 +76,10 @@
- - - - + + + +
ProduktPreisÄndernLöschenProductPriceChangeDelete
diff --git a/Frontend/src/app/components/top-bar/top-bar.component.html b/Frontend/src/app/components/top-bar/top-bar.component.html index 651adb2..7cfece9 100644 --- a/Frontend/src/app/components/top-bar/top-bar.component.html +++ b/Frontend/src/app/components/top-bar/top-bar.component.html @@ -10,13 +10,13 @@ diff --git a/Frontend/src/styles.css b/Frontend/src/styles.css index ce64db2..29431c5 100644 --- a/Frontend/src/styles.css +++ b/Frontend/src/styles.css @@ -447,8 +447,8 @@ progress { } .lead { - font-size: 1.25rem; - font-weight: 300; + font-size: 1.30rem; + font-weight: 400; } .display-1 {