Merge pull request #2 from UiPathSerban/stagging

Pour Stagging in Master

.github/workflows/stagging_uibank-frontend-updated(stagging).yml

@@ -0,0 +1,56 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Node.js app to Azure Web App - uibank-frontend-updated
+
+on:
+  push:
+    branches:
+      - stagging
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js version
+        uses: actions/setup-node@v1
+        with:
+          node-version: '18.x'
+
+      - name: npm install, build, and test
+        run: |
+          npm install
+          npm run build --if-present
+          npm run test --if-present
+      
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v2
+        with:
+          name: node-app
+          path: .
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'stagging'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: node-app
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        id: deploy-to-webapp
+        with:
+          app-name: 'uibank-frontend-updated'
+          slot-name: 'stagging'
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_B6E8FE4FA24D4FF48B8D7B7F34999B24 }}
+          package: .

angular.json

@@ -26,7 +26,7 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "src/favicon.ico",
+              "src/UiPathLogo.png",
               "src/assets"
             ],
             "styles": [
@@ -100,7 +100,7 @@
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "src/favicon.ico",
+              "src/UiPathLogo.png",
               "src/assets"
             ],
             "styles": [

src/app/Modules/loan-module/loan-application/loan-application.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { LoanService } from 'src/app/shared/services/loan.service';
 import { Loan } from 'src/app/shared/models/loan';
 import { NgForm } from '@angular/forms';
-import {Router} from '@angular/router'
+import { Router } from '@angular/router'
 import { Location } from '@angular/common'
 
 @Component({
@@ -33,7 +33,7 @@ export class LoanApplicationComponent implements OnInit {
     console.log(form.value);
     this.currentLoan = form.value;
     this.currentLoan.term = Number(this.currentLoan.term);
-    
+
     this.loanService.submitLoan(form.value).subscribe(reply => {
       this.response = reply;
       console.log(this.response.quoteid);
@@ -44,7 +44,7 @@ export class LoanApplicationComponent implements OnInit {
       }
 
       this.route.navigate(['loans/result', this.response.quoteid, this.response.rate, this.response.accepted]);
-      
+
 
     });
   }

src/app/Modules/register-module/register/register.component.html

@@ -87,7 +87,7 @@ <h1 class="text-center">Registration</h1>
                         </div>
                         <div class="row justify-content-center">
                             <div class="col-md-6 uipath-group">
-                                <label class="uibank-label" for="age">Age <span
+                                <label class="uibank-label" for="age">Date of birth <span
                                         class="text-gray">(MM/DD/YY)</span></label>
                                 <input type="text" class="form-control uibank-input" id="age"
                                     [(ngModel)]="this.newUser.age" name="age" aria-describedby="age"
@@ -126,7 +126,9 @@ <h1 class="text-center">Registration</h1>
                     <input [(ngModel)]="agreementCheckBox" class="form-check-input" type="checkbox" id="agreeCheckbox"
                         [ngModelOptions]="{standalone: true}" style="margin-right: 1rem;">
                     <label class="form-check-label text-center" for="agreeCheckbox">
-                        I confirm that I agree to the License Terms and Acceptable Use Policies
+                        I confirm that I agree to the <a style="color: white;"
+                            href="https://www.uipath.com/legal/privacy-policy">Privacy
+                            Policy</a>
                     </label>
                 </div>
                 <div class="row justify-content-center">

src/app/Modules/welcome-module/agreement-popup/agreement-popup.component.html

@@ -6,22 +6,22 @@
     </div>
     <div class="container">
         <p class="medium-text">UiBank is an application used only for demo purposes. It doesn't require real data,
-            except for the email address, which will be used for official communications and password recovery purposes.
+            except for the email address, which will be used for official communications and password recovery
+            purposes.<br>Please see here the full <a style="color: black;"
+                href="https://www.uipath.com/legal/privacy-policy">Privacy
+                Policy</a>
+
         </p>
-        <button class="btn center-button btn-black" [mat-dialog-close]="true">I agree to the License Terms and
-            Accetable Use
-            Policies <strong>&rarr;</strong></button>
-        <p class="small-text text-black">
+        <button class="btn center-button btn-black" [mat-dialog-close]="true">I agree to the Privacy Policy
+            <strong>&rarr;</strong></button>
+        <p class="small-text text-black" style="margin-bottom: 1rem;">
             If you want your data deleted at any time, please fill in this <a
-                href="https://www.uipath.com/legal/personal-data">
+                href="https://www.uipath.com/legal/trust-and-security/report/delete-account-data">
                 form
             </a>.
         </p>
-        <p class="small-text text-black" style="margin-bottom: 1rem;">
+        <!-- <p class="small-text text-black" style="margin-bottom: 1rem;">
             Contact <a href="mailto:info@example.com">info@example.com</a> for more informations.
-        </p>
+        </p> -->
     </div>
-</mat-dialog-content>
-<!-- <mat-dialog-actions>
-    <button mat-button mat-dialog-close>Close</button>
-</mat-dialog-actions> -->
+</mat-dialog-content>

src/app/shared/services/loan.service.ts

@@ -12,8 +12,8 @@ export class LoanService {
   currentAccounts: Observable<Account[]>;
   // loanURL: string = "https://uibank-api.azurewebsites.net/api";
   loanURL: string = environment.uiBankApiUrl;
-  quotesSuffix: string = "quotes/newquote";
-  getQuoteSuffix: string = "quotes/";
+  quotesSuffix: string = "/quotes/newquote";
+  getQuoteSuffix: string = "/quotes/";
   response: string;
 
   constructor(private http: HttpClient) {

src/environments/environment.development.ts

@@ -1,4 +1,5 @@
 export const environment = {
     production: false,
-    uiBankApiUrl: 'http://localhost:8080/api'
+    // uiBankApiUrl: 'http://localhost:8080/api'
+    uiBankApiUrl: 'https://uibank-api.azurewebsites.net/api'
 };

src/environments/environment.ts

@@ -1,4 +1,6 @@
 export const environment = {
     production: true,
-    uiBankApiUrl: 'http://localhost:8080/api'
+    // uiBankApiUrl: 'http://localhost:8080/api'
+    uiBankApiUrl: 'https://uibank-api.azurewebsites.net/api'
+
 };

src/index.html

@@ -1,16 +1,19 @@
 <!doctype html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
-  <title>UiBankUpdated</title>
+  <title>UiBank</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" sizes="16x16" href="UiPathLogo.png">
   <link rel="preconnect" href="https://fonts.gstatic.com">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>
+
 <body>
   <app-root></app-root>
 </body>
-</html>
+
+</html>