Skip to content

Commit 49f4a41

Browse files
guiseekguiseek
committed
fix(event): remove propriedade time deepreciada
1 parent 965a679 commit 49f4a41

File tree

25 files changed

+90
-37
lines changed

25 files changed

+90
-37
lines changed

‎packages/account/feature-admin/src/lib/forms/event.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ export class EventForm extends FormGroup<TypedForm<Event>> {
6565
}),
6666
city: new FormControl(),
6767
cover: new FormControl(),
68-
date: new FormControl('', {
69-
nonNullable: true,
70-
validators: [Validators.required],
71-
}),
68+
// date: new FormControl('', {
69+
// nonNullable: true,
70+
// validators: [Validators.required],
71+
// }),
7272
time: new FormControl('', {
7373
nonNullable: true,
7474
validators: [Validators.required],

‎packages/account/feature-shell/src/lib/components/album-card-list/album-card-list.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@for (album of data(); track album.id) {
88
<a
99
mat-list-item
10-
[routerLink]="['/', 'albuns', { outlets: { right: [album.id] } }]"
10+
[routerLink]="['/', 'albuns', album.id]"
1111
>
1212
<devmx-icon matListItemIcon name="photo" />
1313
<div matListItemTitle>{{ album.title }}</div>

‎packages/event/data-source/src/lib/dtos/create-event.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ export class CreateEventDto implements CreateEvent {
3636
@ApiPropertyOptional()
3737
date: Date;
3838

39-
@IsString()
40-
@IsOptional()
41-
@ApiPropertyOptional()
42-
time: string;
39+
// @IsString()
40+
// @IsOptional()
41+
// @ApiPropertyOptional()
42+
// time: string;
4343

4444
@IsString()
4545
@IsOptional()

‎packages/event/data-source/src/lib/dtos/created-event.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export class CreatedEventDto {
2626
@Type(() => Date)
2727
date: Date;
2828

29-
@ApiProperty()
30-
time: string;
29+
// @ApiProperty()
30+
// time: string;
3131

3232
@ApiProperty()
3333
cover: string;

‎packages/event/data-source/src/lib/dtos/event.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export class EventDto {
2626
@Type(() => Date)
2727
date: Date;
2828

29-
@ApiProperty()
30-
time: string;
29+
// @ApiProperty()
30+
// time: string;
3131

3232
@ApiProperty()
3333
cover: string;

‎packages/event/feature-page/src/lib/containers/event-page/event-page.container.scss

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
gap: 2em;
44
display: flex;
55
flex-direction: column;
6+
background-color: white;
67

78
h1 {
89
margin: 0;
@@ -48,6 +49,10 @@
4849
}
4950

5051
.event-page-content {
52+
flex: 1;
53+
display: flex;
54+
flex-direction: column;
55+
5156
position: relative;
5257

5358
.rsvp-button {

‎packages/event/feature-page/src/lib/event-feature-page.component.ts

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { filter, map } from 'rxjs';
1515
`,
1616
styles: `
1717
:host {
18+
flex: 1;
1819
display: flex;
1920
flex-direction: column;
2021
}

‎packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.html

+22-4
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
</mat-list-item>
2525

2626
<mat-list-item>
27-
<devmx-icon matListItemIcon name="alarm-clock-alert" />
28-
<div matListItemTitle>{{event.time }}h</div>
27+
<devmx-icon matListItemIcon name="calendar" />
28+
<div matListItemTitle>{{event.date | date: 'shortDate' }}</div>
2929
</mat-list-item>
3030

3131
<mat-list-item>
32-
<devmx-icon matListItemIcon name="calendar" />
33-
<div matListItemTitle>{{event.date | date }}</div>
32+
<devmx-icon matListItemIcon name="alarm-clock-alert" />
33+
<div matListItemTitle>{{event.date | date: 'shortTime' }}h</div>
3434
</mat-list-item>
3535

3636
@if (event.address) {
@@ -41,6 +41,24 @@
4141
}
4242
</mat-list>
4343

44+
@if (eventFacade.page$ | async; as page) {
45+
<mat-card-content class="event-card-buttons">
46+
<devmx-calendar-button [data]="page" text="Definir lembrete" />
47+
48+
@if ((page.format | showEventAddress) && page.address) {
49+
<devmx-maps-button [data]="page" text="Ver no mapa" />
50+
}
51+
52+
<!-- -->
53+
54+
@if ((page.format | showEventLink) && page.link) {
55+
<devmx-youtube-button [data]="page" text="Assistir" />
56+
}
57+
58+
<devmx-whats-app-button [data]="page" text="Compartilhar" />
59+
</mat-card-content>
60+
}
61+
4462
<mat-card-content>
4563
<devmx-markdown-view [content]="event.description" />
4664
</mat-card-content>

‎packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.scss

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
margin-bottom: 0;
2929
}
3030
}
31+
32+
&-buttons {
33+
gap: 1em;
34+
display: flex;
35+
flex-flow: row wrap;
36+
}
3137
}
3238

3339
.rsvp-button {

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

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
2-
import { RSVPButtonComponent, RSVPForm } from '@devmx/event-ui-shared';
2+
import { RSVPButtonComponent, RSVPForm, ShowEventAddressPipe, ShowEventLinkPipe } from '@devmx/event-ui-shared';
33
import { MarkdownViewComponent } from '@devmx/shared-ui-global/markdown';
44
import { AuthenticationFacade } from '@devmx/account-data-access';
55
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -11,10 +11,16 @@ import { MatCardModule } from '@angular/material/card';
1111
import { MatListModule } from '@angular/material/list';
1212
import { combineLatest, filter, map, tap } from 'rxjs';
1313
import { AsyncPipe, DatePipe } from '@angular/common';
14-
import { RSVPFacade } from '@devmx/event-data-access';
14+
import { EventFacade, RSVPFacade } from '@devmx/event-data-access';
1515
import { ReactiveFormsModule } from '@angular/forms';
1616
import { PhotoPipe } from '@devmx/shared-ui-global';
1717
import { EventFormatPipe } from '../../pipes';
18+
import {
19+
MapsButtonComponent,
20+
YoutubeButtonComponent,
21+
WhatsAppButtonComponent,
22+
CalendarButtonComponent,
23+
} from '@devmx/shared-ui-global/button';
1824

1925
@Component({
2026
selector: 'devmx-event-details',
@@ -25,12 +31,18 @@ import { EventFormatPipe } from '../../pipes';
2531
RouterModule,
2632
ReactiveFormsModule,
2733
RSVPButtonComponent,
34+
CalendarButtonComponent,
35+
YoutubeButtonComponent,
36+
WhatsAppButtonComponent,
37+
MapsButtonComponent,
2838
MatCardModule,
2939
MatListModule,
3040
MatButtonModule,
3141
IconComponent,
3242
EventFormatPipe,
3343
MarkdownViewComponent,
44+
ShowEventAddressPipe,
45+
ShowEventLinkPipe,
3446
PhotoPipe,
3547
AsyncPipe,
3648
DatePipe,
@@ -43,6 +55,8 @@ export class EventDetailsContainer {
4355

4456
authFacade = inject(AuthenticationFacade);
4557

58+
eventFacade = inject(EventFacade)
59+
4660
rsvpFacade = inject(RSVPFacade);
4761

4862
event$ = this.route.data.pipe(

‎packages/event/ui-shared/src/lib/components/event-card/event-card.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</mat-card-header>
99

1010
<mat-list>
11-
@if (event.date && event.time) {
11+
@if (event.date) {
1212
<mat-list-item>
1313
<devmx-icon matListItemIcon name="transport/flag-pin" />
1414
<div matListItemTitle>{{ event.format | eventFormat }}</div>

‎packages/shared/api-interfaces/src/lib/entities/event.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface Event {
1414

1515
date?: Date;
1616

17-
time?: string;
17+
// time?: string;
1818

1919
duration?: DurationTime;
2020

‎packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<a mat-raised-button [href]="link()" target="_blank" rel="noopener,noreferrer">
22
<devmx-icon matPreffix name="calendar" size="22" />
3-
<span>Adicionar ao calendário</span>
3+
<span>{{text()}}</span>
44
</a>

‎packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:host {
2-
min-width: 202px;
2+
min-width: 180px;
33
display: inline-flex;
44

55
a[href] {
66
width: 100%;
7-
padding-left: 0.8em;
8-
padding-right: 0.8em;
7+
padding-left: 0.6em;
8+
padding-right: 0.6em;
99
border-radius: 8px;
1010
}
1111

‎packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
export class CalendarButtonComponent implements AfterViewInit {
2020
data = input.required<EventPage>();
2121

22+
text = input('Adicionar ao calendário');
23+
2224
link = signal('');
2325

2426
ngAfterViewInit() {

‎packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<a mat-raised-button [href]="link()" target="_blank" rel="noopener,noreferrer">
22
<devmx-icon matPreffix name="transport/map-pin" size="22" />
3-
<span>Abrir com Google Maps</span>
3+
<span>{{text()}}</span>
44
</a>

‎packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:host {
2-
min-width: 202px;
2+
min-width: 180px;
33
display: inline-flex;
44

55
a[href] {
66
width: 100%;
7-
padding-left: 0.8em;
8-
padding-right: 0.8em;
7+
padding-left: 0.6em;
8+
padding-right: 0.6em;
99
border-radius: 8px;
1010
}
1111

‎packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import {
2121
export class MapsButtonComponent implements AfterViewInit {
2222
data = input.required<EventPage>();
2323

24+
text = input('Abrir com Google Maps');
25+
2426
platform = inject(Platform);
2527

2628
link = signal('');

‎packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<a mat-raised-button [href]="link()" target="_blank" rel="noopener,noreferrer">
22
<devmx-icon matPreffix name="social/whatsapp" size="24" />
3-
<span>Enviar no WhatsApp</span>
3+
<span>{{text()}}</span>
44
</a>

‎packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:host {
2-
min-width: 202px;
2+
min-width: 180px;
33
display: inline-flex;
44

55
a[href] {
66
width: 100%;
7-
padding-left: 0.8em;
8-
padding-right: 0.8em;
7+
padding-left: 0.6em;
8+
padding-right: 0.6em;
99
border-radius: 8px;
1010
}
1111

‎packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import {
2121
export class WhatsAppButtonComponent implements AfterViewInit {
2222
data = input.required<EventPage>();
2323

24+
text = input('Enviar no WhatsApp');
25+
2426
platform = inject(Platform);
2527

2628
link = signal('');

‎packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<a mat-raised-button [href]="link()" target="_blank" rel="noopener,noreferrer">
22
<devmx-icon matPreffix name="social/youtube" size="22" />
3-
<span>Abrir com YouTube</span>
3+
<span>{{text()}}</span>
44
</a>

‎packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
:host {
2-
min-width: 202px;
2+
min-width: 180px;
33
display: inline-flex;
44

55
a[href] {
66
width: 100%;
7-
padding-left: 0.8em;
8-
padding-right: 0.8em;
7+
padding-left: 0.6em;
8+
padding-right: 0.6em;
99
border-radius: 8px;
1010
}
1111

‎packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import {
2121
export class YoutubeButtonComponent implements AfterViewInit {
2222
data = input.required<EventPage>();
2323

24+
text = input('Abrir com YouTube')
25+
2426
platform = inject(Platform);
2527

2628
link = signal('');

‎packages/shared/ui-global/shell/src/lib/app-shell/app-shell.component.scss

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
display: flex;
3030
flex-direction: column;
3131
max-width: 1280px;
32+
width: calc(100% - 2em);
3233
// height: calc(100dvh - 64px);
3334
height: 100%;
3435
overflow: auto;

0 commit comments

Comments
 (0)