Skip to content

Commit 1960ffc

Browse files
guiseekguiseek
committed
feat(event): adiciona rsvp button na página pública
1 parent 2808a3d commit 1960ffc

File tree

16 files changed

+298
-72
lines changed

16 files changed

+298
-72
lines changed

‎apps/devmx/src/app/handlers/auth-error.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ export class AuthErrorHandler implements ErrorHandler {
3333
this.showMessage(error.status, message);
3434

3535
if (error.status === 401) {
36-
this.router.navigateByUrl('/conta/autenticacao');
36+
const queryParams = { redirectTo: this.router.url };
37+
this.router.navigate(['/', 'conta', 'autenticacao'], { queryParams });
3738
localStorage.removeItem('accessToken');
3839
}
3940
}

‎apps/devmx/src/index.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<meta name="apple-mobile-web-app-capable" content="yes" />
1313
<meta name="apple-mobile-web-app-status-bar-style" content="translucent" />
1414
<meta name="mobile-web-app-capable" content="yes" />
15-
<meta
16-
name="description"
17-
content="Plataforma que oferece online o mesmo ciclo de funcionamento da comunidade DevParaná"
18-
/>
15+
<meta name="description" content="A plataforma da comunidade" />
1916
<meta
2017
name="keywords"
2118
content="comunidade, devparaná, pessoas, desenvolvedoras, programação, paraná, brasil"

‎apps/devmx/src/scss/components/_links.theme.scss

+5
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,10 @@
1313
.mdc-icon-button:not(.mdc-fab):hover {
1414
color: mat.get-theme-color($theme, secondary, 70);
1515
}
16+
17+
.mat-mdc-outlined-button:not(:disabled) {
18+
border: 2px solid mat.get-theme-color($theme, on-surface);
19+
color: mat.get-theme-color($theme, on-surface);
20+
}
1621
}
1722
}

‎devmx.code-workspace

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
}
6+
],
7+
"settings": {
8+
"workbench.colorCustomizations": {
9+
"editor.background": "#1C1C1C",
10+
"editor.foreground": "#D4D4D4",
11+
"editorCursor.foreground": "#FFFFFF",
12+
"editor.lineHighlightBackground": "#242424",
13+
"editorLineNumber.foreground": "#555555",
14+
"editor.selectionBackground": "#4A4A4A",
15+
"editor.selectionHighlightBackground": "#1A1A1A60",
16+
"editor.wordHighlightBackground": "#2A2A2A60",
17+
"editor.wordHighlightStrongBackground": "#3A3A3A60",
18+
"activityBar.background": "#1C1C1C",
19+
"sideBar.background": "#1C1C1C",
20+
"sideBar.foreground": "#D4D4D4",
21+
"sideBarSectionHeader.background": "#2A2A2A",
22+
"titleBar.activeBackground": "#1C1C1C",
23+
"titleBar.activeForeground": "#FFFFFF",
24+
"statusBar.background": "#1C1C1C",
25+
"statusBar.foreground": "#FFFFFF",
26+
"panel.background": "#1C1C1C",
27+
"panel.border": "#343434",
28+
"terminal.background": "#1C1C1C",
29+
"terminal.foreground": "#D4D4D4",
30+
"button.background": "#343434",
31+
"button.foreground": "#FFFFFF",
32+
"dropdown.background": "#2A2A2A",
33+
"dropdown.foreground": "#D4D4D4",
34+
"input.background": "#2A2A2A",
35+
"input.foreground": "#FFFFFF",
36+
"scrollbarSlider.background": "#3A3A3A",
37+
"scrollbarSlider.hoverBackground": "#4A4A4A",
38+
"scrollbarSlider.activeBackground": "#5A5A5A",
39+
"tab.activeBackground": "#1C1C1C",
40+
"tab.activeForeground": "#FFFFFF",
41+
"tab.inactiveBackground": "#2A2A2A",
42+
"tab.inactiveForeground": "#A0A0A0",
43+
"tab.border": "#343434",
44+
"editorGroupHeader.tabsBackground": "#1C1C1C",
45+
"editorGroupHeader.tabsBorder": "#343434",
46+
"minimap.background": "#1C1C1C",
47+
"minimapSlider.background": "#3A3A3A",
48+
"minimapSlider.hoverBackground": "#4A4A4A",
49+
"minimapSlider.activeBackground": "#5A5A5A"
50+
},
51+
"editor.tokenColorCustomizations": {
52+
"textMateRules": [
53+
{
54+
"scope": "comment",
55+
"settings": {
56+
"foreground": "#00A656",
57+
"fontStyle": "italic"
58+
}
59+
},
60+
{
61+
"scope": ["keyword", "storage.type"],
62+
"settings": {
63+
"foreground": "#1A84FF"
64+
}
65+
},
66+
{
67+
"scope": "string",
68+
"settings": {
69+
"foreground": "#FB8700"
70+
}
71+
},
72+
{
73+
"scope": "variable.language",
74+
"settings": {
75+
"foreground": "#00A656"
76+
}
77+
},
78+
{
79+
"scope": "variable.other",
80+
"settings": {
81+
"foreground": "#E6C9B7"
82+
}
83+
},
84+
{
85+
"scope": "constant.numeric",
86+
"settings": {
87+
"foreground": "#FB8700"
88+
}
89+
},
90+
{
91+
"scope": "entity.name.function",
92+
"settings": {
93+
"foreground": "#1A84FF"
94+
}
95+
},
96+
{
97+
"scope": "entity.name.type",
98+
"settings": {
99+
"foreground": "#00A656"
100+
}
101+
}
102+
]
103+
}
104+
}
105+
}

