From f4113a6760204878d03a9e0f012af26cf3f69b6f Mon Sep 17 00:00:00 2001 From: vojcc <92044526+vojcc@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:13:42 +0100 Subject: [PATCH 1/2] #140 - add update and delete opinion features (#144) --- app/Http/Requests/CityOpinionRequest.php | 2 +- app/Importers/BirdDataImporter.php | 1 - app/Importers/DataImporter.php | 26 +-- app/Importers/LimeDataImporter.php | 1 - app/Importers/SpinDataImporter.php | 1 - lang/pl.json | 31 ++-- lang/pl/validation.php | 1 + resources/js/Pages/Cities/Index.vue | 8 +- resources/js/Pages/City/Index.vue | 36 +--- resources/js/Pages/Countries/Index.vue | 2 +- resources/js/Pages/Dashboard/Index.vue | 2 +- resources/js/Pages/Importers/Index.vue | 2 +- .../js/Shared/Components/DeleteModal.vue | 78 +++++---- .../js/Shared/Components/FavoriteButton.vue | 2 +- resources/js/Shared/Components/Opinion.vue | 157 ++++++++++++++++++ routes/web.php | 2 + 16 files changed, 252 insertions(+), 100 deletions(-) create mode 100644 resources/js/Shared/Components/Opinion.vue diff --git a/app/Http/Requests/CityOpinionRequest.php b/app/Http/Requests/CityOpinionRequest.php index 8a86f86a..83b2c476 100644 --- a/app/Http/Requests/CityOpinionRequest.php +++ b/app/Http/Requests/CityOpinionRequest.php @@ -11,7 +11,7 @@ class CityOpinionRequest extends FormRequest public function rules(): array { return [ - "rating" => ["required", "numeric", "max:5"], + "rating" => ["required", "numeric", "min:1", "max:5"], "content" => ["required", "string", "max:250"], "city_id" => ["required", "numeric", "exists:cities,id"], ]; diff --git a/app/Importers/BirdDataImporter.php b/app/Importers/BirdDataImporter.php index 2ce46055..d09442d2 100644 --- a/app/Importers/BirdDataImporter.php +++ b/app/Importers/BirdDataImporter.php @@ -102,7 +102,6 @@ protected function load(string $cityName, string $countryName, string $lat = "", return strval($city->id); } $this->countryNotFound($cityName, $countryName); - $this->createImportInfoDetails("420", self::getProviderName()); return ""; } diff --git a/app/Importers/DataImporter.php b/app/Importers/DataImporter.php index f425e920..0d33a03a 100644 --- a/app/Importers/DataImporter.php +++ b/app/Importers/DataImporter.php @@ -59,18 +59,19 @@ public function translate(string $word, string $language): string protected function countryNotFound(string $cityName, string $countryName): void { - CityWithoutAssignedCountry::query() - ->withTrashed() - ->updateOrCreate( - [ - "city_name" => $cityName, - "country_name" => $countryName, - ], - [ - "city_name" => $cityName, - "country_name" => $countryName, - ], - ); + $cityAttributes = [ + "city_name" => $cityName, + "country_name" => $countryName, + ]; + + $city = CityWithoutAssignedCountry::query()->withTrashed()->updateOrCreate( + $cityAttributes, + $cityAttributes, + ); + + if ($city->wasRecentlyCreated) { + $this->createImportInfoDetails("420", self::getProviderName()); + } } protected function createProvider(int $cityId, string $providerName): void @@ -149,7 +150,6 @@ protected function load(string $cityName, string $countryName, string $lat = "", return strval($city->id); } $this->countryNotFound($cityName, $countryName); - $this->createImportInfoDetails("420", self::getProviderName()); return ""; } diff --git a/app/Importers/LimeDataImporter.php b/app/Importers/LimeDataImporter.php index 6cdbc1eb..ba884fbd 100644 --- a/app/Importers/LimeDataImporter.php +++ b/app/Importers/LimeDataImporter.php @@ -103,7 +103,6 @@ protected function load(string $cityName, string $countryName, string $lat = "", return strval($city->id); } $this->countryNotFound($cityName, $countryName); - $this->createImportInfoDetails("420", self::getProviderName()); return ""; } diff --git a/app/Importers/SpinDataImporter.php b/app/Importers/SpinDataImporter.php index 283bcc65..74d1c619 100644 --- a/app/Importers/SpinDataImporter.php +++ b/app/Importers/SpinDataImporter.php @@ -120,7 +120,6 @@ protected function load(string $cityName, string $countryName, string $lat = "", return strval($city->id); } $this->countryNotFound($cityName, $countryName); - $this->createImportInfoDetails("420", self::getProviderName()); return ""; } diff --git a/lang/pl.json b/lang/pl.json index 214f3d73..9542b5bb 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -20,7 +20,7 @@ "Don`t have an account?": "Nie masz konta?", "Already have an account?": "Masz już konto?", "Looking for an e‑scooter?": "Szukasz hulajnogi elektrycznej?", - "Try it out": "Wypróbuj teraz!", + "Try it out": "Wypróbuj teraz", "Create account": "Stwórz konto", "Log in to add to favorites.": "Zaloguj się, aby dodać do ulubionych.", "Sorry we couldn't find any cities.": "Przepraszamy, ale nie mogliśmy znaleźć żadnych miast.", @@ -29,6 +29,7 @@ "advert2": "Ta aplikacja pomoże Ci z planowaniem Twoich wakacji, lub podróży biznesowych.", "Edit": "Edytuj", "Delete": "Usuń", + "Cancel": "Anuluj", "Add": "Dodaj", "Create city": "Utwórz miasto", "Create country": "Utwórz kraj", @@ -82,11 +83,11 @@ "Country created successfully.": "Kraj utworzony pomyślnie.", "City deleted successfully.": "Miasto usunięte pomyślnie.", "Cities deleted successfully.": "Miasta usunięte pomyślnie.", - "Country deleted successfully": "Kraj usunięty pomyślnie.", - "There was an error!": "Wystąpił błąd!", - "There was an error creating the city!": "Wystąpił błąd podczas tworzenia miasta!", - "There was an error deleting the city!": "Wystąpił błąd podczas usuwania miasta!", - "There was an error deleting cities!": "Wystąpił błąd podczas usuwania miast!", + "Country deleted successfully.": "Kraj usunięty pomyślnie.", + "There was an error.": "Wystąpił błąd.", + "There was an error creating the city.": "Wystąpił błąd podczas tworzenia miasta.", + "There was an error deleting the city.": "Wystąpił błąd podczas usuwania miasta.", + "There was an error deleting cities.": "Wystąpił błąd podczas usuwania miast.", "There was an error creating the country.": "Wystąpił błąd podczas tworzenia kraju.", "There was an error adding alternative city name.": "Wystąpił błąd podczas dodawania alternatywnej nazwy miasta.", @@ -94,7 +95,7 @@ "Alternative city name deleted successfully.": "Alternatywna nazwa miasta usunięta pomyślnie.", "City providers updated successfully.": "Dostawcy dostępni w mieście zaktualizowani pomyślnie.", "Use `.` instead of `,`": "Użyj `.` zamiast `,`", - "Importers started!": "Importerzy uruchomieni!", + "Importers started.": "Importerzy uruchomieni.", "running": "Uruchomiony", "stopped": "Zatrzymany", "finished": "Zakończony", @@ -126,12 +127,22 @@ "Cities with no country assigned": "Miasta bez przypisanego kraju", "Cities with no coordinates assigned": "Miasta bez przypisanych współrzędnych", "Delete all cities with no country assigned": "Usuń wszystkie miasta bez przypisanego kraju", - - "Opinion added successfully!": "Opinia dodana pomyślnie!", - "There was an error adding your opinion!": "Wystąpił błąd podczas dodawania opinii!", + "Opinion added successfully.": "Opinia dodana pomyślnie.", + "There was an error adding your opinion.": "Wystąpił błąd podczas dodawania opinii.", + "Opinion edited successfully.": "Opinia zaktualizowana pomyślnie.", + "There was an error editing your opinion.": "Wystąpił błąd podczas edytowania opinii.", + "There was an error removing your opinion.": "Wystąpił błąd podczas usuwania opinii.", "Add opinion": "Dodaj opinię", + "Edit opinion": "Edytuj opinię", "Send": "Wyślij", "Users' opinions": "Opinie użytkowników", + "Delete that opinion?": "Usunąć tę opinię?", + "Opinion removed successfully!": "Opinia usunięta pomyślnie.", + "Delete city": "Usunąć miasto", + "Delete country": "Usunąć kraj", + "Delete that opinion": "Usunąć opinię", + "That opinion": "Ta opinia", + "This operation cannot be undone.": "Ta operacja nie może zostać cofnięta.", "You have logged in successfully.": "Zalogowano pomyślnie.", "You have logged out successfully.": "Wylogowano pomyślnie.", diff --git a/lang/pl/validation.php b/lang/pl/validation.php index 043ad6dc..3e000fdf 100644 --- a/lang/pl/validation.php +++ b/lang/pl/validation.php @@ -124,5 +124,6 @@ "password" => "hasło", "latitude" => "szerokość geograficzna", "longitude" => "długość geograficzna", + "content" => "treść", ], ]; diff --git a/resources/js/Pages/Cities/Index.vue b/resources/js/Pages/Cities/Index.vue index d51ecbb4..35908a84 100644 --- a/resources/js/Pages/Cities/Index.vue +++ b/resources/js/Pages/Cities/Index.vue @@ -1,5 +1,5 @@