a lot of bug fixing, even #15

epic-guys · Jun 22, 2024 · 5b12016 · 5b12016
1 parent f2f40bb
commit 5b12016
Show file tree

Hide file tree

Showing 8 changed files with 15,249 additions and 31 deletions.
diff --git a/angular/package.json b/angular/package.json
@@ -21,7 +21,7 @@
     "@angular/platform-browser-dynamic": "^16.2.0",
     "@angular/router": "^16.2.0",
     "http": "^0.0.1-security",
-    "ngx-socket-io": "^4.5.1",
+    "ngx-socket-io": "4.5.1",
     "ngx-webstorage-service": "^5.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",

diff --git a/angular/src/app/modules/books/components/book-create/book-create.component.html b/angular/src/app/modules/books/components/book-create/book-create.component.html
@@ -39,11 +39,11 @@
             <div class="row">
                 <mat-form-field>
                     <mat-label>Start Price</mat-label>
-                    <input matInput type="text" formControlName="start_price">
+                    <input matInput type="number" formControlName="start_price">
                 </mat-form-field>
                 <mat-form-field>
                     <mat-label>Reserve Price</mat-label>
-                    <input matInput type="text" formControlName="reserve_price">
+                    <input matInput type="number" formControlName="reserve_price">
                 </mat-form-field>
             </div>
 

diff --git a/angular/src/app/modules/books/components/book-create/book-create.component.ts b/angular/src/app/modules/books/components/book-create/book-create.component.ts
@@ -15,7 +15,7 @@ export class BookCreateComponent {
 
   form: FormGroup = new FormGroup({
     title: new FormControl('', [Validators.required]),
-    isbn : new FormControl('', [Validators.required]),
+    isbn : new FormControl('', [Validators.required, Validators.pattern(/^(?:\d{10}|\d{13})$/)]),
     author: new FormControl('', [Validators.required]),
     start_price: new FormControl('', [Validators.required]),
     reserve_price: new FormControl('', [Validators.required]),

diff --git a/angular/src/app/modules/books/components/book-details/book-details.component.html b/angular/src/app/modules/books/components/book-details/book-details.component.html
@@ -38,8 +38,7 @@ <h3>Moderate this book</h3>
         </div>
     </div>
     <div class="chat" *ngIf="role === 'student'">
-        <app-loader *ngIf="!publicChat " color="#ff0000" position="relative"></app-loader>
-        <mat-tab-group *ngIf="publicChat && privateChat">
+        <mat-tab-group>
             <mat-tab label="Public chat">
                 <h1>Public chat:</h1>
                 <div class="chat-container" id="public-chat">

diff --git a/.../components/account-personal/payment-methods/payment-method/payment-method.component.html b/.../components/account-personal/payment-methods/payment-method/payment-method.component.html
@@ -1,5 +1,5 @@
 <div class="container">
-    <div class="card" *ngIf="paymentMethod" [ngClass]="paymentMethod.name">
+    <div class="card" *ngIf="paymentMethod" [ngClass]="paymentMethod.type">
         <div class="data">
             <p class="number">
                 <span><div *ngFor="let i of [].constructor(12);" class="circle"></div></span>

diff --git a/api/seed-data/users/users-mod.json b/api/seed-data/users/users-mod.json
@@ -16,21 +16,21 @@
                 "fullName": "Wario Gold",
                 "number": "1111222233334444",
                 "expiration": "12/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Wario Gold",
                 "number": "5555666677778888",
                 "expiration": "01/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Wario Gold",
                 "number": "9999000011112222",
                 "expiration": "02/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -51,21 +51,21 @@
                 "fullName": "Waluigi Purple",
                 "number": "4444555566667777",
                 "expiration": "06/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Waluigi Purple",
                 "number": "5555666677778888",
                 "expiration": "07/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Waluigi Purple",
                 "number": "6666777788889999",
                 "expiration": "08/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -86,21 +86,21 @@
                 "fullName": "Bowser Koopa",
                 "number": "7777888899990000",
                 "expiration": "09/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Bowser Koopa",
                 "number": "8888999900001111",
                 "expiration": "10/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Bowser Koopa",
                 "number": "9999000011112222",
                 "expiration": "11/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     }

diff --git a/api/seed-data/users/users-stud.json b/api/seed-data/users/users-stud.json
@@ -16,21 +16,21 @@
                 "fullName": "Mario Rossi",
                 "number": "1111222233334444",
                 "expiration": "12/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Mario Rossi",
                 "number": "5555666677778888",
                 "expiration": "01/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Mario Rossi",
                 "number": "9999000011112222",
                 "expiration": "02/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -51,21 +51,21 @@
                 "fullName": "Luigi Verdi",
                 "number": "1111333355557777",
                 "expiration": "03/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Luigi Verdi",
                 "number": "2222444466668888",
                 "expiration": "04/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Luigi Verdi",
                 "number": "3333555577779999",
                 "expiration": "05/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -86,21 +86,21 @@
                 "fullName": "Peach Pink",
                 "number": "4444555566667777",
                 "expiration": "06/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Peach Pink",
                 "number": "5555666677778888",
                 "expiration": "07/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Peach Pink",
                 "number": "6666777788889999",
                 "expiration": "08/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -121,21 +121,21 @@
                 "fullName": "Yoshi Dino",
                 "number": "7777888899990000",
                 "expiration": "09/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Yoshi Dino",
                 "number": "8888999900001111",
                 "expiration": "10/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Yoshi Dino",
                 "number": "9999000011112222",
                 "expiration": "11/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     },
@@ -156,21 +156,21 @@
                 "fullName": "Toad Mushroom",
                 "number": "0000111122223333",
                 "expiration": "12/25",
-                "type": "Visa"
+                "type": "visa"
             },
             {
                 "name": "Credit Card 2",
                 "fullName": "Toad Mushroom",
                 "number": "1111222233334444",
                 "expiration": "01/26",
-                "type": "MasterCard"
+                "type": "mastercard"
             },
             {
                 "name": "Credit Card 3",
                 "fullName": "Toad Mushroom",
                 "number": "2222333344445555",
                 "expiration": "02/27",
-                "type": "American Express"
+                "type": "amex"
             }
         ]
     }