Merge branch 'main' of https://github.com/EsraDoerksen/All-In-Banking

EsraDoerksen · Oct 29, 2023 · 0d31891 · 0d31891
2 parents 5bad730 + 4c14d0a
commit 0d31891
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/bank-advisor/src/app/components/big-expenses/big-expenses.component.html b/bank-advisor/src/app/components/big-expenses/big-expenses.component.html
@@ -1,8 +1,8 @@
 <div class="margin-x mt-3">
   <h1 class="display-5">Big expenses</h1>
   <p>
-    Those are the transactions, which have a big spending amount. You should
-    analyze what you are spending your money on.
+    Those are the transactions, which have a big spending amount. Let's have a
+    look at your big transactions:
   </p>
 
   <ul *ngFor="let bigTransaction of bigTransactions" class="list-group">
@@ -39,8 +39,8 @@ <h5 class="card-title">{{ bigTransaction.description }}</h5>
         <div class="card-body">
           <h5 class="card-title">Big saving potential</h5>
           <p class="card-text">
-            We can see, that you bought a lot of electronics in the past! There
-            are other options. Secondary buys and toppreise.ch
+            We can see, that you bought a lot of electronics in the past! You
+            can save a lot of money through secondary buys and toppreise.ch
           </p>
         </div>
       </div>

diff --git a/bank-advisor/src/app/components/contract-expenses/contract-expenses.component.html b/bank-advisor/src/app/components/contract-expenses/contract-expenses.component.html
@@ -1,8 +1,8 @@
 <div class="margin-x mt-3">
   <h1 class="display-5">Contract expenses</h1>
   <p>
-    Those are the transactions, which are bound to a contract. Are those
-    contract really the best.
+    Those are the transactions, which are bound to a contract. Let's have a look
+    at your contracts:
   </p>
 
   <ul *ngFor="let transaction of this.contractTransactions" class="list-group">
@@ -38,8 +38,8 @@ <h5 class="card-title">{{ transaction.description }}</h5>
         <div class="card-body">
           <h5 class="card-title">Big saving potential</h5>
           <p class="card-text">
-            We can see, that you bought a lot of electronics in the past! There
-            are other options. Secondary buys and toppreise.ch
+            We can see, that you purchased multiple contracts in the past! You
+            can save a lot of money through comparis.ch
           </p>
         </div>
       </div>

diff --git a/bank-advisor/src/app/components/regular-expenses/regular-expenses.component.html b/bank-advisor/src/app/components/regular-expenses/regular-expenses.component.html
@@ -1,8 +1,8 @@
 <div class="margin-x mt-3">
   <h1 class="display-5">Regular expenses</h1>
   <p>
-    Those are the transactions, which are regulary executed. You should ask
-    yoursef the question if that's really neccessary.
+    Those are the transactions, which are regulary executed. Let's have a look
+    at your regular transactions:
   </p>
 
   <ul *ngFor="let transaction of this.regularTransactions" class="list-group">
@@ -38,8 +38,8 @@ <h5 class="card-title">{{ transaction.description }}</h5>
         <div class="card-body">
           <h5 class="card-title">Big saving potential</h5>
           <p class="card-text">
-            We can see, that you bought a lot of electronics in the past! There
-            are other options. Secondary buys and toppreise.ch
+            We can see, that you bought a lot of electronics in the past! You
+            can save a lot of money through secondary buys and toppreise.ch
           </p>
         </div>
       </div>

diff --git a/bank/backend/src/app.service.ts b/bank/backend/src/app.service.ts
@@ -30,6 +30,7 @@ export class AppService {
     const response = await firstValueFrom(
       this.httpService.get(`${this.configService.devPortalRootUrl}/apps`),
     );
+    console.log(response.data);
     return response.data;
   }
 }
diff --git a/dev-portal/backend/public/index.html b/dev-portal/backend/public/index.html
@@ -14,6 +14,7 @@
         const appId = urlParams.get('appId');
         window.sessionStorage.setItem('appId', appId);
         window.location.href = `https://dev-o8lopd1x78xgb35o.us.auth0.com/authorize?client_id=${clientId}&redirect_uri=http%3A%2F%2Flocalhost%3A3001&response_type=code&scope=openid%20profile%20email%20offline_access`;
+        return;
       }
 
       const data = new URLSearchParams();

diff --git a/dev-portal/backend/src/app.service.ts b/dev-portal/backend/src/app.service.ts
@@ -17,7 +17,7 @@ export class AppService {
     const apps = await this.appRepository.find();
     return apps.map((app) => ({
       ...app,
-      url: `http://localhost:3001?${app.appId}`,
+      url: `http://localhost:3001?appId=${app.appId}`,
     }));
   }