diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index b517eacd..84068821 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -1,36 +1,81 @@ -import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'; -import { Platform, Events, MenuController } from '@ionic/angular'; -import { StatusBar } from '@ionic-native/status-bar/ngx'; -import { TranslatorService } from './hmg-common/services/translator/translator.service'; -import { CommonService } from './hmg-common/services/common/common.service'; -import { AuthenticationService } from './hmg-common/services/authentication/authentication.service'; -import { AuthenticatedUser } from './hmg-common/services/authentication/models/authenticated-user'; -import { TabsBarComponent } from './hmg-common/ui/tabs-bar/tabs-bar.component'; -import { KeyboardService } from './hmg-common/services/keyboard/keyboard.service'; -import { Router, RouteConfigLoadStart, RouteConfigLoadEnd, NavigationStart, NavigationEnd, NavigationCancel } from '@angular/router'; -import { LazyLoadingService } from './hmg-common/services/lazy-loading/lazy-loading.service'; +import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core"; +import { Platform, Events, MenuController } from "@ionic/angular"; +import { TranslatorService } from "./hmg-common/services/translator/translator.service"; +import { CommonService } from "./hmg-common/services/common/common.service"; +import { AuthenticationService } from "./hmg-common/services/authentication/authentication.service"; +import { AuthenticatedUser } from "./hmg-common/services/authentication/models/authenticated-user"; +import { TabsBarComponent } from "./hmg-common/ui/tabs-bar/tabs-bar.component"; +import { KeyboardService } from "./hmg-common/services/keyboard/keyboard.service"; + +import { LazyLoadingService } from "./hmg-common/services/lazy-loading/lazy-loading.service"; @Component({ - selector: 'app-root', - styleUrls: ['./app.component.scss'], - templateUrl: 'app.component.html' + selector: "app-root", + styleUrls: ["./app.component.scss"], + templateUrl: "app.component.html" }) export class AppComponent implements OnInit, AfterViewInit { // rootPage:any = LoginPage; // @ViewChild(Nav) nav: Nav; - - menuList:any=[]; - User_name_Emp:string=""; - user_image:string=""; - menuSide:string="left"; - notBadge:number; - companyUrl:string="../assets/imgs/CS.png"; - companyDesc:string="Powered By Cloud Solutions"; - public direction = 'ltr'; - ngOnInit(){ - - } - ngAfterViewInit(){ - - } + start: any = false; + menuList: any = []; + User_name_Emp: string = ""; + user_image: string = ""; + menuSide: string = "left"; + notBadge: number; + companyUrl: string = "../assets/imgs/CS.png"; + companyDesc: string = "Powered By Cloud Solutions"; + public direction = "ltr"; + constructor( + public translatorService: TranslatorService, + private cs: CommonService, + private lazyLoadingService: LazyLoadingService, + private platform: Platform, + private events: Events, + private keyboardService: KeyboardService, + private menu: MenuController + ) {} + ngOnInit() { + this.initializeApp(); + } + ngAfterViewInit() {} + initializeApp() { + + this.start = false; + this.lazyLoadingService.monitorLazyLoading(15, true); + this.platform.ready().then(() => { + this.translatorService.loadResources(() => { + this.initializeDirection(); + // this.statusBar.styleDefault(); + this.start = true; + this.watchLanguageChangeEvents(); + // this.checkIfUserLoggedInBefore(); + this.keyboardService.watchKeyboard(); + }); + }); + } + private initializeDirection() { + this.direction = TranslatorService.getCurrentDirection(); + } + private watchUserLoginChangeEvents() { + this.events.subscribe( + AuthenticationService.LOGIN_EVENT, + (user: AuthenticatedUser, time: Date) => { + // if (user) { + // this.loggedInMainUser = user; + // this.loggedInUser = user; + // this.loadFamilyMembers(); + // } + } + ); + } + private watchLanguageChangeEvents() { + this.events.subscribe(TranslatorService.CHANGE_EVENT, () => { + this.start = false; + this.initializeDirection(); + setTimeout(() => { + this.start = true; + }, 100); + }); + } } diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 2ff2cd15..6ec76f1e 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -8,21 +8,21 @@ -

{{'login,title' | translate}}

+

{{ts.trPK('login','login')}}

