Merge pull request #100 from Mueller-Patrick/develop

Some fancy changes

Frontend/src/app/components/about-us/about-us.component.html

@@ -11,7 +11,7 @@
         <!-- About Section Content-->
         <div class="row">
             <div class="col-lg-4 ms-auto"><p class="lead">You follow the same passion as we do and you want to find alternatives to the de-facto monopolist Amazon?</p></div>
-            <div class="col-lg-4 me-auto"><p class="lead">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</p></div>
+            <div class="col-lg-4 me-auto"><p class="lead">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.</p></div>
         </div>
     </div>
 </section>

Frontend/src/app/components/about-us/about-us.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-about-us',
-  templateUrl: './about-us.component.html',
-  styleUrls: ['./about-us.component.css']
+    selector: 'app-about-us',
+    templateUrl: './about-us.component.html',
+    styleUrls: ['./about-us.component.css']
 })
 export class AboutUsComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/auth/registration/registration.component.ts

@@ -1,44 +1,47 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import {ApiService} from "../../../services/api.service";
-import {Router} from "@angular/router";
+import {Component, OnInit} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {ApiService} from '../../../services/api.service';
+import {Router} from '@angular/router';
 
 
 @Component({
-  selector: 'app-registration',
-  templateUrl: './registration.component.html',
-  styleUrls: ['./registration.component.css']
+    selector: 'app-registration',
+    templateUrl: './registration.component.html',
+    styleUrls: ['./registration.component.css']
 })
 export class RegistrationComponent implements OnInit {
     form: any;
     loading = false;
     submitted = false;
 
-  constructor(
-      private formBuilder: FormBuilder,
-      private api : ApiService,
-      private router: Router
-  ) { }
+    constructor(
+        private formBuilder: FormBuilder,
+        private api: ApiService,
+        private router: Router
+    ) {
+    }
 
-  ngOnInit(): void {
-      this.form = this.formBuilder.group({
-          username: ['', Validators.required],
-          email: ['', Validators.required],
-          password: ['', [
-              Validators.required,
-              Validators.minLength(8)]
-          ],
-      });
-  }
+    ngOnInit(): void {
+        this.form = this.formBuilder.group({
+            username: ['', Validators.required],
+            email: ['', Validators.required],
+            password: ['', [
+                Validators.required,
+                Validators.minLength(8)]
+            ],
+        });
+    }
 
-  get me() { return this.form.controls; }
+    get me() {
+        return this.form.controls;
+    }
 
-  onSubmit() {
-      this.api.registerUser(this.form.value.username, this.form.value.password, this.form.value.email).subscribe(
-          res=> {
-              this.api.saveSessionInfoToLocalStorage(res);
-              this.router.navigate(['/']);
-          }
-      );
-  }
+    onSubmit(): void {
+        this.api.registerUser(this.form.value.username, this.form.value.password, this.form.value.email).subscribe(
+            res => {
+                this.api.saveSessionInfoToLocalStorage(res);
+                this.router.navigate(['/']);
+            }
+        );
+    }
 }

Frontend/src/app/components/auth/resetpasswort/resetpasswort.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-resetpasswort',
-  templateUrl: './resetpasswort.component.html',
-  styleUrls: ['./resetpasswort.component.css']
+    selector: 'app-resetpasswort',
+    templateUrl: './resetpasswort.component.html',
+    styleUrls: ['./resetpasswort.component.css']
 })
 export class ResetpasswortComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/bottom-bar/bottom-bar.component.html

@@ -12,7 +12,7 @@
             </div>
             <!-- Footer Social Icons-->
             <div class="col-lg-4 mb-5 mb-lg-0">
-                <h4 class="text-uppercase mb-4">FOLLOW UNS</h4>
+                <h4 class="text-uppercase mb-4">FOLLOW US</h4>
                 <a class="btn btn-outline-light btn-social mx-1" href="https://github.com/Mueller-Patrick/Betterzon"><i class="fab fa-fw fa-github"></i></a>
                 <a class="btn btn-outline-light btn-social mx-1" href="https://blog.betterzon.xyz/"><i class="fab fa-fw fa-dribbble"></i></a>
             </div>

Frontend/src/app/components/bottom-bar/bottom-bar.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-bottom-bar',
-  templateUrl: "./bottom-bar.component.html",
-  styleUrls: ["./bottom-bar.component.css"]
+    selector: 'app-bottom-bar',
+    templateUrl: './bottom-bar.component.html',
+    styleUrls: ['./bottom-bar.component.css']
 })
 export class BottomBarComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/copyright/copyright.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-copyright',
