Merge pull request #180 from WebEngineering2/frontend

Fix #179

frontend/src/app/Services/bot.service.ts

@@ -102,17 +102,17 @@ export class BotService {
 
   /**
    * Function to delete a share
-   * @param  {string} symbol
+   * @param  {string} isin
    * @returns Observable
    */
-  public deleteShare(symbol: string): Observable<any> {
+  public deleteShare(isin: string): Observable<any> {
     return this.http.delete(API_URL + 'share', {
       headers: new HttpHeaders({
         'Content-Type': 'application/json',
         Authorization: 'Bearer ' + this.tokenStorage.getToken(),
       }),
       body: {
-        symbol,
+        isin,
       },
     });
   }

frontend/src/app/Views/dashboard/dashboard.component.html

@@ -140,7 +140,7 @@
             <!-- Name Column -->
             <ng-container matColumnDef="name">
               <th mat-header-cell *matHeaderCellDef>Price</th>
-              <td mat-cell *matCellDef="let element">{{ element.price }}$</td>
+              <td mat-cell *matCellDef="let element">{{ element.price }}€</td>
             </ng-container>
 
             <!-- Weight Column -->

frontend/src/app/Views/dashboard/dashboard.component.ts

@@ -63,7 +63,7 @@ export class DashboardComponent implements OnInit {
         });
       }
       this.dataSourceTransactions = TRANSACTION_DATA;
-      this.profit = this.depotCurrentValue - this.depotCost;
+      this.profit = this.depotCurrentValue + this.depotCost;
     });
   }
 

frontend/src/app/Views/login/login.component.html

@@ -24,7 +24,7 @@
           email
           #email="ngModel"
         />
-        <div class="alert-danger" *ngIf="email.errors && f.submitted">
+        <div class="alert alert-danger" *ngIf="email.errors && f.submitted">
           <div *ngIf="email.errors?.['required']">Email is required</div>
           <div *ngIf="email.errors?.['email']">
             Email must be a valid email address

frontend/src/app/Views/profile/profile.component.html

@@ -64,13 +64,16 @@
             <input
               type="password"
               matInput
-              [formControl]="passwordFormControl"
+              [formControl]="passwordRepeatFormControl"
               placeholder="Ex. pat@example.com"
+              minlength="6"
+              [(ngModel)]="form.passwordRepeat"
+              #passwordRepeat
             />
             <mat-error
               *ngIf="
-                passwordFormControl.hasError('minLength') &&
+                passwordRepeatFormControl.hasError('minLength') &&
-                !passwordFormControl.hasError('required')
+                !passwordRepeatFormControl.hasError('required')
               "
             >
               Please enter a valid password
@@ -79,12 +82,18 @@
               Password is <strong>required</strong>
             </mat-error>
           </mat-form-field>
+          <div class="alert-danger" *ngIf="checkPasswordFailed">
+            Password does not match, make sure it is the same!
+          </div>
+          <br />
           <div class="form-group footer-buttons">
             <button
               class="btn btn-primary btn-block"
               [disabled]="
+                passwordRepeatFormControl.hasError('required') ||
+                !passwordRepeatFormControl.hasError('minLength') ||
                 passwordFormControl.hasError('required') ||
-                passwordFormControl.hasError('minLength') ||
+                !passwordFormControl.hasError('minLength') ||
                 userNameFormControl.hasError('required')
               "
             >

frontend/src/app/Views/profile/profile.component.ts

@@ -16,6 +16,10 @@ export class ProfileComponent implements OnInit {
     Validators.required,
     Validators.minLength(6),
   ]);
+  passwordRepeatFormControl = new FormControl('', [
+    Validators.required,
+    Validators.minLength(6),
+  ]);
   telegramIdFormControl = new FormControl('', [
     Validators.required,
     Validators.minLength(6),
@@ -26,9 +30,12 @@ export class ProfileComponent implements OnInit {
   form: any = {
     username: null,
     email: 'example@web.com',
-    password: 'password',
+    password: null,
+    passwordRepeat: null,
   };
 
+  checkPasswordFailed = false;
+
   constructor(
     private profileService: ProfileService,
     public dialog: MatDialog
@@ -57,18 +64,24 @@ export class ProfileComponent implements OnInit {
   }
 
   updateUser() {
-    const { username, email, password } = this.form;
+    if (this.form.password === this.form.passwordRepeat) {
-    this.profileService
+      this.checkPasswordFailed = false;
-      .updateProfile(this.form.username, this.form.password)
+      const { username, email, password } = this.form;
-      .subscribe((result) => {
+      this.profileService
-        console.log(result);
+        .updateProfile(this.form.username, this.form.password)
-      });
+        .subscribe((result) => {
+          console.log(result);
+        });
+    } else {
+      this.checkPasswordFailed = true;
+      console.log("Passwords don't match");
+    }
   }
 
   openDialog(action: string) {
     const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
       width: '50vw',
-      height: '20vh',
+      height: '25vh',
     });
 
     dialogRef.afterClosed().subscribe((result) => {