diff --git a/packages/account/feature-admin/src/lib/forms/event.ts b/packages/account/feature-admin/src/lib/forms/event.ts index 886d554e..ab4b5cf4 100644 --- a/packages/account/feature-admin/src/lib/forms/event.ts +++ b/packages/account/feature-admin/src/lib/forms/event.ts @@ -65,10 +65,10 @@ export class EventForm extends FormGroup> { }), city: new FormControl(), cover: new FormControl(), - date: new FormControl('', { - nonNullable: true, - validators: [Validators.required], - }), + // date: new FormControl('', { + // nonNullable: true, + // validators: [Validators.required], + // }), time: new FormControl('', { nonNullable: true, validators: [Validators.required], diff --git a/packages/account/feature-shell/src/lib/components/album-card-list/album-card-list.component.html b/packages/account/feature-shell/src/lib/components/album-card-list/album-card-list.component.html index b196f859..61d29ca7 100644 --- a/packages/account/feature-shell/src/lib/components/album-card-list/album-card-list.component.html +++ b/packages/account/feature-shell/src/lib/components/album-card-list/album-card-list.component.html @@ -7,7 +7,7 @@ @for (album of data(); track album.id) {
{{ album.title }}
diff --git a/packages/event/data-source/src/lib/dtos/create-event.ts b/packages/event/data-source/src/lib/dtos/create-event.ts index 3dfa3ef8..989e39a4 100644 --- a/packages/event/data-source/src/lib/dtos/create-event.ts +++ b/packages/event/data-source/src/lib/dtos/create-event.ts @@ -36,10 +36,10 @@ export class CreateEventDto implements CreateEvent { @ApiPropertyOptional() date: Date; - @IsString() - @IsOptional() - @ApiPropertyOptional() - time: string; + // @IsString() + // @IsOptional() + // @ApiPropertyOptional() + // time: string; @IsString() @IsOptional() diff --git a/packages/event/data-source/src/lib/dtos/created-event.ts b/packages/event/data-source/src/lib/dtos/created-event.ts index f0aab0c1..2ab89c0f 100644 --- a/packages/event/data-source/src/lib/dtos/created-event.ts +++ b/packages/event/data-source/src/lib/dtos/created-event.ts @@ -26,8 +26,8 @@ export class CreatedEventDto { @Type(() => Date) date: Date; - @ApiProperty() - time: string; + // @ApiProperty() + // time: string; @ApiProperty() cover: string; diff --git a/packages/event/data-source/src/lib/dtos/event.ts b/packages/event/data-source/src/lib/dtos/event.ts index fdf3cd89..6c4ebcc0 100644 --- a/packages/event/data-source/src/lib/dtos/event.ts +++ b/packages/event/data-source/src/lib/dtos/event.ts @@ -26,8 +26,8 @@ export class EventDto { @Type(() => Date) date: Date; - @ApiProperty() - time: string; + // @ApiProperty() + // time: string; @ApiProperty() cover: string; diff --git a/packages/event/feature-page/src/lib/containers/event-page/event-page.container.scss b/packages/event/feature-page/src/lib/containers/event-page/event-page.container.scss index 0b40a947..18df3179 100644 --- a/packages/event/feature-page/src/lib/containers/event-page/event-page.container.scss +++ b/packages/event/feature-page/src/lib/containers/event-page/event-page.container.scss @@ -3,6 +3,7 @@ gap: 2em; display: flex; flex-direction: column; + background-color: white; h1 { margin: 0; @@ -48,6 +49,10 @@ } .event-page-content { + flex: 1; + display: flex; + flex-direction: column; + position: relative; .rsvp-button { diff --git a/packages/event/feature-page/src/lib/event-feature-page.component.ts b/packages/event/feature-page/src/lib/event-feature-page.component.ts index 3913d75d..7e85e5f6 100644 --- a/packages/event/feature-page/src/lib/event-feature-page.component.ts +++ b/packages/event/feature-page/src/lib/event-feature-page.component.ts @@ -15,6 +15,7 @@ import { filter, map } from 'rxjs'; `, styles: ` :host { + flex: 1; display: flex; flex-direction: column; } diff --git a/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.html b/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.html index 7f833e9d..b5fc5020 100644 --- a/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.html +++ b/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.html @@ -24,13 +24,13 @@ - -
{{event.time }}h
+ +
{{event.date | date: 'shortDate' }}
- -
{{event.date | date }}
+ +
{{event.date | date: 'shortTime' }}h
@if (event.address) { @@ -41,6 +41,24 @@ } + @if (eventFacade.page$ | async; as page) { + + + + @if ((page.format | showEventAddress) && page.address) { + + } + + + + @if ((page.format | showEventLink) && page.link) { + + } + + + + } + diff --git a/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.scss b/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.scss index e026380b..7cf88d43 100644 --- a/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.scss +++ b/packages/event/feature-shell/src/lib/containers/event-details/event-defails.container.scss @@ -28,6 +28,12 @@ margin-bottom: 0; } } + + &-buttons { + gap: 1em; + display: flex; + flex-flow: row wrap; + } } .rsvp-button { diff --git a/packages/event/feature-shell/src/lib/containers/event-details/event-details.container.ts b/packages/event/feature-shell/src/lib/containers/event-details/event-details.container.ts index bea1662e..de129507 100644 --- a/packages/event/feature-shell/src/lib/containers/event-details/event-details.container.ts +++ b/packages/event/feature-shell/src/lib/containers/event-details/event-details.container.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; -import { RSVPButtonComponent, RSVPForm } from '@devmx/event-ui-shared'; +import { RSVPButtonComponent, RSVPForm, ShowEventAddressPipe, ShowEventLinkPipe } from '@devmx/event-ui-shared'; import { MarkdownViewComponent } from '@devmx/shared-ui-global/markdown'; import { AuthenticationFacade } from '@devmx/account-data-access'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; @@ -11,10 +11,16 @@ import { MatCardModule } from '@angular/material/card'; import { MatListModule } from '@angular/material/list'; import { combineLatest, filter, map, tap } from 'rxjs'; import { AsyncPipe, DatePipe } from '@angular/common'; -import { RSVPFacade } from '@devmx/event-data-access'; +import { EventFacade, RSVPFacade } from '@devmx/event-data-access'; import { ReactiveFormsModule } from '@angular/forms'; import { PhotoPipe } from '@devmx/shared-ui-global'; import { EventFormatPipe } from '../../pipes'; +import { + MapsButtonComponent, + YoutubeButtonComponent, + WhatsAppButtonComponent, + CalendarButtonComponent, +} from '@devmx/shared-ui-global/button'; @Component({ selector: 'devmx-event-details', @@ -25,12 +31,18 @@ import { EventFormatPipe } from '../../pipes'; RouterModule, ReactiveFormsModule, RSVPButtonComponent, + CalendarButtonComponent, + YoutubeButtonComponent, + WhatsAppButtonComponent, + MapsButtonComponent, MatCardModule, MatListModule, MatButtonModule, IconComponent, EventFormatPipe, MarkdownViewComponent, + ShowEventAddressPipe, + ShowEventLinkPipe, PhotoPipe, AsyncPipe, DatePipe, @@ -43,6 +55,8 @@ export class EventDetailsContainer { authFacade = inject(AuthenticationFacade); + eventFacade = inject(EventFacade) + rsvpFacade = inject(RSVPFacade); event$ = this.route.data.pipe( diff --git a/packages/event/ui-shared/src/lib/components/event-card/event-card.component.html b/packages/event/ui-shared/src/lib/components/event-card/event-card.component.html index 8d8146db..592cde02 100644 --- a/packages/event/ui-shared/src/lib/components/event-card/event-card.component.html +++ b/packages/event/ui-shared/src/lib/components/event-card/event-card.component.html @@ -8,7 +8,7 @@ - @if (event.date && event.time) { + @if (event.date) {
{{ event.format | eventFormat }}
diff --git a/packages/shared/api-interfaces/src/lib/entities/event.ts b/packages/shared/api-interfaces/src/lib/entities/event.ts index d9b21d94..bf4fab8b 100644 --- a/packages/shared/api-interfaces/src/lib/entities/event.ts +++ b/packages/shared/api-interfaces/src/lib/entities/event.ts @@ -14,7 +14,7 @@ export interface Event { date?: Date; - time?: string; + // time?: string; duration?: DurationTime; diff --git a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.html b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.html index 5f3849e4..8e8a5c67 100644 --- a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.html +++ b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.html @@ -1,4 +1,4 @@
- Adicionar ao calendário + {{text()}} diff --git a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.scss b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.scss index 4def2a8b..02e1753c 100644 --- a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.scss +++ b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.scss @@ -1,11 +1,11 @@ :host { - min-width: 202px; + min-width: 180px; display: inline-flex; a[href] { width: 100%; - padding-left: 0.8em; - padding-right: 0.8em; + padding-left: 0.6em; + padding-right: 0.6em; border-radius: 8px; } diff --git a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.ts b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.ts index d0393a2d..65eace50 100644 --- a/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.ts +++ b/packages/shared/ui-global/button/src/lib/calendar-button/calendar-button.component.ts @@ -19,6 +19,8 @@ import { export class CalendarButtonComponent implements AfterViewInit { data = input.required(); + text = input('Adicionar ao calendário'); + link = signal(''); ngAfterViewInit() { diff --git a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.html b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.html index ba602694..427094df 100644 --- a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.html +++ b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.html @@ -1,4 +1,4 @@ - Abrir com Google Maps + {{text()}} diff --git a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.scss b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.scss index 4def2a8b..02e1753c 100644 --- a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.scss +++ b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.scss @@ -1,11 +1,11 @@ :host { - min-width: 202px; + min-width: 180px; display: inline-flex; a[href] { width: 100%; - padding-left: 0.8em; - padding-right: 0.8em; + padding-left: 0.6em; + padding-right: 0.6em; border-radius: 8px; } diff --git a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.ts b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.ts index 1908513d..f06f3ecf 100644 --- a/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.ts +++ b/packages/shared/ui-global/button/src/lib/maps-button/maps-button.component.ts @@ -21,6 +21,8 @@ import { export class MapsButtonComponent implements AfterViewInit { data = input.required(); + text = input('Abrir com Google Maps'); + platform = inject(Platform); link = signal(''); diff --git a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.html b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.html index abc970cf..7647b8d5 100644 --- a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.html +++ b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.html @@ -1,4 +1,4 @@ - Enviar no WhatsApp + {{text()}} diff --git a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.scss b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.scss index 4def2a8b..02e1753c 100644 --- a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.scss +++ b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.scss @@ -1,11 +1,11 @@ :host { - min-width: 202px; + min-width: 180px; display: inline-flex; a[href] { width: 100%; - padding-left: 0.8em; - padding-right: 0.8em; + padding-left: 0.6em; + padding-right: 0.6em; border-radius: 8px; } diff --git a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.ts b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.ts index 58d8b257..8d553a96 100644 --- a/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.ts +++ b/packages/shared/ui-global/button/src/lib/whats-app-button/whats-app-button.component.ts @@ -21,6 +21,8 @@ import { export class WhatsAppButtonComponent implements AfterViewInit { data = input.required(); + text = input('Enviar no WhatsApp'); + platform = inject(Platform); link = signal(''); diff --git a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.html b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.html index 5beb48b8..9068f80f 100644 --- a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.html +++ b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.html @@ -1,4 +1,4 @@ - Abrir com YouTube + {{text()}} diff --git a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.scss b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.scss index 4def2a8b..02e1753c 100644 --- a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.scss +++ b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.scss @@ -1,11 +1,11 @@ :host { - min-width: 202px; + min-width: 180px; display: inline-flex; a[href] { width: 100%; - padding-left: 0.8em; - padding-right: 0.8em; + padding-left: 0.6em; + padding-right: 0.6em; border-radius: 8px; } diff --git a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.ts b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.ts index fe146fb1..9436558b 100644 --- a/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.ts +++ b/packages/shared/ui-global/button/src/lib/youtube-button/youtube-button.component.ts @@ -21,6 +21,8 @@ import { export class YoutubeButtonComponent implements AfterViewInit { data = input.required(); + text = input('Abrir com YouTube') + platform = inject(Platform); link = signal(''); diff --git a/packages/shared/ui-global/shell/src/lib/app-shell/app-shell.component.scss b/packages/shared/ui-global/shell/src/lib/app-shell/app-shell.component.scss index 06cd119e..16960186 100644 --- a/packages/shared/ui-global/shell/src/lib/app-shell/app-shell.component.scss +++ b/packages/shared/ui-global/shell/src/lib/app-shell/app-shell.component.scss @@ -29,6 +29,7 @@ display: flex; flex-direction: column; max-width: 1280px; + width: calc(100% - 2em); // height: calc(100dvh - 64px); height: 100%; overflow: auto;