diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3dc2055df766..4892732bab81 100755 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1080,23 +1080,11 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy { ngAfterViewInit() { this.runOnRouteChange(); - // this.setPrechatFormInWidgetSettings(); - const elemFooter = document.querySelector('footer'); - // const eleWidget = document.querySelector('#tiledesk-container'); - // this.logger.log('APP.COMP - elem FOOTER ', elemFooter); - // setTimeout(() => { - // this.logger.log('[APP-COMPONENT] window', window) - // var tiledeskiframe = document.getElementById('tiledeskiframe') as HTMLIFrameElement; - // this.logger.log('[APP-COMPONENT] tiledeskiframe', tiledeskiframe) - // if (tiledeskiframe) { - // if (window && window['tiledesk'] && window['tiledesk']['angularcomponent']) { - // window['tiledesk'].angularcomponent.component.g.preChatForm = false - // } - // } - // }, 3000); - - + this.hideFooter(); + } + hideFooter() { + const elemFooter = document.querySelector('footer'); /* HIDE FOOTER IF IS LOGIN PAGE - SIGNUP PAGE */ this.router.events.subscribe((val) => { if (this.location.path() !== '') { @@ -1140,31 +1128,19 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy { elemFooter.setAttribute('style', ''); } - // WIDGET HIDDEN IF THE ROUTE IS request-for-panel - // if (this.route.indexOf('/request-for-panel') !== -1) { - - // if (eleWidget) { - // eleWidget.style.display = 'none'; - // } else { - // this.logger.log('APP.COMP - elem WIDGET ', eleWidget) - // } - // } - } else { // this.logger.log('»> * ', this.route) } }); const elemAppFooter = document.querySelector('app-footer'); + this.router.events.subscribe((val) => { if (this.location.path() !== '') { this.route = this.location.path(); // this.logger.log('»> ', this.route) if (this.route.indexOf('/verify') !== -1) { - elemAppFooter.setAttribute('style', 'display:none;'); - // this.logger.log('DETECT LOGIN PAGE') - // tslint:disable-next-line:max-line-length } else { elemAppFooter.setAttribute('style', ''); @@ -1174,36 +1150,35 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy { // this.logger.log('»> * ', this.route) } }); - } - // setPrechatFormInWidgetSettings() { - // this.router.events.subscribe((val) => { - // if (this.location.path() !== '') { - // this.route = this.location.path(); - // // this.logger.log('»> ', this.route) - // // tslint:disable-next-line:max-line-length - // if ((this.route === '/login') || (this.route === '/signup') || (this.route === '/forgotpsw') || (this.route.indexOf('/signup-on-invitation') !== -1)) { + setPrechatFormInWidgetSettings() { + this.router.events.subscribe((val) => { + if (this.location.path() !== '') { + this.route = this.location.path(); + // this.logger.log('»> ', this.route) + // tslint:disable-next-line:max-line-length + if ((this.route === '/login') || (this.route === '/signup') || (this.route === '/forgotpsw') || (this.route.indexOf('/signup-on-invitation') !== -1)) { - // this.isPageWithNav = false; + this.isPageWithNav = false; - // if (window && window['tiledeskSettings']) { - // window['tiledeskSettings']['preChatForm'] = true - // } - // } else { + if (window && window['tiledeskSettings']) { + window['tiledeskSettings']['preChatForm'] = true + } + } else { - // this.isPageWithNav = true; - // if (window && window['tiledeskSettings']) { - // if (window['tiledeskSettings']['preChatForm']) { - // delete window['tiledeskSettings']['preChatForm']; - // } - // } - // } - // // this.logger.log('APP.COMP currentUrl ', this.route, 'tiledeskSettings ', window['tiledeskSettings']); - // } - // }); - // } + this.isPageWithNav = true; + if (window && window['tiledeskSettings']) { + if (window['tiledeskSettings']['preChatForm']) { + delete window['tiledeskSettings']['preChatForm']; + } + } + } + // this.logger.log('APP.COMP currentUrl ', this.route, 'tiledeskSettings ', window['tiledeskSettings']); + } + }); + } isMaps(path) { var titlee = this.location.prepareExternalUrl(this.location.path()); diff --git a/src/app/auth/signin/signin.component.html b/src/app/auth/signin/signin.component.html index c82ed5b90aaa..0a08e29eefa7 100755 --- a/src/app/auth/signin/signin.component.html +++ b/src/app/auth/signin/signin.component.html @@ -156,10 +156,17 @@

-
+ +
--> + + + - - - -
+
+ + + diff --git a/src/app/auth/signin/signin.component.scss b/src/app/auth/signin/signin.component.scss index 3b89a6edd3ae..4cf2fadd6668 100755 --- a/src/app/auth/signin/signin.component.scss +++ b/src/app/auth/signin/signin.component.scss @@ -94,12 +94,13 @@ height: 56px; font-size: 16px; letter-spacing: 2px; + border-radius: var(--btn-border-radius); } .login-container { // padding: 30px; max-width: 400px; - // min-width: 400px; + min-width: 400px; width: 100% !important; // margin: 0 auto; } @@ -163,22 +164,35 @@ input:-webkit-autofill { .left-panel-signup-link { margin-top: 15px; line-height: 21px; - font-family: Poppins, Roboto, Arial, sans-serif; + font-family: var(--header-font-family); text-align: left !important; color: #222; font-weight: 400; font-size: 15px; } +.left-panel-signup-link > span { + color: var(--blue-20); + cursor: pointer; +} + .signin-forgot-pswrd { - // text-align: center; - margin-top: 15px; - line-height: 21px; - font-family: Poppins, Roboto, Arial, sans-serif; + // margin-top: 15px; + // line-height: 21px; + // font-size: 15px; + margin-top: 0px; + line-height: 10px; + font-size: 12px; + font-family: var(--header-font-family); text-align: left !important; color: #222; font-weight: 400; - font-size: 15px; + margin-bottom: 18px; +} + +.signin-forgot-pswrd > span { + color: var(--blue-20); + cursor:pointer } label { @@ -208,17 +222,15 @@ label { } .left { - width: 40%; + // width: 40%; + width: 0px; left: 0; - // background-color: $brand-secodary; - // color: #f0806f; - // background-color: rgb(15, 23, 42); // old background-color: #d3e3ee; //new - // background-image: url(https://tiledesk.com/wp-content/uploads/2023/01/background_chatboat_design.jpg?id=10568welcome-text); } .right { - width: 60%; + // width: 60%; + width: 100%; right: 0; background-color: #fff; } @@ -299,9 +311,9 @@ label { display: none; } - .left-panel-signup-link { - display: none; - } + // .left-panel-signup-link { + // display: none; + // } .left-panel-gotov1-link { display: none; diff --git a/src/app/auth/signup/signup.component.html b/src/app/auth/signup/signup.component.html index 28bd0eb15921..a42023a633b1 100644 --- a/src/app/auth/signup/signup.component.html +++ b/src/app/auth/signup/signup.component.html @@ -375,16 +375,16 @@