skeleton updated

production
Sultan Khan 7 years ago
parent c5bd2b5693
commit 9266affe07

@ -1,36 +1,81 @@
import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core'; import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core";
import { Platform, Events, MenuController } from '@ionic/angular'; 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 { TranslatorService } from './hmg-common/services/translator/translator.service'; import { CommonService } from "./hmg-common/services/common/common.service";
import { CommonService } from './hmg-common/services/common/common.service'; import { AuthenticationService } from "./hmg-common/services/authentication/authentication.service";
import { AuthenticationService } from './hmg-common/services/authentication/authentication.service'; import { AuthenticatedUser } from "./hmg-common/services/authentication/models/authenticated-user";
import { AuthenticatedUser } from './hmg-common/services/authentication/models/authenticated-user'; import { TabsBarComponent } from "./hmg-common/ui/tabs-bar/tabs-bar.component";
import { TabsBarComponent } from './hmg-common/ui/tabs-bar/tabs-bar.component'; import { KeyboardService } from "./hmg-common/services/keyboard/keyboard.service";
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 { LazyLoadingService } from './hmg-common/services/lazy-loading/lazy-loading.service';
@Component({ @Component({
selector: 'app-root', selector: "app-root",
styleUrls: ['./app.component.scss'], styleUrls: ["./app.component.scss"],
templateUrl: 'app.component.html' templateUrl: "app.component.html"
}) })
export class AppComponent implements OnInit, AfterViewInit { export class AppComponent implements OnInit, AfterViewInit {
// rootPage:any = LoginPage; // rootPage:any = LoginPage;
// @ViewChild(Nav) nav: Nav; // @ViewChild(Nav) nav: Nav;
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() {
menuList:any=[]; this.start = false;
User_name_Emp:string=""; this.lazyLoadingService.monitorLazyLoading(15, true);
user_image:string=""; this.platform.ready().then(() => {
menuSide:string="left"; this.translatorService.loadResources(() => {
notBadge:number; this.initializeDirection();
companyUrl:string="../assets/imgs/CS.png"; // this.statusBar.styleDefault();
companyDesc:string="Powered By Cloud Solutions"; this.start = true;
public direction = 'ltr'; this.watchLanguageChangeEvents();
ngOnInit(){ // this.checkIfUserLoggedInBefore();
this.keyboardService.watchKeyboard();
} });
ngAfterViewInit(){ });
}
} 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);
});
}
} }

@ -8,21 +8,21 @@
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col> <ion-col>
<P class="pageTitle text-caps">{{'login,title' | translate}}</P> <P class="pageTitle text-caps">{{ts.trPK('login','login')}}</P>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
<ion-item> <ion-item>
<img class="item-icon" src="assets/imgs/username.png" item-start /> <img class="item-icon" src="assets/imgs/username.png" item-start />
<ion-label>{{'login,userName' | translate}}</ion-label> <ion-label>{{ts.trPK('login','username')}}</ion-label>
<ion-input required type="text" [(ngModel)]="memberLogin.P_USER_NAME"> <ion-input required type="text" [(ngModel)]="memberLogin.P_USER_NAME">
</ion-input> </ion-input>
</ion-item> </ion-item>
<ion-item> <ion-item>
<img class="item-icon" src="assets/imgs/password.png" item-start /> <img class="item-icon" src="assets/imgs/password.png" item-start />
<ion-label>{{'login,password' | translate}}</ion-label> <ion-label>{{ts.trPK('login','password')}}</ion-label>
<ion-input required type="password" [(ngModel)]="memberLogin.P_PASSWORD"> <ion-input required type="password" [(ngModel)]="memberLogin.P_PASSWORD">
</ion-input> </ion-input>
</ion-item> </ion-item>
@ -31,12 +31,12 @@
<a (click)="signUp()">{{ts.trPK('login','signup')}}</a> <a (click)="signUp()">{{ts.trPK('login','signup')}}</a>
</div> </div>
<div class="gridDiv"> <div class="gridDiv">
<button class="gridBtn" ion-button (click)="changeLanguage(2)">English</button> <button class="gridBtn" ion-button (click)="changeLanguage()">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage(1)">عربي</button> <button class="gridBtn arTxt" ion-button (click)="changeLanguage()">عربي</button>
</div> </div>
<ion-footer> <ion-footer>
<div class="centerDiv"> <div class="centerDiv">
<button ion-button (click)="http_call()">{{ts.trPK('login','login')}}</button> <ion-button (click)="http_call()">{{ts.trPK('login','login')}}</ion-button>
</div> </div>
<br/> <br/>
<div class="centerDiv"> <div class="centerDiv">

@ -1,77 +1,75 @@
.signupDiv {
font-size: 14px;
}
.signupDiv{ .customGrid {
font-size: 14px; margin-bottom: 20px;
} }
.customGrid{
margin-bottom: 20px; .pageTitle {
} color: var(--dark);
ion-item.item.item-block.item-md.item-input, font-size: 23px;
ion-item.item.item-block.item-ios.item-input{ width: 100%;
padding: 0px; text-align: center;
margin-bottom: 10px; padding: 0px;
} margin: 0px;
ion-col.colPad.col { }
padding-top: 20px;
} .TxtPlace {
ion-img{ margin: 0;
width: 170px; padding: 40px 0 10px 0;
height: 170px; text-align: center;
background:var(--light); }
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;
}
}
}

@ -52,11 +52,15 @@ export class LoginComponent implements OnInit, OnDestroy {
this.checkIfLoggedInBefore(); this.checkIfLoggedInBefore();
// this.splash.hide(); // this.splash.hide();
}, 100); }, 100);
console.log(this.ts);
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.backClicked(); this.backClicked();
} }
changeLanguage(){
this.ts.switchLanguage();
}
private checkIfLoggedInBefore() { private checkIfLoggedInBefore() {
this.cs.startLoading(); this.cs.startLoading();
// check if user logged in before // check if user logged in before

@ -9,6 +9,10 @@
"en": "Login", "en": "Login",
"ar": "الدخول" "ar": "الدخول"
}, },
"username":{
"en":"Username",
"ar":"اسم المستخدم"
},
"login-type": { "login-type": {
"en": "Login Type", "en": "Login Type",
"ar": "نوع الدخول" "ar": "نوع الدخول"

Loading…
Cancel
Save