- {{'login,userName' | translate}} + {{ts.trPK('login','username')}} - {{'login,password' | translate}} + {{ts.trPK('login','password')}} @@ -31,12 +31,12 @@ {{ts.trPK('login','signup')}}
- - + +
- + {{ts.trPK('login','login')}}

diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index d0b80bd5..77d290f7 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -1,77 +1,75 @@ +.signupDiv { + font-size: 14px; +} - .signupDiv{ - font-size: 14px; - } - .customGrid{ - margin-bottom: 20px; - } - ion-item.item.item-block.item-md.item-input, - ion-item.item.item-block.item-ios.item-input{ - padding: 0px; - margin-bottom: 10px; - } - ion-col.colPad.col { - padding-top: 20px; - } - ion-img{ - width: 170px; - height: 170px; - background:var(--light); +.customGrid { + margin-bottom: 20px; +} + +.pageTitle { + color: var(--dark); + font-size: 23px; + width: 100%; + text-align: center; + padding: 0px; + margin: 0px; +} + +.TxtPlace { + margin: 0; + padding: 40px 0 10px 0; + text-align: center; +} + +ion-item.item.item-block.item-md.item-input, +ion-item.item.item-block.item-ios.item-input { + padding: 0px; + margin-bottom: 10px; +} + +ion-col.colPad.col { + padding-top: 20px; +} + +ion-img { + width: 170px; + height: 170px; + background: var(--light); +} + +.gridDiv { + width: 100%; + height: 40px; + margin-top: 20px; + // margin-bottom: 10px; + font-size: 14px; + + :root[dir="ltr"] { + padding-left: 16px; + padding-right: 0; } - .gridDiv{ - width: 100%; - height: 40px; - margin-top: 20px; - // margin-bottom: 10px; - font-size: 14px; - // @include ltr(){ - // padding-left: 16px; - // padding-right: 0; - // } - // @include rtl(){ - // padding-right: 16px; - // padding-left: 0; - // // margin-bottom: 5px; - // } - button.gridBtn.button.button-md, button.gridBtn.button.button-ios, button.gridBtn.button.button{ - font-family: var(--fontFamilyLightEN) !important; - min-width: auto; - // @include ltr(){ - // float: left; - // border-radius: 2px 0px 0px 2px; - // font-family:$fontFamilyBoldEN !important; - // color:$customnavy; - // } - // @include rtl(){ - // float: right; - // border-radius: 0px 2px 2px 0px ; - // color:$darkgray; - // } - margin: 0px; - padding: 0px; - border: 1px solid var(--cusgray); - box-shadow: none; - -webkit-box-shadow:none; - -moz-box-shadow: none; - background: var(--light); - width: 50%; - } - button.arTxt.button.button-md, button.arTxt.button.button-ios, button.arTxt.button.button{ - // @include rtl(){ - // float: right; - // color:$customnavy !important; - // font-family:$fontFamilyIOSAR !important; - // font-weight: bold; - // border-radius: 2px 0px 0px 2px !important; - // } - // @include ltr(){ - // float: left; - // color:$darkgray !important; - // font-family: $fontFamilyIOSAR !important; - // border-radius: 0px 2px 2px 0px !important; - - // } - } + + :root[dir="rtl"] { + padding-right: 16px; + padding-left: 0; + // margin-bottom: 5px; } - + button.arTxt { + :root[dir="rtl"] { + float: right; + color: var(--customnavy) !important; + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + border-radius: 2px 0px 0px 2px !important; + } + + :root[dir="ltr"] { + float: left; + color: var(--darkgray) !important; + font-family: var(--fontFamilyIOSAR) !important; + border-radius: 0px 2px 2px 0px !important; + + } + } +} diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 73647d97..01f7659d 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -52,11 +52,15 @@ export class LoginComponent implements OnInit, OnDestroy { this.checkIfLoggedInBefore(); // this.splash.hide(); }, 100); + console.log(this.ts); } ngOnDestroy(): void { this.backClicked(); } + changeLanguage(){ + this.ts.switchLanguage(); + } private checkIfLoggedInBefore() { this.cs.startLoading(); // check if user logged in before diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 6853e73a..7859c184 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -9,6 +9,10 @@ "en": "Login", "ar": "الدخول" }, + "username":{ + "en":"Username", + "ar":"اسم المستخدم" + }, "login-type": { "en": "Login Type", "ar": "نوع الدخول"