From 7e129d8a68a2a5cd67e1ead7455cf035aa9e921b Mon Sep 17 00:00:00 2001 From: Marcy Date: Sun, 26 Apr 2020 12:09:02 +0200 Subject: [PATCH 1/3] something went south --- package.json | 2 +- src/app/app.module.ts | 3 +- src/app/login/login.component.css | 98 ++++++++++++-- src/app/login/login.component.html | 7 +- src/app/login/login.component.ts | 4 +- src/app/signup/signup.component.css | 184 ++++++++++++++++++--------- src/app/signup/signup.component.html | 67 ++++++++++ src/app/signup/signup.component.ts | 38 +++++- 8 files changed, 325 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 34918fa..c58db87 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@angular/compiler-cli": "^9.0.7", "@angular/core": "~9.0.3", "@angular/fire": "^6.0.0", - "@angular/forms": "~9.0.3", + "@angular/forms": "^9.0.7", "@angular/localize": "^9.1.0", "@angular/platform-browser": "~9.0.3", "@angular/platform-browser-dynamic": "~9.0.3", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 711c6ca..e2f0f96 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -52,7 +52,7 @@ export function HttpLoaderFactory(http: HttpClient) { return new TranslateHttpLoader(http); } -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core'; import { GeocodeService } from './services/geocode.service'; @@ -77,6 +77,7 @@ import { GeocodeService } from './services/geocode.service'; CommonModule, HttpClientModule, FormsModule, + ReactiveFormsModule, AgmCoreModule.forRoot({ apiKey: 'AIzaSyD9crBwGrLUT3_iH_wi1ZqKNhGhwjzHp5I' }), diff --git a/src/app/login/login.component.css b/src/app/login/login.component.css index 01f5c49..08afc24 100644 --- a/src/app/login/login.component.css +++ b/src/app/login/login.component.css @@ -7,10 +7,10 @@ form { padding: 20px; text-align: center; margin: auto auto 0 auto; - background-color: white; - -webkit-box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); - box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); + background: #FFFFFF; + border: 1px solid #2E3192; + box-sizing: border-box; + border-radius: 36px; } .v_container { @@ -21,8 +21,7 @@ form { height: 100vh; min-width: 300px; min-height: 1000px; - background: rgb(236,160,193); - background: radial-gradient(circle, rgba(236,160,193,1) 0%, rgba(130,180,238,1) 100%); + background: #FFFAE7; } .fixed_height { @@ -40,7 +39,15 @@ form { } #login { + font-family: Montserrat; + font-weight: 500; + font-size: 36px; + line-height: 44px; + display: flex; + align-items: center; text-align: center; + font-style: normal; + color: #2E3192; } #submit { @@ -49,7 +56,16 @@ form { } p { - font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + + color: #2E3192; + font-style: normal; } #signup { @@ -58,11 +74,71 @@ p { } input[type=text] { - border: none; - border-bottom: 2px solid rgb(200, 200, 200); + background: #FFFFFF; + border: 1px solid #EBDDFF; + box-sizing: border-box; } input[type=password] { - border: none; - border-bottom: 2px solid rgb(200, 200, 200); + background: #FFFFFF; + box-sizing: border-box; + border: 1px solid #EBDDFF; +} + +.container1{ + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + color: #2E3192; + font-style: normal; +} + +.container2{ + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + color: #2E3192; + font-style: normal; +} + +a:link { + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + text-decoration-line: underline; + + color: #FC5C14; + font-style: normal; +} + +button { +background: #EBDDFF; +border: 2px solid #2E3192; +box-sizing: border-box; +border-radius: 30px; +font-family: Montserrat; +font-style: normal; +font-weight: normal; +font-size: 24px; +line-height: 29px; +display: flex; +align-items: center; +text-align: center; +} + +input::placeholder{ + color: #999FDE; + } diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 56223aa..941a094 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -14,10 +14,11 @@
- + Forgot password? +

LOGIN.NOACCOUNT

