Skip to content

Commit 80e07e0

Browse files
committed
✨ modal more view added
1 parent 78aa99e commit 80e07e0

13 files changed

+120
-24
lines changed

src/app/auth/auth.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<div class="i-wrapper"><i class="bx bx-x" (click)="closeModal()"></i></div>
55
</div>
66
<div class="body">
7-
<app-login *ngIf="showLogin" (showRegister)="changePage($event)" (closeModal)="closeModal()"></app-login>
8-
<app-register *ngIf="!showLogin" (showLogin)="changePage($event)" (closeModal)="closeModal()"></app-register>
7+
<app-more-features *ngIf="showMore && !showLogin" (changeView)="changePage($event)"></app-more-features>
8+
<app-login *ngIf="!showMore && showLogin" (showRegister)="changePage($event)" (closeModal)="closeModal()">
9+
</app-login>
10+
<app-register *ngIf="!showMore && !showLogin" (showLogin)="changePage($event)" (closeModal)="closeModal()">
11+
</app-register>
912
</div>
1013
</div>
1114
</div>

src/app/auth/auth.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ export class AuthComponent implements OnInit, OnDestroy {
1313
private authSubscription: Subscription;
1414
@ViewChild('modalAuth') modalAuth: ElementRef;
1515
private bodyElement = document.body as HTMLBodyElement;
16-
public showLogin: boolean = true;
1716

17+
public showLogin: boolean = false;
18+
public showMore: boolean = true;
1819
private modalOpen: boolean = false;
1920

2021
constructor(private authService: AuthService) {}
@@ -37,9 +38,12 @@ export class AuthComponent implements OnInit, OnDestroy {
3738
this.bodyElement.classList.remove('modal-open');
3839
this.modalAuth.nativeElement.classList.remove('modal-open');
3940
this.modalOpen = false;
41+
this.showLogin = false;
42+
this.showMore = true;
4043
}
4144

4245
changePage(show: boolean) {
46+
this.showMore = false;
4347
this.showLogin = show;
4448
}
4549

src/app/auth/components/components.module.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ import { CommonModule } from '@angular/common';
33
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
44

55
import { LoginComponent } from './login/login.component';
6+
import { MoreFeaturesComponent } from './more-features/more-features.component';
67
import { RegisterComponent } from './register/register.component';
78

89
@NgModule({
910
declarations: [
1011
LoginComponent,
11-
RegisterComponent
12+
RegisterComponent,
13+
MoreFeaturesComponent
1214
],
1315
imports: [
1416
CommonModule,
@@ -17,7 +19,8 @@ import { RegisterComponent } from './register/register.component';
1719
],
1820
exports: [
1921
LoginComponent,
20-
RegisterComponent
22+
RegisterComponent,
23+
MoreFeaturesComponent
2124
]
2225
})
2326
export class ComponentsModule { }

src/app/auth/components/login/login.component.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,9 @@ form .sign-in {
3636
color: var(--primary-color);
3737
cursor: pointer;
3838
}
39+
40+
@media (max-width: 480px) {
41+
.login-container {
42+
padding: 0 1rem 1rem;
43+
}
44+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="login-container">
22
<form [formGroup]="loginForm" (submit)="login()">
3-
<span class="sign-in">Login</span>
3+
<span class="sign-in">Sign in</span>
44
<label for="email" class="floating">
55
<input formControlName="email" type="text" id="email" placeholder="email">
66
<span>Email</span>
@@ -10,14 +10,14 @@
1010
<span>Password</span>
1111
</label>
1212
<span class="error">{{message}}</span>
13-
<button type="submit" class="btn btn-primary btn-lg">Ingresar</button>
13+
<button type="submit" class="btn btn-primary btn-lg">Sign in</button>
1414
</form>
1515
<div _ngcontent-vhs-c8="" class="divisor">
1616
<div _ngcontent-vhs-c8="" class="line"></div><span _ngcontent-vhs-c8="">o</span>
1717
<div _ngcontent-vhs-c8="" class="line"></div>
1818
</div>
1919
<div class="no-account">
2020
<span>Have no account?</span>
21-
<a (click)="changePage()" class="link">Sign in</a>
21+
<a (click)="changePage()" class="link">Sign on</a>
2222
</div>
2323
</div>
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.more-container {
2+
padding: 0rem 1.8rem 1.8rem;
3+
display: flex;
4+
flex-direction: column;
5+
align-items: center;
6+
gap: 10px;
7+
}
8+
9+
.more-container img {
10+
max-width: 100%;
11+
max-height: 15rem;
12+
}
13+
14+
.more-container .content {
15+
display: flex;
16+
flex-direction: column;
17+
justify-content: center;
18+
align-items: center;
19+
text-align: center;
20+
gap: 10px;
21+
max-width: 90%;
22+
}
23+
24+
.more-container .content .description {
25+
color: var(--font-color-primary);
26+
font-size: 24px;
27+
font-weight: 600;
28+
}
29+
30+
.btn {
31+
max-width: 70%;
32+
border-radius: 40px;
33+
}
34+
35+
@media (max-width: 480px) {
36+
.more-container {
37+
padding: 0 1rem 1rem;
38+
}
39+
40+
.more-container .content {
41+
max-width: 100%;
42+
}
43+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="more-container">
2+
<img src="/assets/svg/explore.svg" alt="explore">
3+
<div class="content">
4+
<span class="description">You want to unlock more features</span>
5+
<button (click)="change(true)" class="btn btn-primary btn-lg">Sign in</button>
6+
<span class="description">or</span>
7+
<button (click)="change(false)" class="btn btn-following btn-lg">Sign on</button>
8+
</div>
9+
</div>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-more-features',
5+
templateUrl: './more-features.component.html',
6+
styleUrls: ['./more-features.component.css']
7+
})
8+
export class MoreFeaturesComponent implements OnInit {
9+
@Output() changeView: EventEmitter<boolean> = new EventEmitter();
10+
constructor() { }
11+
12+
ngOnInit(): void {
13+
}
14+
15+
change(value: boolean): void {
16+
this.changeView.emit(value);
17+
}
18+
19+
}

src/app/auth/components/register/register.component.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ form .sign-on {
2424
flex-direction: column;
2525
justify-content: flex-end;
2626
align-items: center;
27+
text-align: center;
2728
}
2829

2930
.has-account span {
@@ -45,3 +46,9 @@ form .sign-on {
4546
span.error > ul > li {
4647
margin-left: 1rem;
4748
}
49+
50+
@media (max-width: 480px) {
51+
.register-container {
52+
padding: 0 1rem 1rem;
53+
}
54+
}

src/app/auth/components/register/register.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="register-container">
22
<form [formGroup]="registerForm" (submit)="register()">
3-
<span class="sign-on">Register</span>
3+
<span class="sign-on">Sign on</span>
44
<div class="input-group">
55
<label for="email" class="floating">
66
<input formControlName="email" type="text" id="email" placeholder="email">
@@ -49,6 +49,6 @@
4949
</div>
5050
<div class="has-account">
5151
<span>Already have account?</span>
52-
<a (click)="changePage()" class="link">Sign on</a>
52+
<a (click)="changePage()" class="link">Sign in</a>
5353
</div>
5454
</div>

0 commit comments

Comments
 (0)