From e947b7d1e9bcd225489fccfeb7fd332c8c87c8c0 Mon Sep 17 00:00:00 2001 From: Ewelina Skrzypacz <56546832+EwelinaSkrzypacz@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:18:41 +0200 Subject: [PATCH] #367 - change apartment number (#371) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * - wip * Update lang/en/content.php Co-authored-by: Jakub Wójcik <92044526+vojcc@users.noreply.github.com> * - wip * - wip * - wip --------- Co-authored-by: Jakub Wójcik <92044526+vojcc@users.noreply.github.com> --- app/Http/Controllers/NewsController.php | 8 +++----- database/seeders/LocalEnvironmentSeeder.php | 2 +- lang/en/content.php | 6 +++--- lang/pl/content.php | 6 +++--- resources/views/about.blade.php | 2 +- resources/views/components/small-primary-button.blade.php | 2 +- resources/views/home.blade.php | 4 ++-- resources/views/news.blade.php | 7 +------ resources/views/single-news.blade.php | 6 +++--- 9 files changed, 18 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 6632e5c0..0e34eacc 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -5,7 +5,6 @@ namespace Blumilk\Website\Http\Controllers; use Blumilk\Website\Http\Resources\NewsResource; -use Blumilk\Website\Http\Resources\TagResource; use Blumilk\Website\Models\News; use Blumilk\Website\Models\Tag; use Illuminate\Contracts\View\Factory; @@ -30,8 +29,7 @@ public function index(Request $request, Factory $factory): View ->where("published", true) ->when($tag, fn($query, $tag) => $query->whereJsonContains("tags", $tag->id)) ->latest("published_at") - ->paginate(7) - ->appends(["tag" => $tagFromQuery]); + ->paginate(7); $tags = Tag::query() ->where("is_primary", true) ->get(); @@ -81,9 +79,9 @@ public function get(Request $request, Factory $factory, string $slug): View return $factory->make("single-news") ->with("news", $news->resolve()) - ->with("tags", TagResource::collection($newsTags->where("as_person", false))->resolve()) + ->with("tags", $newsTags->where("as_person", false)->pluck("title")) ->with("tagsNewsCount", $tagsNewsCount) - ->with("peopleTags", TagResource::collection($newsTags->where("as_person", true))->resolve()) + ->with("peopleTags", $newsTags->where("as_person", true)->pluck("title")) ->with("recommendedNews", NewsResource::collection($recommendedNews)->resolve()) ->with("articleUrl", $articleUrl); } diff --git a/database/seeders/LocalEnvironmentSeeder.php b/database/seeders/LocalEnvironmentSeeder.php index 08aabc9d..80b99710 100644 --- a/database/seeders/LocalEnvironmentSeeder.php +++ b/database/seeders/LocalEnvironmentSeeder.php @@ -22,7 +22,7 @@ public function run(): void $this->call(ProjectsSeeder::class); Tag::factory()->count(12)->create(); - News::factory()->count(12)->create(); + News::factory()->count(70)->create(); ContactForm::factory()->count(12)->create(); Reference::factory()->count(12)->create(); } diff --git a/lang/en/content.php b/lang/en/content.php index 3c7c3e17..0b6d76d2 100644 --- a/lang/en/content.php +++ b/lang/en/content.php @@ -234,7 +234,7 @@ "message" => "Message", ], "location" => [ - "address" => "ul. Najświętszej Marii Panny 5F/5", + "address" => "ul. Najświętszej Marii Panny 5F/3", "PostalCode" => "59-220 Legnica", ], "phone" => "+48 579 710 703", @@ -256,7 +256,7 @@ "text_2" => "Blumilk sp. z o.o.,", "text_3" => "with its registered office in Legnica, entered by the District Court for Wrocław-Fabryczna in Wrocław, 9th Commercial Division, into the register of entrepreneurs of the National Court Register under the number 0000866755.", "text_4" => "Official address: Blumilk Sp. z o. o., ul. rtm. Witolda Pilecki 14, 59-220 Legnica, Poland.", - "text_5" => "Office address: Blumilk Sp. z o. o., ul. Najściej Marii Panny 5F/5, 59-220 Legnica, Poland.", + "text_5" => "Office address: Blumilk Sp. z o. o., ul. Najświętszej Marii Panny 5F/3, 59-220 Legnica, Poland.", ], "point_2" => "How can you contact us?", "text_2" => [ @@ -336,7 +336,7 @@ ], "office_address" => [ "title" => "Office address", - "street" => "ul. Najświętszej Marii Panny 5F/5", + "street" => "ul. Najświętszej Marii Panny 5F/3", ], "phone" => "+48 579 710 703", "email" => "office@blumilk.pl", diff --git a/lang/pl/content.php b/lang/pl/content.php index 89247ad8..d634f2bc 100644 --- a/lang/pl/content.php +++ b/lang/pl/content.php @@ -231,7 +231,7 @@ "message" => "Wiadomość", ], "location" => [ - "address" => "ul. Najświętszej Marii Panny 5F/5", + "address" => "ul. Najświętszej Marii Panny 5F/3", "PostalCode" => "59-220 Legnica", ], "phone" => "+48 579 710 703", @@ -253,7 +253,7 @@ "text_2" => "Blumilk Spółka z ograniczoną odpowiedzialnością,", "text_3" => "z siedzibą w Legnicy, wpisana przez Sąd Rejonowy dla Wrocławia-Fabrycznej we Wrocławiu IX Wydział Gospodarczy do rejestru przedsiębiorców KRS pod numerem 0000866755.", "text_4" => "Adres urzędowy: Blumilk Sp. z o.o., ul. rtm. Witolda Pileckiego 14, 59-220 Legnica, Polska.", - "text_5" => "Adres biura: Blumilk Sp. z o.o., ul. Najświętszej Marii Panny 5F/5, 59-220 Legnica, Polska.", + "text_5" => "Adres biura: Blumilk Sp. z o.o., ul. Najświętszej Marii Panny 5F/3, 59-220 Legnica, Polska.", ], "point_2" => "Jak możesz się z nami skontaktować?", "text_2" => [ @@ -333,7 +333,7 @@ ], "office_address" => [ "title" => "Adres biura", - "street" => "ul. Najświętszej Marii Panny 5F/5", + "street" => "ul. Najświętszej Marii Panny 5F/3", ], "phone" => "+48 579 710 703", "email" => "office@blumilk.pl", diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php index 71319850..48d48030 100644 --- a/resources/views/about.blade.php +++ b/resources/views/about.blade.php @@ -29,7 +29,7 @@ alt="{{ __('alt.about') }}"/> -
+
{{ __("content.about.section_2.stat_1") }}
diff --git a/resources/views/components/small-primary-button.blade.php b/resources/views/components/small-primary-button.blade.php index 33143ec9..9275752f 100644 --- a/resources/views/components/small-primary-button.blade.php +++ b/resources/views/components/small-primary-button.blade.php @@ -1,5 +1,5 @@ {{$slot}} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 4dd6a8d6..a9d7f76f 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -44,7 +44,7 @@ class="client-icon h-auto w-44 m-auto grayscale hover:grayscale-0 transform tran
-
+

{{ __("content.home.section_3.title_1") }}

{{ __("content.home.section_3.subtitle_1") }} @@ -105,7 +105,7 @@ class="client-icon h-auto w-44 m-auto grayscale hover:grayscale-0 transform tran
- {{ __("buttons.see_more_projects") }} + {{ __("buttons.see_more_projects") }}
diff --git a/resources/views/news.blade.php b/resources/views/news.blade.php index 85538319..52565dab 100644 --- a/resources/views/news.blade.php +++ b/resources/views/news.blade.php @@ -82,12 +82,7 @@ class="flex flex-wrap gap-y-2 pt-2"> ])>{{ $tag }} @endforeach @if($selectedTag && $tags->contains($selectedTag) === false) - $selectedTag && $tag === $selectedTag, - 'text-gray-400' => !($selectedTag && $tag === $selectedTag), - ])> + {{ $selectedTag }} @endif diff --git a/resources/views/single-news.blade.php b/resources/views/single-news.blade.php index 80bca706..34746f40 100644 --- a/resources/views/single-news.blade.php +++ b/resources/views/single-news.blade.php @@ -77,10 +77,10 @@ class="w-full h-auto xl:h-[343px] object-cover aspect-square xl:aspect-auto"> - {{ $tag['title'] }} + {{ $tag }} - {{ $tagsNewsCount[$tag['title']] }} + {{ $tagsNewsCount[$tag] }} @endforeach @@ -92,7 +92,7 @@ class="flex justify-between py-3 font-light hover:text-website-normal hover:font @foreach($peopleTags as $tag) - {{ $tag['title'] }} + {{ $tag }} @endforeach