Skip to content

F
ForexWeb
Commit 17e36f87 by amal
Options

Merge branch 'amal' into 'master'

Amal 30-03-2019|13:18 See merge request !11
parents f8e31d4e 64ffe8b4
Showing with 73 additions and 13 deletions
package-lock.json
......@@ -3775,12 +3775,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3795,17 +3797,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -3922,7 +3927,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3934,6 +3940,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3948,6 +3955,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3955,12 +3963,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -3979,6 +3989,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -4059,7 +4070,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -4071,6 +4083,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -4192,6 +4205,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......
src/app/start/forgot/forgot.component.html
......@@ -13,10 +13,17 @@
<div class="login_row">
<input class="" placeholder=" {{'forgot.Email Address' | translate}}">
</div>
<div class="login_row">
<button class="login_btn" (click)="goToPage('start/newpin')">{{'forgot.SEND ME THE LINK' | translate}}</button>
</div>
</div>
<div class="login_btn_bay">
<div class="row">
<div class="col-md-6">
<button class="cancel_btn" (click)="goToPage('start/forgot')">{{'forgot.VERIFY OTP' | translate}}</button>
</div>
<div class="col-md-6">
<button class="login_btn" (click)="goToPage('start/newpin')">{{'forgot.SEND ME THE LINK' | translate}}</button>
</div>
</div>
</div>
</div>
</div>
</div>
......
src/app/start/forgot/forgot.component.scss
......@@ -91,4 +91,38 @@
}
}
}
.login_btn_bay{
width: 65%;
margin: 0 auto;
padding-top:5%;
.login_btn{
background: #cd3d3d;
color: #fff;
border-radius:10px;
height:40px;
border:none;
width: 100%;
&:hover{
outline: none;
}
&:focus{
outline:none;
}
}
.cancel_btn{
background: #1a5c7c;
color: #fff;
border-radius:10px;
height:40px;
border:none;
width: 100%;
&:hover{
outline: none;
}
&:focus{
outline:none;
}
}
}
}
\ No newline at end of file
src/app/start/login/login.component.html
......@@ -34,7 +34,9 @@
<div class="s_validation">{{error_msg.password}} </div>
</div>
</div>
<div *ngIf="loginError" class="s_validation">{{loginMsg}}</div>
<div *ngIf="loginError" class="alert alert-danger" role="alert">
{{loginMsg}}
</div>
<div class="login_row">
<button class="login_btn" (click)="loginClick()">{{'login.Login' | translate}}</button>
</div>
......
src/assets/i18n/ar.json
......@@ -9,7 +9,8 @@
"forgot":{
"Forgot your PIN": "Forgot your PIN",
"Email Address": "Email Address",
"SEND ME THE LINK": "SEND ME THE LINK"
"SEND ME THE LINK": "SEND ME THE LINK",
"VERIFY OTP":"VERIFY OTP"
},
"invalid":{
"Access Denied": "Access Denied",
......
src/assets/i18n/en.json
......@@ -9,7 +9,8 @@
"forgot":{
"Forgot your PIN": "Forgot your PIN",
"Email Address": "Email Address",
"SEND ME THE LINK": "SEND ME THE LINK"
"SEND ME THE LINK": "SEND ME THE LINK",
"VERIFY OTP":"VERIFY OTP"
},
"invalid":{
"Access Denied": "Access Denied",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment