From 9575d7233ae3b15f7980172e7c6ddb7e630f8501 Mon Sep 17 00:00:00 2001 From: paulinaszkudlarek <83571355+paulinaszkudlarek@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:15:40 +0200 Subject: [PATCH] #78 - add 24 meetup data (#79) * wip * Add header to meetups page * Work on search bar and buttons * wip * Design of meetups table * Design of SortButton * Separate check icon * Design headers * wip * Design of filter and sort buttons * Design of filter and sort buttons * Padding :) * Expand clickable button area on mobile * wip * Rounded buttons * Add 24 meetup data * Add new speaker * Add minimalized images * #78 - fix typo and add links to YouTube --------- Co-authored-by: EwelinaSkrzypacz --- backend/ValueObjects/Meetup.php | 3 + backend/ValueObjects/Person.php | 3 + backend/ValueObjects/Speaker.php | 1 + backend/builder.php | 2 + .../components/Landing/MeetupIndicator.vue | 2 +- frontend/components/Meetup/MeetupHeader.vue | 3 - frontend/components/Meetups/MeetupsList.vue | 4 +- frontend/components/Meetups/SortButton.vue | 2 +- frontend/components/People/PeopleList.vue | 4 +- frontend/pages/People.vue | 5 +- public/images/companies/escola.webp | Bin 0 -> 2926 bytes public/images/speakers/adammatysiak_min.webp | Bin 0 -> 15642 bytes public/images/speakers/aleksandertabor.webp | Bin 0 -> 50418 bytes .../images/speakers/aleksandertabor_min.webp | Bin 0 -> 13430 bytes .../speakers/amadeuszkozlowski_min.webp | Bin 0 -> 19994 bytes public/images/speakers/andrzejfenzel_min.webp | Bin 0 -> 20732 bytes .../images/speakers/andrzejzielinski_min.webp | Bin 0 -> 19190 bytes public/images/speakers/filipzdunek.webp | Bin 59976 -> 66008 bytes public/images/speakers/filipzdunek_min.webp | Bin 0 -> 22126 bytes .../images/speakers/hubertsitarski_min.webp | Bin 0 -> 8794 bytes .../images/speakers/jaceksawoszczuk_min.webp | Bin 0 -> 3046 bytes public/images/speakers/joannarewak.webp | Bin 32324 -> 52664 bytes public/images/speakers/joannarewak_min.webp | Bin 0 -> 17492 bytes public/images/speakers/kamilbartczak_min.webp | Bin 0 -> 6902 bytes .../images/speakers/kamilkielczewski_min.webp | Bin 0 -> 4754 bytes public/images/speakers/kamilpiech_min.webp | Bin 0 -> 15440 bytes public/images/speakers/kamilpietka_min.webp | Bin 0 -> 24566 bytes public/images/speakers/karolbarcki_min.webp | Bin 0 -> 49418 bytes .../images/speakers/katarzynazurek_min.webp | Bin 0 -> 14260 bytes .../speakers/krzysztofczechowski_min.webp | Bin 0 -> 16076 bytes public/images/speakers/krzysztofrewak.webp | Bin 635292 -> 64408 bytes .../images/speakers/krzysztofrewak_min.webp | Bin 0 -> 13934 bytes public/images/speakers/marcinlenkowski.webp | Bin 0 -> 25526 bytes .../images/speakers/marcinlenkowski_min.webp | Bin 0 -> 8008 bytes public/images/speakers/marcintracz.webp | Bin 476384 -> 26336 bytes public/images/speakers/marcintracz_min.webp | Bin 0 -> 8866 bytes public/images/speakers/marektenus_min.webp | Bin 0 -> 18540 bytes public/images/speakers/mateuszgarbarczyk.webp | Bin 692770 -> 27674 bytes .../speakers/mateuszgarbarczyk_min.webp | Bin 0 -> 12874 bytes public/images/speakers/mateuszlencki_min.webp | Bin 0 -> 2184 bytes public/images/speakers/mateuszrusyn_min.webp | Bin 0 -> 5028 bytes public/images/speakers/michalmysko_min.webp | Bin 0 -> 7978 bytes public/images/speakers/miloszdziurzynski.webp | Bin 174224 -> 19066 bytes .../speakers/miloszdziurzynski_min.webp | Bin 0 -> 6608 bytes public/images/speakers/patrykfilipiak.webp | Bin 327702 -> 28362 bytes .../images/speakers/patrykfilipiak_min.webp | Bin 0 -> 7500 bytes .../images/speakers/pawelnuckowski_min.webp | Bin 0 -> 12410 bytes .../images/speakers/pawelspychalski_min.webp | Bin 0 -> 14824 bytes public/images/speakers/piotrnowak_min.webp | Bin 0 -> 3090 bytes public/images/speakers/piotrsuchanek_min.webp | Bin 0 -> 18160 bytes public/images/speakers/przemekszustak.webp | Bin 106332 -> 94902 bytes .../images/speakers/przemekszustak_min.webp | Bin 0 -> 38610 bytes public/images/speakers/robertkabat_min.webp | Bin 0 -> 17258 bytes .../images/speakers/tomekzmudzinski_min.webp | Bin 0 -> 14034 bytes resources/companies.json | 14 +++++ .../2023-06-06-laravel-poland-meetup-24.json | 55 ++++++++++++++++++ resources/people.json | 50 +++++++++++++++- 57 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 public/images/companies/escola.webp create mode 100644 public/images/speakers/adammatysiak_min.webp create mode 100644 public/images/speakers/aleksandertabor.webp create mode 100644 public/images/speakers/aleksandertabor_min.webp create mode 100644 public/images/speakers/amadeuszkozlowski_min.webp create mode 100644 public/images/speakers/andrzejfenzel_min.webp create mode 100644 public/images/speakers/andrzejzielinski_min.webp create mode 100644 public/images/speakers/filipzdunek_min.webp create mode 100644 public/images/speakers/hubertsitarski_min.webp create mode 100644 public/images/speakers/jaceksawoszczuk_min.webp create mode 100644 public/images/speakers/joannarewak_min.webp create mode 100644 public/images/speakers/kamilbartczak_min.webp create mode 100644 public/images/speakers/kamilkielczewski_min.webp create mode 100644 public/images/speakers/kamilpiech_min.webp create mode 100644 public/images/speakers/kamilpietka_min.webp create mode 100644 public/images/speakers/karolbarcki_min.webp create mode 100644 public/images/speakers/katarzynazurek_min.webp create mode 100644 public/images/speakers/krzysztofczechowski_min.webp create mode 100644 public/images/speakers/krzysztofrewak_min.webp create mode 100644 public/images/speakers/marcinlenkowski.webp create mode 100644 public/images/speakers/marcinlenkowski_min.webp create mode 100644 public/images/speakers/marcintracz_min.webp create mode 100644 public/images/speakers/marektenus_min.webp create mode 100644 public/images/speakers/mateuszgarbarczyk_min.webp create mode 100644 public/images/speakers/mateuszlencki_min.webp create mode 100644 public/images/speakers/mateuszrusyn_min.webp create mode 100644 public/images/speakers/michalmysko_min.webp create mode 100644 public/images/speakers/miloszdziurzynski_min.webp create mode 100644 public/images/speakers/patrykfilipiak_min.webp create mode 100644 public/images/speakers/pawelnuckowski_min.webp create mode 100644 public/images/speakers/pawelspychalski_min.webp create mode 100644 public/images/speakers/piotrnowak_min.webp create mode 100644 public/images/speakers/piotrsuchanek_min.webp create mode 100644 public/images/speakers/przemekszustak_min.webp create mode 100644 public/images/speakers/robertkabat_min.webp create mode 100644 public/images/speakers/tomekzmudzinski_min.webp create mode 100644 resources/meetups/2023-06-06-laravel-poland-meetup-24.json 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(() => {
- +