- + Sign Up - \ No newline at end of file + diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index a83a6a5..fa08500 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { FirebaseAuthService } from '../services/firebase-auth.service'; @Component({ selector: 'app-login', @@ -7,7 +8,8 @@ import { Router } from '@angular/router'; styleUrls: ['./login.component.css'] }) export class LoginComponent implements OnInit { - constructor(private router: Router) { } + constructor(private router: Router, private authService: FirebaseAuthService) { } + ngOnInit(): void { } diff --git a/src/app/signup/signup.component.css b/src/app/signup/signup.component.css index 2facceb..e39b8ab 100644 --- a/src/app/signup/signup.component.css +++ b/src/app/signup/signup.component.css @@ -1,90 +1,158 @@ -.v_container { - align-items: center; - justify-content: center; + +form { text-align: center; - width: 100%; - height: 100vh; min-width: 300px; - min-height: 1000px; - background: rgb(2,0,36); - background: linear-gradient(189deg, rgba(2,0,36,1) 0%, rgba(255,252,161,1) 0%, rgba(126,236,175,1) 52%, rgba(0,255,211,1) 97%); + max-width: 400px; + min-height: 600px; + max-height: 700px; + background: #FFFFFF; + box-sizing: border-box; + border-radius: 36px; + border: 1px solid #2E3192; + display: flex; + flex-direction: column; + justify-content: center; + margin-left: 50%; + margin-top: 10%; } -.fixed_height { - height: 20vh +h2{ + padding-bottom: 5%; + font-family: Montserrat; + font-weight: 500; + font-size: 36px; + line-height: 44px; + display: flex; + margin-left: 34%; + margin-top: 10%; + + + color: #2E3192; + font-style: normal; } -form { - text-align: center; - margin: auto auto 0 auto; - border-radius: 25px; - width: 400px; - height: 600px; - background: white; - -webkit-box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); - box-shadow: 0px 4px 22px 3px rgba(0,0,0,0.75); +.form-group{ + padding-top: 2%; + margin-left: 5%; + margin-right: 5%; + text-align: left; } -.container{ - font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; - vertical-align: middle; - line-height:25px; - font-size: 120%; - padding: 10%; +input[type=text] { + background: #FFFFFF; + border: 1px solid #EBDDFF; + box-sizing: border-box; } -.container1{ - padding: 5px; +input[type=password] { + background: #FFFFFF; + box-sizing: border-box; + border: 1px solid #EBDDFF; +} + +#line { + border-bottom: 1px solid #EBDDFF; + margin-left: 5%; + margin-right: 5%; + padding-top: 5%; + margin-bottom: 15%; } -#signupHeader{ +label{ + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; text-align: center; + + color: #2E3192; + font-style: normal; } +input::placeholder{ + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: left; + text-align: left; + + color: #999FDE; + font-style: normal; +} +button{ + background: #EBDDFF; + box-sizing: border-box; + border-radius: 30px; + font-family: Montserrat; + font-style: normal; + font-weight: normal; + font-size: 24px; + line-height: 29px; + display: flex; + align-items: center; + text-align: center; + border: 2px solid #2E3192; + font-family: Montserrat; + font-weight: normal; + font-size: 24px; + line-height: 29px; + display: flex; + align-items: center; + text-align: center; + color: #2E3192; + font-style: normal; -#submit{ - border-radius: 25px; - font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; - height: 40px; - width: 200px; - background-color : rgba(245, 254, 155, 0.988); -} + margin-left: 25%; + margin-right: 25%; + margin-top: 10%; -p { - margin-bottom: 3%; - padding: 10%; } -#victim:focus{ - border-radius: 25px; - background-color: #4CAF50; +#rectangle { + width: 200px; + height: 100px; + background: red; } -#chose{ - margin: 3%; -} -#verify{ - border-radius: 25px; - font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; +#sos{ + font-family: Montserrat; + font-weight: normal; + font-size: 23.1579px; + line-height: 28px; + display: flex; + align-items: center; + text-align: center; + font-style: normal; + + color: #FC5C14; + border: 1px solid #FF9848; + border-radius: 28.9474px; + box-sizing: border-box; + margin-left: 30%; + margin-top: 2%; + } -input[type=text] { - border: none; - border-bottom: 2px solid rgb(200, 200, 200); +.back{ + background: #FFFAE7; } -input[type=password] { - border: none; - border-bottom: 2px solid rgb(200, 200, 200); +.tree{ + position: absolute; + x: 0; + y:0; } -.help { - border-radius: 25px; - font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; -} \ No newline at end of file + + + + diff --git a/src/app/signup/signup.component.html b/src/app/signup/signup.component.html index 3c22efb..227bbae 100644 --- a/src/app/signup/signup.component.html +++ b/src/app/signup/signup.component.html @@ -1,4 +1,70 @@ +
+ +
+
+
Are you in an emergency ? Call 147 or find help near you
+
+

Sign up

+
+
+ + +
+
+ + +
+ +
+

{{ errorMessage }}

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/app/signup/signup.component.ts b/src/app/signup/signup.component.ts index 7aba739..dca4e16 100644 --- a/src/app/signup/signup.component.ts +++ b/src/app/signup/signup.component.ts @@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { LangService } from '../services/lang.service'; +import { FirebaseAuthService } from '../services/firebase-auth.service'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; + @Component({ selector: 'app-signup', @@ -11,13 +14,41 @@ import { LangService } from '../services/lang.service'; export class SignupComponent implements OnInit { translate: TranslateService; - constructor(private router: Router, private lang: LangService) { + signupForm: FormGroup; + errorMessage: string; + + constructor(private formBuilder: FormBuilder, + private router: Router, + private lang: LangService, + private authService: FirebaseAuthService) { this.translate = lang.getTranslateService(); } - ngOnInit(): void { + ngOnInit() { + this.initForm(); } + initForm() { + this.signupForm = this.formBuilder.group({ + email: ['', [Validators.required, Validators.email]], + password: ['', [Validators.required, Validators.pattern(/[0-9a-zA-Z]{6,}/)]] + }); + } + + onSubmit() { + const email = this.signupForm.get('email').value; + const password = this.signupForm.get('password').value; + + this.authService.createNewUser(email, password).then( + () => { + this.router.navigate(['/books']); + }, + (error) => { + this.errorMessage = error; + } + ); + } + loginUser(event) { event.preventDefault(); // const target = event.target @@ -30,4 +61,5 @@ export class SignupComponent implements OnInit { this.router.navigate([`${pageName}`]); } -} + +} \ No newline at end of file -- GitLab From fcb1c9461c22bd3043e5392856bc6de81c14ec31 Mon Sep 17 00:00:00 2001 From: Marcy Date: Sun, 26 Apr 2020 13:07:56 +0200 Subject: [PATCH 2/3] signup_presque_nice --- src/app/login/login.component.css | 1 - src/app/signup/signup.component.css | 14 ++++++------- src/app/signup/signup.component.html | 27 ------------------------- src/assets/images/yana-tree-noHands.svg | 21 +++++++++++++++++++ 4 files changed, 28 insertions(+), 35 deletions(-) create mode 100644 src/assets/images/yana-tree-noHands.svg diff --git a/src/app/login/login.component.css b/src/app/login/login.component.css index 08afc24..f84a023 100644 --- a/src/app/login/login.component.css +++ b/src/app/login/login.component.css @@ -140,5 +140,4 @@ text-align: center; input::placeholder{ color: #999FDE; - } diff --git a/src/app/signup/signup.component.css b/src/app/signup/signup.component.css index e39b8ab..63461cb 100644 --- a/src/app/signup/signup.component.css +++ b/src/app/signup/signup.component.css @@ -13,7 +13,7 @@ form { flex-direction: column; justify-content: center; margin-left: 50%; - margin-top: 10%; + margin-top: 5%; } h2{ @@ -143,13 +143,13 @@ button{ } .back{ - background: #FFFAE7; -} -.tree{ - position: absolute; - x: 0; - y:0; + height: 850px; + background: #FFFAE7; + background-image: url(../../assets/images/yana-tree-noHands.svg); + background-repeat: space; + background-image-size: 100%; + background-position: bottom; } diff --git a/src/app/signup/signup.component.html b/src/app/signup/signup.component.html index 227bbae..acca945 100644 --- a/src/app/signup/signup.component.html +++ b/src/app/signup/signup.component.html @@ -28,33 +28,6 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/assets/images/yana-tree-noHands.svg b/src/assets/images/yana-tree-noHands.svg new file mode 100644 index 0000000..c2ba6d2 --- /dev/null +++ b/src/assets/images/yana-tree-noHands.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From 19d3e569d4ced0bc7044f29d1f5a8a94eed1308e Mon Sep 17 00:00:00 2001 From: Marcy Date: Sun, 26 Apr 2020 14:34:09 +0200 Subject: [PATCH 3/3] Login page, Sign UP page and unlinked rest password page + thank you page --- src/app/app.module.ts | 6 +- src/app/login/login.component.css | 192 +++++++++++------- src/app/login/login.component.html | 48 +++++ src/app/login/login.component.ts | 39 +++- .../resetpassword/resetpassword.component.css | 0 .../resetpassword.component.html | 1 + .../resetpassword.component.spec.ts | 25 +++ .../resetpassword/resetpassword.component.ts | 15 ++ src/app/signup/signup.component.html | 2 +- src/app/signup/signup.component.ts | 2 +- src/app/thankyou/thankyou.component.css | 0 src/app/thankyou/thankyou.component.html | 19 ++ src/app/thankyou/thankyou.component.spec.ts | 25 +++ src/app/thankyou/thankyou.component.ts | 15 ++ 14 files changed, 307 insertions(+), 82 deletions(-) create mode 100644 src/app/resetpassword/resetpassword.component.css create mode 100644 src/app/resetpassword/resetpassword.component.html create mode 100644 src/app/resetpassword/resetpassword.component.spec.ts create mode 100644 src/app/resetpassword/resetpassword.component.ts create mode 100644 src/app/thankyou/thankyou.component.css create mode 100644 src/app/thankyou/thankyou.component.html create mode 100644 src/app/thankyou/thankyou.component.spec.ts create mode 100644 src/app/thankyou/thankyou.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e2f0f96..6c6fcd7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -55,6 +55,8 @@ export function HttpLoaderFactory(http: HttpClient) { import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core'; import { GeocodeService } from './services/geocode.service'; +import { ResetpasswordComponent } from './resetpassword/resetpassword.component'; +import { ThankyouComponent } from './thankyou/thankyou.component'; @NgModule({ @@ -69,7 +71,9 @@ import { GeocodeService } from './services/geocode.service'; ArticleComponent, NavButtonComponent, LoginComponent, - SignupComponent + SignupComponent, + ResetpasswordComponent, + ThankyouComponent ], imports: [ BrowserModule, diff --git a/src/app/login/login.component.css b/src/app/login/login.component.css index f84a023..ed28a07 100644 --- a/src/app/login/login.component.css +++ b/src/app/login/login.component.css @@ -1,76 +1,42 @@ form { - max-width: 2000px; - max-height: 2000px; - border-radius: 25px; - height: fit-content; - width: fit-content; - padding: 20px; text-align: center; - margin: auto auto 0 auto; + min-width: 300px; + max-width: 400px; + min-height: 600px; + max-height: 700px; background: #FFFFFF; - border: 1px solid #2E3192; box-sizing: border-box; border-radius: 36px; -} - -.v_container { - align-items: center; + border: 1px solid #2E3192; + display: flex; + flex-direction: column; justify-content: center; - text-align: center; - width: 100%; - height: 100vh; - min-width: 300px; - min-height: 1000px; - background: #FFFAE7; -} - -.fixed_height { - height: 20vh -} - -.container{ - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; - font-style: normal; - font-variant: normal; - font-weight: bold; - vertical-align: middle; - line-height:35px; - font-size: 120%; + margin-left: 50%; + margin-top: 5%; } -#login { +h2{ + padding-bottom: 5%; font-family: Montserrat; font-weight: 500; font-size: 36px; line-height: 44px; display: flex; - align-items: center; - text-align: center; - font-style: normal; - color: #2E3192; -} - -#submit { - border-radius: 25px; - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; -} - -p { - font-family: Montserrat; - font-weight: normal; - font-size: 22px; - line-height: 27px; - display: flex; - align-items: center; - text-align: center; + margin-left: 34%; + margin-top: 10%; + color: #2E3192; font-style: normal; } -#signup { - border-radius: 25px; - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + + +.form-group{ + padding-top: 2%; + margin-left: 5%; + margin-right: 5%; + text-align: left; } input[type=text] { @@ -85,7 +51,15 @@ input[type=password] { border: 1px solid #EBDDFF; } -.container1{ +#line { + border-bottom: 1px solid #EBDDFF; + margin-left: 5%; + margin-right: 5%; + padding-top: 5%; + margin-bottom: 15%; +} + +.label{ font-family: Montserrat; font-weight: normal; font-size: 22px; @@ -93,51 +67,113 @@ input[type=password] { display: flex; align-items: center; text-align: center; + color: #2E3192; font-style: normal; } -.container2{ +input::placeholder{ font-family: Montserrat; font-weight: normal; font-size: 22px; line-height: 27px; display: flex; + align-items: left; + text-align: left; + + color: #999FDE; + font-style: normal; +} + +button{ + background: #EBDDFF; + box-sizing: border-box; + border-radius: 30px; + font-family: Montserrat; + font-style: normal; + font-weight: normal; + font-size: 24px; + line-height: 29px; + display: flex; + align-items: center; + text-align: center; + border: 2px solid #2E3192; + + font-family: Montserrat; + font-weight: normal; + font-size: 24px; + line-height: 29px; + display: flex; align-items: center; text-align: center; color: #2E3192; font-style: normal; + + margin-left: 25%; + margin-right: 25%; + margin-top: 10%; + +} + +#rectangle { + width: 200px; + height: 100px; + background: red; } -a:link { + +#sos{ font-family: Montserrat; font-weight: normal; - font-size: 22px; - line-height: 27px; + font-size: 23.1579px; + line-height: 28px; display: flex; align-items: center; text-align: center; - text-decoration-line: underline; - - color: #FC5C14; font-style: normal; + + color: #FC5C14; + border: 1px solid #FF9848; + border-radius: 28.9474px; + box-sizing: border-box; + margin-left: 30%; + margin-top: 2%; + } -button { -background: #EBDDFF; -border: 2px solid #2E3192; -box-sizing: border-box; -border-radius: 30px; -font-family: Montserrat; -font-style: normal; -font-weight: normal; -font-size: 24px; -line-height: 29px; -display: flex; -align-items: center; -text-align: center; +.back{ + + height: 850px; + background: #FFFAE7; + background-image: url(../../assets/images/yana-tree-noHands.svg); + background-repeat: space; + background-image-size: 100%; + background-position: bottom; } -input::placeholder{ - color: #999FDE; +p{ + ont-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + + color: #2E3192; + font-style: normal; } + +a{ + font-family: Montserrat; + font-weight: normal; + font-size: 22px; + line-height: 27px; + display: flex; + align-items: center; + text-align: center; + text-decoration-line: underline; + + color: #FC5C14; + font-style: normal; +} \ No newline at end of file diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 941a094..6f2b546 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -1,4 +1,51 @@ +
+ +
+
+
Are you in an emergency ? Call 147 or find help near you
+
+

Login

+
+
+ + +
+
+ + +
+ Forgot password? + +

Don't have an account yet?

+ Sign Up +
+

{{ errorMessage }}

+
+
+ +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index fa08500..4a14778 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { LangService } from '../services/lang.service'; import { FirebaseAuthService } from '../services/firebase-auth.service'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; @Component({ selector: 'app-login', @@ -8,11 +10,46 @@ import { FirebaseAuthService } from '../services/firebase-auth.service'; styleUrls: ['./login.component.css'] }) export class LoginComponent implements OnInit { - constructor(private router: Router, private authService: FirebaseAuthService) { } + + loginForm: FormGroup; + errorMessage: string; + + + constructor(private formBuilder: FormBuilder, + private router: Router, + private lang: LangService, + private authService: FirebaseAuthService) { } ngOnInit(): void { + this.initForm(); } + initForm() { + this.loginForm = this.formBuilder.group({ + email: ['', [Validators.required, Validators.email]], + password: ['', [Validators.required, Validators.pattern(/[0-9a-zA-Z]{6,}/)]] + }); + } + + onSubmit() { + const email = this.loginForm.get('email').value; + const password = this.loginForm.get('password').value; + + this.authService.signInUser(email, password).then( + () => { + this.router.navigate(['/']); + }, + (error) => { + this.errorMessage = error; + } + ); + } + + + + + + getUserDetails() { //post this details to API server return info if correct } diff --git a/src/app/resetpassword/resetpassword.component.css b/src/app/resetpassword/resetpassword.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/resetpassword/resetpassword.component.html b/src/app/resetpassword/resetpassword.component.html new file mode 100644 index 0000000..6b9f5ee --- /dev/null +++ b/src/app/resetpassword/resetpassword.component.html @@ -0,0 +1 @@ +

resetpassword works!

diff --git a/src/app/resetpassword/resetpassword.component.spec.ts b/src/app/resetpassword/resetpassword.component.spec.ts new file mode 100644 index 0000000..f6cd854 --- /dev/null +++ b/src/app/resetpassword/resetpassword.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ResetpasswordComponent } from './resetpassword.component'; + +describe('ResetpasswordComponent', () => { + let component: ResetpasswordComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ResetpasswordComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ResetpasswordComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/resetpassword/resetpassword.component.ts b/src/app/resetpassword/resetpassword.component.ts new file mode 100644 index 0000000..756c49e --- /dev/null +++ b/src/app/resetpassword/resetpassword.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-resetpassword', + templateUrl: './resetpassword.component.html', + styleUrls: ['./resetpassword.component.css'] +}) +export class ResetpasswordComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/signup/signup.component.html b/src/app/signup/signup.component.html index acca945..5ae46fe 100644 --- a/src/app/signup/signup.component.html +++ b/src/app/signup/signup.component.html @@ -20,7 +20,7 @@ id="password" class="form-control" formControlName="password" - placeholder="Enter your email"> + placeholder="Enter your password"> diff --git a/src/app/signup/signup.component.ts b/src/app/signup/signup.component.ts index dca4e16..478b911 100644 --- a/src/app/signup/signup.component.ts +++ b/src/app/signup/signup.component.ts @@ -41,7 +41,7 @@ export class SignupComponent implements OnInit { this.authService.createNewUser(email, password).then( () => { - this.router.navigate(['/books']); + this.router.navigate(['/']); }, (error) => { this.errorMessage = error; diff --git a/src/app/thankyou/thankyou.component.css b/src/app/thankyou/thankyou.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/thankyou/thankyou.component.html b/src/app/thankyou/thankyou.component.html new file mode 100644 index 0000000..7c1ed22 --- /dev/null +++ b/src/app/thankyou/thankyou.component.html @@ -0,0 +1,19 @@ +
+ +
+
+
Are you in an emergency ? Call 147 or find help near you
+
+

Thank you for joining our comunity

+
+

Thank you for joining our comunity!

+ + +
+ +
+
+ +
+ + \ No newline at end of file diff --git a/src/app/thankyou/thankyou.component.spec.ts b/src/app/thankyou/thankyou.component.spec.ts new file mode 100644 index 0000000..375f72a --- /dev/null +++ b/src/app/thankyou/thankyou.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ThankyouComponent } from './thankyou.component'; + +describe('ThankyouComponent', () => { + let component: ThankyouComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ThankyouComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ThankyouComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/thankyou/thankyou.component.ts b/src/app/thankyou/thankyou.component.ts new file mode 100644 index 0000000..6e4d8f7 --- /dev/null +++ b/src/app/thankyou/thankyou.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-thankyou', + templateUrl: './thankyou.component.html', + styleUrls: ['./thankyou.component.css'] +}) +export class ThankyouComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} -- GitLab