-  templateUrl: './copyright.component.html',
-  styleUrls: ['./copyright.component.css']
+    selector: 'app-copyright',
+    templateUrl: './copyright.component.html',
+    styleUrls: ['./copyright.component.css']
 })
 export class CopyrightComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/footer/footer.component.ts

@@ -1,23 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 
 @Component({
-  selector: 'app-footer',
-  templateUrl: './footer.component.html',
-  styleUrls: ['./footer.component.css']
+    selector: 'app-footer',
+    templateUrl: './footer.component.html',
+    styleUrls: ['./footer.component.css']
 })
 export class FooterComponent implements OnInit {
 
-  constructor(
-      private router: Router,
-      private route: ActivatedRoute
-  ) {}
+    constructor(
+        private router: Router,
+        private route: ActivatedRoute
+    ) {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
-  navigateImprint(): void {
-      this.router.navigate([('/impressum')]);
-  }
+    navigateImprint(): void {
+        this.router.navigate([('/impressum')]);
+    }
 
 }

Frontend/src/app/components/greeting-info-slider/greeting-info-slider.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-greeting-info-slider',
-  templateUrl: './greeting-info-slider.component.html',
-  styleUrls: ['./greeting-info-slider.component.css']
+    selector: 'app-greeting-info-slider',
+    templateUrl: './greeting-info-slider.component.html',
+    styleUrls: ['./greeting-info-slider.component.css']
 })
 export class GreetingInfoSliderComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.html

@@ -1,7 +1,7 @@
 <section class="page-section portfolio" id="top-gesuchte">
     <div class="container">
         <!-- Portfolio Section Heading-->
-        <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">TOP-SEARCHES</h2>
+        <h2 class="page-section-heading text-center text-uppercase text-secondary mb-0">TOP-OFFERS</h2>
         <!-- Icon Divider-->
         <div class="divider-custom">
             <div class="divider-custom-line"></div>
@@ -17,10 +17,10 @@
                             <div class="bbb_deals_item_name">{{productsPricesMap[productId]?.product?.name}}</div>
                         </div>
                         <div class="bbb_deals_info_line d-flex flex-row justify-content-start">
-                            <div class="bbb_deals_item_category">Amazon: <span id="bbb_deals_item_price_a"><strike>{{productsPricesMap[productId]?.amazonPrice?.price_in_cents/100}}$</strike></span></div>
+                            <div class="bbb_deals_item_category">Amazon: <span id="bbb_deals_item_price_a"><strike>{{productsPricesMap[productId]?.amazonPrice?.price_in_cents/100}}€</strike></span></div>
                         </div>
                         <div class="bbb_deals_info_line d-flex flex-row justify-content-start">
-                            <div class="bbb_deals_item_category">{{productsPricesMap[productId]?.vendor?.name}}: <span id="bbb_deals_item_price_b">{{productsPricesMap[productId]?.lowestPrice?.price_in_cents/100}}</span></div>
+                            <div class="bbb_deals_item_category">{{productsPricesMap[productId]?.vendor?.name}}: <span id="bbb_deals_item_price_b">{{productsPricesMap[productId]?.lowestPrice?.price_in_cents/100}}€</span></div>
                         </div>
                         <div class="available_bar">
                             <span style="width:17%"></span>

Frontend/src/app/components/hot-deals-widget/hot-deals-widget.component.ts

