diff --git a/package-lock.json b/package-lock.json
index 6c58fc4..5054346 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -192,9 +192,9 @@
}
},
"@angular/animations": {
- "version": "8.2.2",
- "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.2.tgz",
- "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==",
+ "version": "8.2.11",
+ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.11.tgz",
+ "integrity": "sha512-u0PSR2uvSqn3ovgGlw2H8ZueyYN42SLir2Yn3+7sGE+LcYOSTjyJ/GIgjV8jWddvPbx7KYzFRCs6bEMpBsMXYg==",
"requires": {
"tslib": "^1.9.0"
}
@@ -394,8 +394,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -416,14 +415,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -438,20 +435,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -581,7 +575,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -596,7 +589,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -604,14 +596,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -630,7 +620,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -711,8 +700,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -724,7 +712,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -810,8 +797,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -847,7 +833,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -867,7 +852,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -911,14 +895,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -6795,8 +6777,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -6839,8 +6820,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -6851,8 +6831,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -6969,8 +6948,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -6982,7 +6960,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -7012,7 +6989,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -7031,7 +7007,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -7125,7 +7100,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -7211,8 +7185,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -7248,7 +7221,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -7268,7 +7240,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -7312,14 +7283,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -12054,8 +12023,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -12155,14 +12123,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -12468,8 +12434,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -12497,7 +12462,6 @@
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -12512,8 +12476,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -12524,8 +12487,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -12642,8 +12604,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -12655,7 +12616,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -12670,7 +12630,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -12678,14 +12637,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -12704,7 +12661,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -12785,8 +12741,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -12798,7 +12753,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -12884,8 +12838,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -12921,7 +12874,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -12941,7 +12893,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -12985,14 +12936,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
diff --git a/package.json b/package.json
index 273ca1e..c70e9e8 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"private": true,
"dependencies": {
"@agm/core": "^1.0.0-beta.7",
- "@angular/animations": "^8.2.2",
+ "@angular/animations": "^8.2.11",
"@angular/common": "~8.1.2",
"@angular/compiler": "~8.1.2",
"@angular/core": "~8.1.2",
@@ -99,4 +99,4 @@
"android"
]
}
-}
\ No newline at end of file
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7a1c658..99271ad 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -9,8 +9,6 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { IonicStorageModule } from '@ionic/storage';
import { GooglePlus } from '@ionic-native/google-plus/ngx';
-
-
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
diff --git a/src/app/signup/signup.page.html b/src/app/signup/signup.page.html
index f4b8b16..64ba107 100644
--- a/src/app/signup/signup.page.html
+++ b/src/app/signup/signup.page.html
@@ -26,9 +26,13 @@
<input class="" type="password" placeholder="Create A Password">
</div>
<div class="row">
+ <ion-datetime displayFormat="DD-MM-YY" placeholder="Date of Birth"></ion-datetime>
+ </div>
+ <div class="row">
<h6>
<input class="styled-checkbox" id="styled-checkbox-1" type="checkbox" value="value1">
- <label for="styled-checkbox-1"><span>I agree with <a>Terms and Conditions</a></span></label></h6>
+ <label for="styled-checkbox-1"><span>I agree with <a (click)="menuToggle()">Terms and
+ Conditions</a></span></label></h6>
</div>
<div class="row">
<button class="login_btn" (click)="goToPage('verification')">SIGN UP</button>
@@ -49,4 +53,16 @@
</div>
</div>
</div>
-</ion-content>
\ No newline at end of file
+
+</ion-content>
+<div class="terms_wrapper" *ngIf="menuShow" [@slideInOut]>
+ <div class="terms_inner">
+ <h5>Terms & Conditions</h5>
+ <p>
+ Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has
+ survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop
+ publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+ </p>
+ <button class="accept" (click)="menuToggle()">I Accept</button>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/app/signup/signup.page.scss b/src/app/signup/signup.page.scss
index 2f10032..908f04c 100644
--- a/src/app/signup/signup.page.scss
+++ b/src/app/signup/signup.page.scss
@@ -23,6 +23,17 @@
border-radius: 8px;
font-size: 16px;
}
+ ion-datetime {
+ border: 1px solid rgba(215, 213, 228, 1);
+ background: transparent;
+ color: rgba(215, 213, 228, 1);
+ width: 100%;
+ height: 45px;
+ text-align: center;
+ border-radius: 8px;
+ font-size: 16px;
+ padding-left: 0px;
+ }
.login_btn {
width: 100%;
background-color: #29285b;
@@ -130,4 +141,49 @@
}
}
}
+}
+
+.terms_wrapper {
+ background-color: rgba(41, 40, 91, 0.6);
+ color: #fff;
+ position: fixed;
+ top: 0px;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ z-index: 9999;
+ .terms_inner {
+ background-color: #fff;
+ border-radius: 10px;
+ width: calc(100% - 20px);
+ margin: 0 auto;
+ padding: 20px;
+ padding-top: 10px;
+ position: relative;
+ top: 50px;
+ h5 {
+ margin: 0px;
+ border-bottom: 1px solid #a8a8a8;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ text-align: center;
+ color: rgba(41, 40, 91, 1);
+ }
+ p {
+ color: #a8a8a8;
+ text-align: justify;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ height: 300px;
+ overflow: scroll;
+ }
+ .accept {
+ width: 100%;
+ height: 35px;
+ background-color: #29285b;
+ color: #fff;
+ text-align: center;
+ border-radius: 2px;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/app/signup/signup.page.ts b/src/app/signup/signup.page.ts
index 8bb6735..7ff01c4 100644
--- a/src/app/signup/signup.page.ts
+++ b/src/app/signup/signup.page.ts
@@ -1,14 +1,28 @@
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { Location } from '@angular/common';
+import { trigger, transition, animate, style } from '@angular/animations';
@Component({
selector: 'app-signup',
templateUrl: './signup.page.html',
styleUrls: ['./signup.page.scss'],
+ animations: [
+ trigger('slideInOut', [
+ transition(':enter', [
+ style({ transform: 'translateY(100%)' }),
+ animate('300ms ease-in', style({ transform: 'translateY(0%)' }))
+ ]),
+ transition(':leave', [
+ animate('300ms ease-out', style({ transform: 'translateY(100%)' }))
+ ])
+ ])
+ ]
})
export class SignupPage implements OnInit {
+ menuShow = false;
+
constructor(
private router: Router,
private route: ActivatedRoute,
@@ -27,5 +41,10 @@ export class SignupPage implements OnInit {
this.location.back();
}
+ menuToggle() {
+ this.menuShow = !this.menuShow;
+ }
+
+
}
diff --git a/src/global.scss b/src/global.scss
index c211491..239db34 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -550,4 +550,21 @@ ion-header {
background-color: rgba(273, 273, 273, 0.9);
text-align: center;
z-index: 99;
+}
+
+.picker-wrapper {
+ .picker-toolbar {
+ .picker-toolbar-button {
+ .picker-button {
+ color: #29285b;
+ font-weight: 900;
+ }
+ }
+ }
+ .picker-columns {
+ .picker-opt-selected {
+ color: #29285b;
+ font-weight: 900;
+ }
+ }
}
\ No newline at end of file