diff --git a/package-lock.json b/package-lock.json index 2db43d9..9e10434 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3738,7 +3738,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4153,7 +4154,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4209,6 +4211,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4252,12 +4255,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/app/checker/addforex/addforex.component.html b/src/app/checker/addforex/addforex.component.html index 9acde47..55b25de 100644 --- a/src/app/checker/addforex/addforex.component.html +++ b/src/app/checker/addforex/addforex.component.html @@ -8,6 +8,9 @@ <h4>Forex Delivery Service Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/addforex/addforex.component.scss b/src/app/checker/addforex/addforex.component.scss index e74cf94..2d10789 100644 --- a/src/app/checker/addforex/addforex.component.scss +++ b/src/app/checker/addforex/addforex.component.scss @@ -39,7 +39,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/addprovider/addprovider.component.html b/src/app/checker/addprovider/addprovider.component.html index 3b97673..37c21e5 100644 --- a/src/app/checker/addprovider/addprovider.component.html +++ b/src/app/checker/addprovider/addprovider.component.html @@ -8,6 +8,9 @@ <h4>Forex Delivery Service Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/currency-add/currency-add.component.html b/src/app/checker/currency-add/currency-add.component.html index df5b536..c26c574 100644 --- a/src/app/checker/currency-add/currency-add.component.html +++ b/src/app/checker/currency-add/currency-add.component.html @@ -8,6 +8,9 @@ <h4>Currency Management</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/currency-add/currency-add.component.scss b/src/app/checker/currency-add/currency-add.component.scss index e74cf94..2d10789 100644 --- a/src/app/checker/currency-add/currency-add.component.scss +++ b/src/app/checker/currency-add/currency-add.component.scss @@ -39,7 +39,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/currency-edit/currency-edit.component.html b/src/app/checker/currency-edit/currency-edit.component.html index c3904dd..e7d12c9 100644 --- a/src/app/checker/currency-edit/currency-edit.component.html +++ b/src/app/checker/currency-edit/currency-edit.component.html @@ -8,6 +8,9 @@ <h4>Currency Management</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/currency-edit/currency-edit.component.scss b/src/app/checker/currency-edit/currency-edit.component.scss index 0443ee6..440cea8 100644 --- a/src/app/checker/currency-edit/currency-edit.component.scss +++ b/src/app/checker/currency-edit/currency-edit.component.scss @@ -39,7 +39,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/currency-list/currency-list.component.html b/src/app/checker/currency-list/currency-list.component.html index 26ef662..77ad665 100644 --- a/src/app/checker/currency-list/currency-list.component.html +++ b/src/app/checker/currency-list/currency-list.component.html @@ -7,6 +7,9 @@ <h4>Manage Currency</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/currency-list/currency-list.component.scss b/src/app/checker/currency-list/currency-list.component.scss index a0bce48..752539b 100644 --- a/src/app/checker/currency-list/currency-list.component.scss +++ b/src/app/checker/currency-list/currency-list.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/editforex/editforex.component.html b/src/app/checker/editforex/editforex.component.html index 4a25f58..205a624 100644 --- a/src/app/checker/editforex/editforex.component.html +++ b/src/app/checker/editforex/editforex.component.html @@ -7,6 +7,9 @@ <h4>Forex Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/editforex/editforex.component.scss b/src/app/checker/editforex/editforex.component.scss index aaf0fd0..bf615c9 100644 --- a/src/app/checker/editforex/editforex.component.scss +++ b/src/app/checker/editforex/editforex.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/editprovider/editprovider.component.html b/src/app/checker/editprovider/editprovider.component.html index 44903ba..2b3e768 100644 --- a/src/app/checker/editprovider/editprovider.component.html +++ b/src/app/checker/editprovider/editprovider.component.html @@ -7,6 +7,9 @@ <h4>Forex Delivery Service Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/editprovider/editprovider.component.scss b/src/app/checker/editprovider/editprovider.component.scss index aaf0fd0..bf615c9 100644 --- a/src/app/checker/editprovider/editprovider.component.scss +++ b/src/app/checker/editprovider/editprovider.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/forexprovider/forexprovider.component.html b/src/app/checker/forexprovider/forexprovider.component.html index 22bb603..16b765f 100644 --- a/src/app/checker/forexprovider/forexprovider.component.html +++ b/src/app/checker/forexprovider/forexprovider.component.html @@ -7,6 +7,9 @@ <h4>Forex Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/checker/forexprovider/forexprovider.component.scss b/src/app/checker/forexprovider/forexprovider.component.scss index a0bce48..752539b 100644 --- a/src/app/checker/forexprovider/forexprovider.component.scss +++ b/src/app/checker/forexprovider/forexprovider.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/manageprovider/manageprovider.component.html b/src/app/checker/manageprovider/manageprovider.component.html index d159876..ddcfe0d 100644 --- a/src/app/checker/manageprovider/manageprovider.component.html +++ b/src/app/checker/manageprovider/manageprovider.component.html @@ -7,6 +7,12 @@ <h4>Forex Delivery Service Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="goToPage('checker/home')"> + <img src="assets/images/asset_home.png"> + Home</button> + <button class="logout" (click)="logout()"> + <img src="assets/images/asset_logout.png"> + Logout</button> <img src="assets/images/asset_logo1.png"> <span (click)="goToPage('checker/changepin')">Change PIN</span> </div> diff --git a/src/app/checker/manageprovider/manageprovider.component.scss b/src/app/checker/manageprovider/manageprovider.component.scss index a0bce48..752539b 100644 --- a/src/app/checker/manageprovider/manageprovider.component.scss +++ b/src/app/checker/manageprovider/manageprovider.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/checker/manageprovider/manageprovider.component.ts b/src/app/checker/manageprovider/manageprovider.component.ts index bdcc691..55cef1a 100644 --- a/src/app/checker/manageprovider/manageprovider.component.ts +++ b/src/app/checker/manageprovider/manageprovider.component.ts @@ -96,4 +96,8 @@ export class ManageproviderComponent implements OnInit { this.router.navigate(['checker/delivery_edit/' + id]); } + logout() { + this.service.logout(); + } + } diff --git a/src/app/delivery/add-driver/add-driver.component.scss b/src/app/delivery/add-driver/add-driver.component.scss index e74cf94..2d10789 100644 --- a/src/app/delivery/add-driver/add-driver.component.scss +++ b/src/app/delivery/add-driver/add-driver.component.scss @@ -39,7 +39,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/delivery/edit-driver/edit-driver.component.scss b/src/app/delivery/edit-driver/edit-driver.component.scss index aaf0fd0..bf615c9 100644 --- a/src/app/delivery/edit-driver/edit-driver.component.scss +++ b/src/app/delivery/edit-driver/edit-driver.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/delivery/editprovider/editprovider.component.html b/src/app/delivery/editprovider/editprovider.component.html index f59bfb5..f92fabe 100644 --- a/src/app/delivery/editprovider/editprovider.component.html +++ b/src/app/delivery/editprovider/editprovider.component.html @@ -7,6 +7,7 @@ <h4>Forex Delivery Service Provider</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/delivery/editprovider/editprovider.component.scss b/src/app/delivery/editprovider/editprovider.component.scss index f3d7baf..d11bde2 100644 --- a/src/app/delivery/editprovider/editprovider.component.scss +++ b/src/app/delivery/editprovider/editprovider.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/delivery/list-driver/list-driver.component.html b/src/app/delivery/list-driver/list-driver.component.html index b9213ec..510323d 100644 --- a/src/app/delivery/list-driver/list-driver.component.html +++ b/src/app/delivery/list-driver/list-driver.component.html @@ -7,6 +7,7 @@ <h4>Driver Management</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/delivery/list-driver/list-driver.component.scss b/src/app/delivery/list-driver/list-driver.component.scss index a0bce48..752539b 100644 --- a/src/app/delivery/list-driver/list-driver.component.scss +++ b/src/app/delivery/list-driver/list-driver.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/delivery/transaction/transaction.component.scss b/src/app/delivery/transaction/transaction.component.scss index a0bce48..752539b 100644 --- a/src/app/delivery/transaction/transaction.component.scss +++ b/src/app/delivery/transaction/transaction.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/forex/currency/currency.component.html b/src/app/forex/currency/currency.component.html index a2acf02..bd36719 100644 --- a/src/app/forex/currency/currency.component.html +++ b/src/app/forex/currency/currency.component.html @@ -7,6 +7,7 @@ <h4>Forex Currency Rate</h4> </div> <div class="col-md-6 textRight relative"> + <button class="logout" (click)="logout()"> <img src="assets/images/asset_logout.png"> Logout</button> diff --git a/src/app/forex/editprovider/editprovider.component.scss b/src/app/forex/editprovider/editprovider.component.scss index f3d7baf..d11bde2 100644 --- a/src/app/forex/editprovider/editprovider.component.scss +++ b/src/app/forex/editprovider/editprovider.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/app/forex/transaction/transaction.component.scss b/src/app/forex/transaction/transaction.component.scss index a0bce48..752539b 100644 --- a/src/app/forex/transaction/transaction.component.scss +++ b/src/app/forex/transaction/transaction.component.scss @@ -40,7 +40,7 @@ padding-left: 20px; padding-right: 20px; .row{ - padding-bottom: 40px; + padding-bottom: 30px; .provider_data_content{ width:90%; margin:0 auto; diff --git a/src/assets/images/asset_home.png b/src/assets/images/asset_home.png new file mode 100644 index 0000000..7f45ab8 Binary files /dev/null and b/src/assets/images/asset_home.png differ diff --git a/src/styles.scss b/src/styles.scss index 74ac142..abefc00 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -48,6 +48,12 @@ a { text-decoration: none !important; } +input[type=number]::-webkit-inner-spin-button, +input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none !important; + margin: 0; +} + html, body { font-family: 'Lato', sans-serif !important; @@ -653,6 +659,8 @@ section.module.parallax { img{ width: 24px; margin-right: 5px; + position: relative; + bottom: 2px; } }