From 9821c004ecdaebe326118935f3531ed1f3217a0a Mon Sep 17 00:00:00 2001
From: Jegor <georg.reichert.1998@gmail.com>
Date: Thu, 17 Jun 2021 10:30:40 +0200
Subject: [PATCH] wip: profile component

---
 .../registration/registration.component.ts    |  2 +-
 .../components/profile/profile.component.ts   |  4 +--
 .../components/top-bar/top-bar.component.html |  2 +-
 .../components/top-bar/top-bar.component.ts   | 33 +++++++++++--------
 .../product-search-page.component.html        |  3 +-
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Frontend/src/app/components/auth/registration/registration.component.ts b/Frontend/src/app/components/auth/registration/registration.component.ts
index a624666..5324f72 100644
--- a/Frontend/src/app/components/auth/registration/registration.component.ts
+++ b/Frontend/src/app/components/auth/registration/registration.component.ts
@@ -36,8 +36,8 @@ export class RegistrationComponent implements OnInit {
   onSubmit() {
       this.api.registerUser(this.form.value.username, this.form.value.password, this.form.value.email).subscribe(
           res=> {
-              this.router.navigate(['']);
               this.api.saveSessionInfoToLocalStorage(res);
+              this.router.navigate(['/']);
           }
       );
   }
diff --git a/Frontend/src/app/components/profile/profile.component.ts b/Frontend/src/app/components/profile/profile.component.ts
index 611e06a..5620827 100644
--- a/Frontend/src/app/components/profile/profile.component.ts
+++ b/Frontend/src/app/components/profile/profile.component.ts
@@ -11,7 +11,7 @@ export class ProfileComponent implements OnInit {
     currentUser: any;
     obj:any;
     alarms: any [];
-    productsMap: any;
+    productsMap: any = {};
 
     constructor(private api: ApiService ) { }
 
@@ -37,7 +37,7 @@ export class ProfileComponent implements OnInit {
     }
 
     getProductsByIds(): void {
-        let productIds: number [];
+        let productIds: number [] = [];
         this.alarms.forEach(
             alarm => {productIds.push(alarm.product_id)}
         );
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 944d654..2e3ebd8 100644
--- a/Frontend/src/app/components/top-bar/top-bar.component.html
+++ b/Frontend/src/app/components/top-bar/top-bar.component.html
@@ -2,7 +2,7 @@
     <div class="container">
         <a class="navbar-brand" routerLink=""> Betterzon</a>
         <form class="form-inline my-2 my-lg-0">
-            <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" (keyup.enter)="getSearchedProducts()">
+            <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search" (keyup.enter)="getSearchedProducts()" [(ngModel)]="searchQuery">
         </form>
         <button class="navbar-toggler text-uppercase font-weight-bold bg-primary text-white rounded" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
             Menu
diff --git a/Frontend/src/app/components/top-bar/top-bar.component.ts b/Frontend/src/app/components/top-bar/top-bar.component.ts
index 89f5cd0..aa639fb 100644
--- a/Frontend/src/app/components/top-bar/top-bar.component.ts
+++ b/Frontend/src/app/components/top-bar/top-bar.component.ts
@@ -10,20 +10,23 @@ import {Router} from "@angular/router";
 })
 export class TopBarComponent implements OnInit {
 
-  sidenav: any;
-  isLoggedIn: boolean;
-  @Input() searchQuery: string;
+    sidenav: any;
+    isLoggedIn: boolean;
+    searchQuery: string;
 
-  constructor(
-      private api: ApiService,
-      private router: Router
-  ) { }
+    constructor(
+        private api: ApiService,
+        private router: Router
+    ) {
+    }
 
     ngOnInit() {
 
-        this.api.getUserInfo().subscribe(data=>{console.log(data)});
+        this.api.getUserInfo().subscribe(data => {
+            console.log(data)
+        });
 
-        if ( this.api.getSessionInfoFromLocalStorage().session_id != "") {
+        if (this.api.getSessionInfoFromLocalStorage().session_id != "") {
             this.isLoggedIn = true;
         }
     }
@@ -35,10 +38,12 @@ export class TopBarComponent implements OnInit {
     }
 
     getSearchedProducts(): void {
-        this.api.getProductsByQuery(this.searchQuery).subscribe(
-            data => {
-                this.router.navigate([('/registration')]);
-            }
-        );
+        console.log(this.searchQuery);
+        this.redirectTo('/search', {queryParams: {q: this.searchQuery}});
+    }
+
+    redirectTo(uri: string, queryParams: object): void {
+        this.router.navigateByUrl('/', {skipLocationChange: true}).then(() =>
+            this.router.navigate([uri], queryParams));
     }
 }
diff --git a/Frontend/src/app/pages/product-search-page/product-search-page.component.html b/Frontend/src/app/pages/product-search-page/product-search-page.component.html
index 670239c..cedafa9 100644
--- a/Frontend/src/app/pages/product-search-page/product-search-page.component.html
+++ b/Frontend/src/app/pages/product-search-page/product-search-page.component.html
@@ -1,6 +1,7 @@
+
 <div id="mainComponents">
     <app-product-list numberOfProducts="20" [showProductPicture]="true" searchQuery="{{searchTerm}}"
                       type="search"></app-product-list>
 </div>
 
-<app-footer></app-footer>
+<app-bottom-bar></app-bottom-bar>