diff --git a/backend/ValueObjects/Meetup.php b/backend/ValueObjects/Meetup.php index d2759cb..2404df8 100644 --- a/backend/ValueObjects/Meetup.php +++ b/backend/ValueObjects/Meetup.php @@ -19,6 +19,7 @@ public function __construct( public readonly string $name, public readonly ?string $location = null, public readonly ?Carbon $date = null, + public readonly ?string $signUpLink = null, public readonly ?string $facebook = null, public readonly Collection $presentations = new Collection(), ) { @@ -31,6 +32,7 @@ public function toListedEntry(): array "id" => $this->id, "name" => $this->name, "location" => $this->location, + "signUpLink" => $this->signUpLink, "date" => $this->date->format("Y-m-d H:i:s"), "dateFull" => $this->date->isoFormat("LL, LT"), "presentations" => $this->presentations->map(fn(Presentation $presentation): array => $presentation->toMeetupEntry()), @@ -46,6 +48,7 @@ public function toDetailedEntry(): array "location" => $this->location, "date" => $this->date->format("Y-m-d H:i:s"), "dateFull" => $this->date->isoFormat("LL, LT"), + "signUpLink" => $this->signUpLink, "presentations" => $this->presentations->map(fn(Presentation $presentation): array => $presentation->toMeetupEntry()), "facebook" => $this->facebook, ]; diff --git a/backend/ValueObjects/Person.php b/backend/ValueObjects/Person.php index b563763..56a6c8c 100644 --- a/backend/ValueObjects/Person.php +++ b/backend/ValueObjects/Person.php @@ -15,6 +15,7 @@ public function __construct( public readonly string $id, public readonly string $name, public readonly ?string $image = null, + public readonly ?string $imageMin = null, public readonly ?string $bio = null, public readonly ?string $linkedin = null, public readonly Collection $meetups = new Collection(), @@ -29,6 +30,7 @@ public function toListedEntry(): array "name" => $this->name, "slug" => $this->slug, "image" => $this->image, + "imageMin" => $this->imageMin, "bio" => $this->bio, "linkedin" => $this->linkedin, "avatar" => "https://ui-avatars.com/api/?background=random&font-size=.33&size-128&rounded=true&name=" . str_replace(" ", "-", $this->name), @@ -42,6 +44,7 @@ public function toMeetupListEntry() "name" => $this->name, "slug" => $this->slug, "image" => $this->image, + "imageMin" => $this->imageMin, "bio" => $this->bio, "linkedin" => $this->linkedin, "avatar" => "https://ui-avatars.com/api/?background=random&font-size=.33&size-128&rounded=true&name=" . str_replace(" ", "-", $this->name), diff --git a/backend/ValueObjects/Speaker.php b/backend/ValueObjects/Speaker.php index e7a8634..df04951 100644 --- a/backend/ValueObjects/Speaker.php +++ b/backend/ValueObjects/Speaker.php @@ -17,6 +17,7 @@ public function toMeetupDetailsEntry(): array "id" => $this->person->id, "name" => $this->person->name, "image" => $this->person->image, + "imageMin" => $this->person->imageMin, "slug" => $this->person->slug, "avatar" => "https://ui-avatars.com/api/?background=random&font-size=.33&size-128&rounded=true&name=" . str_replace(" ", "-", $this->person->name), "linkedin" => $this->person->linkedin, diff --git a/backend/builder.php b/backend/builder.php index 4194dbb..7d3eeb4 100644 --- a/backend/builder.php +++ b/backend/builder.php @@ -36,6 +36,7 @@ function mapData(Collection $people, Collection $companies, Collection $meetups) id: $person["id"], name: $person["name"], image: $person["image"] ?? "", + imageMin: $person["imageMin"] ?? "", bio: $person["bio"] ?? "", linkedin: $person["linkedin"] ?? "", )); @@ -54,6 +55,7 @@ function mapData(Collection $people, Collection $companies, Collection $meetups) $meetups = $meetups->map(fn(array $meetup): Meetup => new Meetup( name: $meetup["name"], location: $meetup["location"] ?? "", + signUpLink: $meetup["signUpLink"] ?? "", date: isset($meetup["date"]) ? Carbon::parse($meetup["date"])->locale("pl_PL") : null, facebook: $meetup["facebook"] ?? null, presentations: Collection::make($meetup["presentations"])->map( diff --git a/frontend/components/Landing/MeetupIndicator.vue b/frontend/components/Landing/MeetupIndicator.vue index d1209a3..f582bee 100644 --- a/frontend/components/Landing/MeetupIndicator.vue +++ b/frontend/components/Landing/MeetupIndicator.vue @@ -35,7 +35,7 @@ const computedNextMeetup = computed(() => {

- Zapisz się! + Zapisz się! Poprzednie meetupy diff --git a/frontend/components/Meetup/MeetupHeader.vue b/frontend/components/Meetup/MeetupHeader.vue index 32f8a28..d0069af 100644 --- a/frontend/components/Meetup/MeetupHeader.vue +++ b/frontend/components/Meetup/MeetupHeader.vue @@ -35,9 +35,6 @@ defineProps({
-
diff --git a/frontend/components/Meetups/MeetupsList.vue b/frontend/components/Meetups/MeetupsList.vue index 4a81a18..7a7fb52 100644 --- a/frontend/components/Meetups/MeetupsList.vue +++ b/frontend/components/Meetups/MeetupsList.vue @@ -28,8 +28,8 @@ const findNextMeetup = computed(() => { const meetupSpeakers = ( meetup ) => { let setSpeakers = new Set() - meetup.presentations.forEach(({ speakers }) => speakers.forEach(({ name, avatar, image }) => - setSpeakers.add({ name: name, avatar: avatar, image:image }), + meetup.presentations.forEach(({ speakers }) => speakers.forEach(({ name, avatar, imageMin }) => + setSpeakers.add({ name: name, avatar: avatar, image:imageMin }), )) return setSpeakers } diff --git a/frontend/components/Meetups/SortButton.vue b/frontend/components/Meetups/SortButton.vue index 99866de..1b49d5b 100644 --- a/frontend/components/Meetups/SortButton.vue +++ b/frontend/components/Meetups/SortButton.vue @@ -55,7 +55,7 @@ onMounted(() => {
- +