@@ -4,9 +4,9 @@ import {Product} from '../../models/product';
 import {ActivatedRoute, Router} from '@angular/router';
 
 @Component({
-  selector: 'app-hot-deals-widget',
-  templateUrl: './hot-deals-widget.component.html',
-  styleUrls: ['./hot-deals-widget.component.css']
+    selector: 'app-hot-deals-widget',
+    templateUrl: './hot-deals-widget.component.html',
+    styleUrls: ['./hot-deals-widget.component.css']
 })
 export class HotDealsWidgetComponent implements OnInit {
 
@@ -52,7 +52,7 @@ export class HotDealsWidgetComponent implements OnInit {
             default: {
                 this.getProductsByIds();
                 this.getAmazonPricesForBestDeals();
-                this.getVendors()
+                this.getVendors();
                 break;
             }
         }
@@ -73,7 +73,7 @@ export class HotDealsWidgetComponent implements OnInit {
             deals => {
                 deals.forEach(deal => {
                     this.bestDealsProductIds.push(deal.product_id);
-                    this.productsPricesMap [deal.product_id] = {lowestPrice: deal}
+                    this.productsPricesMap [deal.product_id] = {lowestPrice: deal};
                 });
                 this.loadParams();
             }
@@ -92,7 +92,7 @@ export class HotDealsWidgetComponent implements OnInit {
     }
 
 
-    getAmazonPricesForBestDeals(): void{
+    getAmazonPricesForBestDeals(): void {
         this.bestDealsProductIds.forEach(id => {
                 this.apiService.getAmazonPrice(id).subscribe(
                     price => {

Frontend/src/app/components/kunden/kunden.component.html

@@ -14,7 +14,7 @@
                     <div class="portfolio-item-caption d-flex align-items-center justify-content-center h-100 w-100">
                         <div class="portfolio-item-caption-content text-center text-white"><i class="fas fa-plus fa-3x"></i></div>
                     </div>
-                    <img class="productImage" src="assets/images/Betterzon.svg"/>
+                    <img width="100%" class="productImage" src="assets/images/cropped-unknown-1-1.png"/>
                 </div>
             </div>
             <div class="col-md-6 col-lg-4 mb-5">
@@ -22,7 +22,7 @@
                     <div class="portfolio-item-caption d-flex align-items-center justify-content-center h-100 w-100">
                         <div class="portfolio-item-caption-content text-center text-white"><i class="fas fa-plus fa-3x"></i></div>
                     </div>
-                    <img class="productImage" src="assets/images/Betterzon.svg"/>
+                    <img width="100%" class="productImage" src="assets/images/plantshub.jpg"/>
                 </div>
             </div>
             <div class="col-md-6 col-lg-4 mb-5">
@@ -30,7 +30,7 @@
                     <div class="portfolio-item-caption d-flex align-items-center justify-content-center h-100 w-100">
                         <div class="portfolio-item-caption-content text-center text-white"><i class="fas fa-plus fa-3x"></i></div>
                     </div>
-                    <img class="productImage" src="assets/images/Betterzon.svg"/>
+                    <img width="70%" class="productImage" src="assets/images/CeangalLogo.png"/>
                 </div>
             </div>
         </div>

Frontend/src/app/components/kunden/kunden.component.ts

@@ -4,9 +4,9 @@ import {Product} from '../../models/product';
 import {ActivatedRoute, Router} from '@angular/router';
 
 @Component({
-  selector: 'app-kunden',
-  templateUrl: './kunden.component.html',
-  styleUrls: ['./kunden.component.css']
+    selector: 'app-kunden',
+    templateUrl: './kunden.component.html',
+    styleUrls: ['./kunden.component.css']
 })
 export class KundenComponent implements OnInit {
     products: Product[] = [];

Frontend/src/app/components/product-details/product-details.component.ts

@@ -46,7 +46,7 @@ export class ProductDetailsComponent implements OnInit {
         this.getProduct();
         this.getVendors();
         this.getPrices();
-        if (this.apiService.getSessionInfoFromLocalStorage().session_id != "") {
+        if (this.apiService.getSessionInfoFromLocalStorage().session_id != '') {
             this.isLoggedIn = true;
         }
     }
@@ -123,10 +123,10 @@ export class ProductDetailsComponent implements OnInit {
         return Math.round(percentage);
     }
 
-    setPriceAlarm() {
-        this.apiService.createPriceAlarms(this.productId, this.price*100).subscribe(
+    setPriceAlarm(): void {
+        this.apiService.createPriceAlarms(this.productId, this.price * 100).subscribe(
             alarms => console.log(alarms)
-        )
+        );
     }
 
 

Frontend/src/app/components/profile/profile.component.css

@@ -19,3 +19,8 @@ table, th, td {
     cursor: pointer;
     color: #0d5a4b;
 }
+
+.edit {
+    width: 5%;
+    height: 5%;
+}

Frontend/src/app/components/profile/profile.component.html

@@ -86,10 +86,10 @@
                     {{productsMap[alarm.product_id]?.name}}
                 </td>
                 <td>
-                    {{alarm.defined_price/100}}
+                    {{alarm.defined_price/100}}€
                 </td>
                 <td>
-                    <img class="delete" src="../assets/images/Delete_icon-icons.com_55931.png" (click)="delete(alarm.alarm_id)">
+                    <img class="delete" src="../assets/images/pencil.png">
                 </td>
                 <td>
                     <img class="delete" src="../assets/images/Delete_icon-icons.com_55931.png" (click)="delete(alarm.alarm_id)">

Frontend/src/app/components/profile/profile.component.ts

@@ -1,25 +1,26 @@
-import { Component, OnInit } from '@angular/core';
-import {ApiService} from "../../services/api.service";
+import {Component, OnInit} from '@angular/core';
+import {ApiService} from '../../services/api.service';
 
 @Component({
-  selector: 'app-profile',
-  templateUrl: './profile.component.html',
-  styleUrls: ['./profile.component.css']
+    selector: 'app-profile',
+    templateUrl: './profile.component.html',
+    styleUrls: ['./profile.component.css']
 })
 export class ProfileComponent implements OnInit {
 
     currentUser: any;
-    obj:any;
+    obj: any;
     alarms: any [];
     productsMap: any = {};
 
-    constructor(private api: ApiService ) { }
+    constructor(private api: ApiService) {
+    }
 
     ngOnInit(): void {
 
         this.api.getUserInfo().subscribe(
-            user=> {
-                this.currentUser = user
+            user => {
+                this.currentUser = user;
                 console.log(this.currentUser);
             },
         );
@@ -30,29 +31,33 @@ export class ProfileComponent implements OnInit {
     getPriceAlarms(): void {
         this.api.getPriceAlarms().subscribe(
             alarms => {
-                this.alarms = alarms
-                this.getProductsByIds()
+                this.alarms = alarms;
+                this.getProductsByIds();
             }
-        )
+        );
     }
 
     getProductsByIds(): void {
-        let productIds: number [] = [];
+        const productIds: number [] = [];
         this.alarms.forEach(
-            alarm => {productIds.push(alarm.product_id)}
+            alarm => {
+                productIds.push(alarm.product_id);
+            }
         );
         this.api.getProductsByIds(productIds).subscribe(
             products => {
                 products.forEach(
-                    product => {this.productsMap[product.product_id] = product}
-                )
+                    product => {
+                        this.productsMap[product.product_id] = product;
+                    }
+                );
             }
-        )
+        );
     }
 
-    delete(id:number): void {
+    delete(id: number): void {
         this.api.deletePriceAlarm(id).subscribe(
             res => window.location.reload()
-        )
+        );
     }
 }

Frontend/src/app/components/slider-for-products/slider-for-products.component.ts

@@ -1,15 +1,16 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
-  selector: 'app-slider-for-products',
-  templateUrl: './slider-for-products.component.html',
-  styleUrls: ['./slider-for-products.component.css']
+    selector: 'app-slider-for-products',
+    templateUrl: './slider-for-products.component.html',
+    styleUrls: ['./slider-for-products.component.css']
 })
 export class SliderForProductsComponent implements OnInit {
 
-  constructor() { }
+    constructor() {
+    }
 
-  ngOnInit(): void {
-  }
+    ngOnInit(): void {
+    }
 
 }

Frontend/src/app/components/top-bar/top-bar.component.html

@@ -10,7 +10,7 @@
         </button>
         <div class="collapse navbar-collapse" id="navbarResponsive">
             <ul class="navbar-nav ms-auto">
-                <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#top-gesuchte">top-searches</a></li>
+                <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#top-gesuchte">top-offers</a></li>
                 <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#about">about</a></li>
                 <li class="nav-item mx-0 mx-lg-1"><a class="nav-link py-3 px-0 px-lg-3 rounded" href="#unsere-kunden">our clients</a></li>
                 <li class="nav-item mx-0 mx-lg-1" *ngIf="!isLoggedIn"><a class="nav-link py-3 px-0 px-lg-3 rounded" routerLink="/signin">sign in</a></li>

Frontend/src/app/components/top-bar/top-bar.component.ts

@@ -1,6 +1,6 @@
 import {Component, Input, OnInit} from '@angular/core';
-import {ApiService} from "../../services/api.service";
-import {Router} from "@angular/router";
+import {ApiService} from '../../services/api.service';
+import {NavigationEnd, Router} from '@angular/router';
 
 
 @Component({
@@ -20,13 +20,12 @@ export class TopBarComponent implements OnInit {
     ) {
     }
 
-    ngOnInit() {
-
+    ngOnInit(): void {
         this.api.getUserInfo().subscribe(data => {
-            console.log(data)
+            console.log(data);
         });
 
-        if (this.api.getSessionInfoFromLocalStorage().session_id != "") {
+        if (this.api.getSessionInfoFromLocalStorage().session_id !== '') {
             this.isLoggedIn = true;
         }
     }
@@ -34,7 +33,11 @@ export class TopBarComponent implements OnInit {
     logout(): void {
         localStorage.setItem('session_id', '');
         localStorage.setItem('session_key', '');
-        window.location.reload()
+        if (this.router.url === '/profile') {
+            this.router.navigate(['/']);
+        } else {
+            window.location.reload();
+        }
     }
 
     getSearchedProducts(): void {