‎packages/account/data-access/src/lib/application/authentication.facade.ts

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ export class AuthenticationFacade extends State<AuthenticationState> {
7373

7474
const request$ = this.createUserUseCase.execute(data);
7575
request$.pipe(take(1)).subscribe();
76+
77+
return request$;
7678
}
7779

7880
signOut() {

‎packages/account/feature-about/src/lib/containers/about-user/about-user.container.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h3>{{'@' + user.name}}</h3>
3838
@if (user.profile && user.profile.minibio) {
3939
<mat-card>
4040
<mat-card-content>
41-
<devmx-markdown [content]="user.profile.minibio" />
41+
<devmx-markdown-view [content]="user.profile.minibio" />
4242
</mat-card-content>
4343
</mat-card>
4444
}

‎packages/account/feature-about/src/lib/containers/about-user/about-user.container.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { PresentationCardListComponent } from '@devmx/presentation-ui-shared';
22
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
33
import { MatProgressBarModule } from '@angular/material/progress-bar';
44
import { PresentationFacade } from '@devmx/presentation-data-access';
5-
import { MarkdownComponent } from '@devmx/shared-ui-global/editor';
5+
import { MarkdownViewComponent } from '@devmx/shared-ui-global/markdown';
66
import { AuthenticationFacade } from '@devmx/account-data-access';
77
import { EventCardListComponent } from '@devmx/event-ui-shared';
88
import { IconComponent } from '@devmx/shared-ui-global/icon';
@@ -24,7 +24,7 @@ import { RolePipe } from '@devmx/account-ui-shared';
2424
changeDetection: ChangeDetectionStrategy.OnPush,
2525
imports: [
2626
MatCardModule,
27-
MarkdownComponent,
27+
MarkdownViewComponent,
2828
PresentationCardListComponent,
2929
EventCardListComponent,
3030
MatProgressBarModule,

‎packages/account/feature-auth/src/lib/containers/authentication/authentication.container.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
</mat-card-header>
88

99
<mat-card-content class="authentication-card-content">
10-
<a routerLink="../cadastrar" mat-button>Quero criar minha conta</a>
10+
<a
11+
[routerLink]="['..','cadastrar']"
12+
[queryParams]="route.snapshot.queryParams"
13+
mat-button
14+
>Quero criar minha conta</a
15+
>
1116
</mat-card-content>
1217

1318
<mat-vertical-stepper

‎packages/account/feature-auth/src/lib/containers/authentication/authentication.container.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { CodeFieldComponent } from '@devmx/account-ui-shared';
88
import { MatButtonModule } from '@angular/material/button';
99
import { MatInputModule } from '@angular/material/input';
1010
import { MatCardModule } from '@angular/material/card';
11-
import { Router, RouterLink } from '@angular/router';
11+
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
1212
import { AuthenticationForm } from '../../forms';
1313
import { AsyncPipe } from '@angular/common';
1414
import {
@@ -38,6 +38,7 @@ import {
3838
],
3939
})
4040
export class AuthenticationContainer {
41+
route = inject(ActivatedRoute);
4142
router = inject(Router);
4243

4344
stepper = viewChild(MatStepper);
@@ -50,7 +51,9 @@ export class AuthenticationContainer {
5051
this.authenticationFacade.connected$
5152
.pipe(takeUntilDestroyed())
5253
.subscribe((connected) => {
53-
if (connected) this.router.navigate(['/']);
54+
const { redirectTo } = this.route.snapshot.queryParams;
55+
if (connected && redirectTo) this.router.navigateByUrl(redirectTo);
56+
else if (connected) this.router.navigate(['/']);
5457
});
5558

5659
this.form.controls.code.valueChanges

‎packages/account/feature-auth/src/lib/containers/registration/registration.container.ts

+16-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import { MatInputModule } from '@angular/material/input';
88
import { MessageService } from '@devmx/shared-ui-global';
99
import { MatCardModule } from '@angular/material/card';
1010
import { ReactiveFormsModule } from '@angular/forms';
11-
import { RouterLink } from '@angular/router';
11+
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
1212
import { CreateUserForm } from '../../forms';
13+
import { take } from 'rxjs';
1314

1415
@Component({
1516
selector: 'devmx-registration',
@@ -23,22 +24,33 @@ import { CreateUserForm } from '../../forms';
2324
MatButtonModule,
2425
MatInputModule,
2526
MatCardModule,
26-
RouterLink,
27+
RouterModule,
2728
],
2829
})
2930
export class RegistrationContainer {
31+
authFacade = inject(AuthenticationFacade);
32+
3033
message = inject(MessageService);
3134

3235
dialog = inject(DialogFacade);
3336

34-
authFacade = inject(AuthenticationFacade);
37+
route = inject(ActivatedRoute);
38+
39+
router = inject(Router);
3540

3641
form = new CreateUserForm();
3742

3843
onSubmit() {
3944
if (this.form.valid) {
4045
const value = this.form.getRawValue();
41-
this.authFacade.createUser(value);
46+
const create$ = this.authFacade.createUser(value);
47+
create$.pipe(take(1)).subscribe(() => {
48+
const { redirectTo } = this.route.snapshot.queryParams;
49+
50+
const queryParams = { redirectTo };
51+
const path = ['/', 'conta', 'autenticacao', 'acessar'];
52+
this.router.navigate(path, { queryParams });
53+
});
4254

4355
const message = `Conta ${value.name} criada`;
4456
this.message.open({ message });

‎packages/account/feature-shell/src/lib/containers/account/account.container.html

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
/>
3131
</div>
3232

33+
<a mat-stroked-button [routerLink]="['/', 'sobre', form.controls.name.value]">
34+
Acessar página pública
35+
</a>
36+
3337
<devmx-account-social />
3438
</aside>
3539
</form>

‎packages/account/feature-shell/src/lib/containers/account/account.container.ts

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424
UserFacade,
2525
AuthenticationFacade,
2626
} from '@devmx/account-data-access';
27+
import { RouterLink } from '@angular/router';
2728

2829

2930
@Component({
@@ -43,6 +44,7 @@ import {
4344
SelectFileComponent,
4445
MatButtonModule,
4546
AvatarComponent,
47+
RouterLink
4648
],
4749
})
4850
export class AccountContainer {

0 commit comments

Comments
 (0)