From abb18f732102a64b746356f16dc1691c5c362d9b Mon Sep 17 00:00:00 2001 From: sajan Date: Tue, 22 Aug 2023 14:46:52 +0530 Subject: [PATCH] new modifications --- .../_interceptors/auth-header.interceptor.ts | 32 +- src/app/_dto/common.dto.ts | 5 + .../auth/register/register.component.html | 12 +- .../_modules/auth/view/view.component.html | 6 +- src/app/_modules/auth/view/view.component.ts | 9 + .../auth/website/website.component.html | 36 +- .../auth/website/website.component.ts | 16 +- .../dashboard/dashboard.component.html | 612 ++++++++++++------ .../dashboard/dashboard.component.scss | 235 ++++++- .../_modules/dashboard/dashboard.component.ts | 256 +++++++- .../home-view/home-view.component.html | 137 +++- .../home-view/home-view.component.scss | 161 ++++- .../home-view/home-view.component.ts | 273 +++++++- .../payment-details.component.html | 2 +- .../payment-details.component.ts | 27 +- .../qr-payment/qr-payment.component.html | 148 ++++- .../qr-payment/qr-payment.component.scss | 160 ++++- .../qr-payment/qr-payment.component.ts | 24 +- .../bid-final-report.component.html | 113 +++- .../bid-final-report.component.scss | 103 +++ .../bid-final-report.component.ts | 210 +++++- .../_resources/api-url.properties.ts | 6 +- src/assets/css/style.css | 8 +- src/assets/i18n/error/en.json | 10 +- src/assets/i18n/languages/en-sales.json | 4 + 25 files changed, 2308 insertions(+), 297 deletions(-) create mode 100644 src/app/_dto/common.dto.ts diff --git a/src/app/_core/_interceptors/auth-header.interceptor.ts b/src/app/_core/_interceptors/auth-header.interceptor.ts index e4e9e87..ec3ce4c 100644 --- a/src/app/_core/_interceptors/auth-header.interceptor.ts +++ b/src/app/_core/_interceptors/auth-header.interceptor.ts @@ -23,7 +23,7 @@ export class AuthHeaderInterceptor implements HttpInterceptor { intercept(request: HttpRequest, next: HttpHandler) { if (request.url.includes('auth')) - return next.handle(this.addAuthKey(request)) + return next.handle(this.addAuthenticationToken(request)) if (request.url.startsWith('assets/') && request.url.endsWith('.json')) return next.handle(request) @@ -49,20 +49,22 @@ export class AuthHeaderInterceptor implements HttpInterceptor { })); } - private addAuthKey(request: HttpRequest): HttpRequest{ - // If we do not have a token yet then we should not set the header. - // Here we could first retrieve the token from where we store it. - let authKey = localStorage.getItem("authKey"); - // authKey = this.crypto.decrypt(authKey); - if (!authKey) { - return request; - } - return request.clone({ - setHeaders: { - 'authkey': `${authKey}`, - }, - }); - } + // private addAuthKey(request: HttpRequest): HttpRequest{ + // // If we do not have a token yet then we should not set the header. + // // Here we could first retrieve the token from where we store it. + // let authKey = localStorage.getItem("authtoken"); + // console.log(authKey); + + // authKey = this.crypto.decrypt(authKey); + // if (!authKey) { + // return request; + // } + // return request.clone({ + // setHeaders: { + // 'authkey': `${authKey}`, + // }, + // }); + // } private addAuthenticationToken(request: HttpRequest, hasRefreshToken?: boolean): HttpRequest { // If we do not have a token yet then we should not set the header. diff --git a/src/app/_dto/common.dto.ts b/src/app/_dto/common.dto.ts new file mode 100644 index 0000000..15f4402 --- /dev/null +++ b/src/app/_dto/common.dto.ts @@ -0,0 +1,5 @@ +export class CommonDto { + id?:any; + + marquee?:any; +} \ No newline at end of file diff --git a/src/app/_modules/auth/register/register.component.html b/src/app/_modules/auth/register/register.component.html index 6d35ffd..85ba183 100644 --- a/src/app/_modules/auth/register/register.component.html +++ b/src/app/_modules/auth/register/register.component.html @@ -82,16 +82,12 @@ {{ 'enterOtp' | translate }} - - info_outline - + - +
+ {{ 'Please check both inbox and spam folder for OTP.' | translate }}

+

diff --git a/src/app/_modules/auth/view/view.component.html b/src/app/_modules/auth/view/view.component.html index a0bb948..1b142d2 100644 --- a/src/app/_modules/auth/view/view.component.html +++ b/src/app/_modules/auth/view/view.component.html @@ -46,7 +46,7 @@
-   +  
@@ -359,7 +359,7 @@ - +

Documents can Only be download between {{tenderData.saleStartDate | date: 'MMM d, y, h:mm:ss a'}} and {{tenderData.saleEndDate| date: 'MMM d, y, h:mm:ss a'}}

@@ -376,7 +376,7 @@ Drawings - +

Documents can Only be download between {{tenderData.saleStartDate | date: 'MMM d, y, h:mm:ss a'}} and {{tenderData.saleEndDate| date: 'MMM d, y, h:mm:ss a'}}

diff --git a/src/app/_modules/auth/view/view.component.ts b/src/app/_modules/auth/view/view.component.ts index 671230d..b2e698d 100644 --- a/src/app/_modules/auth/view/view.component.ts +++ b/src/app/_modules/auth/view/view.component.ts @@ -23,6 +23,8 @@ export class ViewComponent implements OnInit { OnlinePayment: boolean; currentDate = new Date(); showDownloadButton: boolean; + activeYn: string; + CancelTenderButtons: boolean; @@ -50,12 +52,19 @@ getData(){ // console.log("tenderData",res); this.tenderData = res this.tenderDocuments = this.tenderData['tenderDoc'] + this.activeYn = this.tenderData['activeYn']; if(this.tenderData.paymentModeD.paymentMode == 'Online'){ this.OnlinePayment = true }else { this.OnlinePayment = false; } + if(this.activeYn == 'N'){ + this.CancelTenderButtons = true + }else if(this.activeYn == 'Y'){ + this.CancelTenderButtons = false + } + const saleStartDate = new Date(this.tenderData.saleStartDate); diff --git a/src/app/_modules/auth/website/website.component.html b/src/app/_modules/auth/website/website.component.html index 1dc07e3..58e1771 100644 --- a/src/app/_modules/auth/website/website.component.html +++ b/src/app/_modules/auth/website/website.component.html @@ -29,18 +29,18 @@ -