From b89f8c1e535c3da81078de3f69bd5155c62c735d Mon Sep 17 00:00:00 2001
From: zmigroo <patrykzmigro@gmail.com>
Date: Sat, 13 Jan 2024 12:13:54 +0100
Subject: [PATCH 1/7] Update app.css and Index.vue

---
 resources/css/app.css             | 4 +++-
 resources/js/Pages/City/Index.vue | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/css/app.css b/resources/css/app.css
index 789008dc..96a8cb2a 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -29,11 +29,13 @@
     }
     div.regulations>div:nth-child(2) {
         max-height: 0vh;
-        margin-top: 12px;
+        margin-bottom: 0px;
+        transition: all 0.5s ease-in-out;
     }
 
     div.regulations>div:nth-child(2).show {
         max-height: 50vh;
+        margin-bottom: 12px;
     }
 
     div.regulations>div>svg {
diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 9a3fe902..e95f808b 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -111,9 +111,9 @@ function createOpinion() {
             {{ city.latitude }}, {{ city.longitude }}
           </h2>
           <ProviderIcons class="pt-4" :item="city" :providers="props.providers" />
-          <div class="regulations relative rounded overflow-hidden">
-            <div class="mt-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-0 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
-            <div :class="regulationsOpen?'show':''" class="transition overflow-hidden">Content</div>
+          <div class="regulations relative rounded border-gray-200 border-solid border-[1px] overflow-hidden">
+            <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-0 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
+            <div :class="regulationsOpen?'show':''" class="overflow-scroll transition">~~~Content~~~</div>
           </div>
           <form v-if="isAuth" class="mt-8 flex flex-col" @submit.prevent="createOpinion">
             <p class="mb-2 text-xs font-medium text-gray-700">

From afeb0b33093e18f2b9d93ab6b0eeba2fdcde70b8 Mon Sep 17 00:00:00 2001
From: Artur Flis <leeos10100@gmail.com>
Date: Sat, 13 Jan 2024 12:23:53 +0100
Subject: [PATCH 2/7] added import rules button, changes in city view for
 fetching data, rules route

---
 resources/js/Pages/City/Index.vue      | 13 ++++++++++++-
 resources/js/Pages/Importers/Index.vue | 12 +++++++++++-
 routes/web.php                         |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 9a3fe902..7d0fd900 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -8,12 +8,13 @@ import { useFilterStore } from '@/Shared/Stores/FilterStore'
 import FavoriteButton from '@/Shared/Components/FavoriteButton.vue'
 import ProviderIcons from '@/Shared/Components/ProviderIcons.vue'
 import { __ } from '@/translate'
-import { useForm, usePage } from '@inertiajs/vue3'
+import { router, useForm, usePage } from '@inertiajs/vue3'
 import ErrorMessage from '@/Shared/Components/ErrorMessage.vue'
 import { useToast } from 'vue-toastification'
 import Pagination from '@/Shared/Components/Pagination.vue'
 import InfoPopup from '@/Shared/Components/InfoPopup.vue'
 import Opinion from '@/Shared/Components/Opinion.vue'
+import axios from 'axios'
 
 const toast = useToast()
 const page = usePage()
@@ -63,6 +64,16 @@ function toggleRegulations() {
   console.log(regulationsOpen)
 }
 
+function fetchRegulations() {
+  axios.get(`/api/rules/{city.country.name}/{city.name}`)
+    .then(response => {
+      console.log(response.data)
+    })
+    .catch(error => {
+      console.log(error)
+    })
+}
+
 const emptyRatingError = ref('')
 
 function createOpinion() {
diff --git a/resources/js/Pages/Importers/Index.vue b/resources/js/Pages/Importers/Index.vue
index 2da7b0eb..e93b4427 100644
--- a/resources/js/Pages/Importers/Index.vue
+++ b/resources/js/Pages/Importers/Index.vue
@@ -20,6 +20,11 @@ function runImporters() {
   router.post('/run-importers', [])
   toast.success(__('Importers started.'))
 }
+
+function runRules() {
+  router.post('/rules/import-rules/false', [])
+  toast.success(__('Rules started.'))
+}
 </script>
 
 <template>
@@ -27,9 +32,14 @@ function runImporters() {
   <div class="flex w-full md:justify-end">
     <div class="mt-16 flex h-full w-full flex-col justify-between md:mt-0 md:w-2/3 lg:w-3/4 xl:w-5/6">
       <div class="m-4 flex flex-col lg:mx-8">
-        <button class="my-5 w-fit rounded bg-blumilk-500 px-5 py-3 text-sm font-medium text-white shadow-md hover:bg-blumilk-400 md:py-2" @click="runImporters">
+        <div class="m-4">
+        <button class="my-5 mr-10 w-fit rounded bg-blumilk-500 px-5 py-3 text-sm font-medium text-white shadow-md hover:bg-blumilk-400 md:py-2" @click="runImporters">
           {{ __('Run importers') }}
         </button>
+        <button class="my-5 w-fit rounded bg-blumilk-500 px-5 py-3 text-sm font-medium text-white shadow-md hover:bg-blumilk-400 md:py-2" @click="runRules">
+          {{ __('Run rules') }}
+        </button>
+        </div>
 
         <PaginationInfo v-if="importInfo.data.length" :meta="importInfo.meta" />
         <div v-if="importInfo.data.length" class="rounded-lg ring-gray-300 sm:ring-1">
diff --git a/routes/web.php b/routes/web.php
index 102a0a97..32d22ee6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -47,7 +47,7 @@
         Route::delete("/delete-city-without-assigned-country/{city}", [CityWithoutAssignedCountryController::class, "destroy"]);
         Route::post("/delete-all-cities-without-assigned-country", [CityWithoutAssignedCountryController::class, "destroyAll"]);
 
-        Route::get("/import-rules/{force}", [\App\Services\OpenAIService::class, "importRules"]);
+        Route::post("/import-rules/{force}", [\App\Services\OpenAIService::class, "importRules"]);
     });
 });
 

From c346d209027d3dc7c13c54ffe875e02a7e99ee06 Mon Sep 17 00:00:00 2001
From: zmigroo <patrykzmigro@gmail.com>
Date: Sat, 13 Jan 2024 12:51:05 +0100
Subject: [PATCH 3/7] Refactor regulations fetching in City Index.vue

---
 resources/js/Pages/City/Index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 556de9ba..b2119aa5 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -20,7 +20,8 @@ const toast = useToast()
 const page = usePage()
 const isAuth = computed(() => page.props.auth.isAuth)
 const regulationsOpen = ref(false)
-
+let rules = ref({})
+fetchRegulations()
 const props = defineProps({
   city: Object,
   providers: Object,
@@ -65,9 +66,9 @@ function toggleRegulations() {
 }
 
 function fetchRegulations() {
-  axios.get(`/api/rules/{city.country.name}/{city.name}`)
+  axios.get(`/api/rules/`+props.city.country.name+`/`+props.city.name)
     .then(response => {
-      console.log(response.data)
+      rules = response.data
     })
     .catch(error => {
       console.log(error)
@@ -124,7 +125,7 @@ function createOpinion() {
           <ProviderIcons class="pt-4" :item="city" :providers="props.providers" />
           <div class="regulations relative rounded border-gray-200 border-solid border-[1px] overflow-hidden">
             <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-0 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
-            <div :class="regulationsOpen?'show':''" class="overflow-scroll transition">~~~Content~~~</div>
+            <div :class="regulationsOpen?'show':''" class="overflow-scroll transition">{{ rules.rulesENG }}</div>
           </div>
           <form v-if="isAuth" class="mt-8 flex flex-col" @submit.prevent="createOpinion">
             <p class="mb-2 text-xs font-medium text-gray-700">

From 1f6a0fd4ab10a82b998963476ba66c640dbc7ee0 Mon Sep 17 00:00:00 2001
From: Artur Flis <leeos10100@gmail.com>
Date: Sat, 13 Jan 2024 12:53:44 +0100
Subject: [PATCH 4/7] Translations for rules import button, route fix

---
 lang/pl.json                           | 4 ++--
 resources/js/Pages/City/Index.vue      | 2 ++
 resources/js/Pages/Importers/Index.vue | 6 +++---
 routes/web.php                         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lang/pl.json b/lang/pl.json
index add06abf..cc0f0dae 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -150,6 +150,6 @@
     "Please, rate that city": "Oceń miasto",
 
     "You can also login by:": "Możesz również zalogować się przez:",
-
-    "Regulations": "Zasady"
+    "Rules import started.": "Import zasad uruchomiony.",
+    "Run rules import": "Uruchom import zasad"
 }
diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 556de9ba..b7d9633b 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -64,6 +64,8 @@ function toggleRegulations() {
   console.log(regulationsOpen)
 }
 
+console.log(props.city)
+
 function fetchRegulations() {
   axios.get(`/api/rules/{city.country.name}/{city.name}`)
     .then(response => {
diff --git a/resources/js/Pages/Importers/Index.vue b/resources/js/Pages/Importers/Index.vue
index e93b4427..4462f946 100644
--- a/resources/js/Pages/Importers/Index.vue
+++ b/resources/js/Pages/Importers/Index.vue
@@ -22,8 +22,8 @@ function runImporters() {
 }
 
 function runRules() {
-  router.post('/rules/import-rules/false', [])
-  toast.success(__('Rules started.'))
+  router.post('/import-rules/false', [])
+  toast.success(__('Rules import started.'))
 }
 </script>
 
@@ -37,7 +37,7 @@ function runRules() {
           {{ __('Run importers') }}
         </button>
         <button class="my-5 w-fit rounded bg-blumilk-500 px-5 py-3 text-sm font-medium text-white shadow-md hover:bg-blumilk-400 md:py-2" @click="runRules">
-          {{ __('Run rules') }}
+          {{ __('Run rules import') }}
         </button>
         </div>
 
diff --git a/routes/web.php b/routes/web.php
index 32d22ee6..be359396 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -47,7 +47,7 @@
         Route::delete("/delete-city-without-assigned-country/{city}", [CityWithoutAssignedCountryController::class, "destroy"]);
         Route::post("/delete-all-cities-without-assigned-country", [CityWithoutAssignedCountryController::class, "destroyAll"]);
 
-        Route::post("/import-rules/{force}", [\App\Services\OpenAIService::class, "importRules"]);
+        Route::post("/import-rules/{force}", [\App\Services\OpenAIService::class, "importRulesForAllCities"]);
     });
 });
 

From 1c80b11e7427481c3af80158dfeeb92de117dd06 Mon Sep 17 00:00:00 2001
From: Artur Flis <leeos10100@gmail.com>
Date: Sat, 13 Jan 2024 12:54:42 +0100
Subject: [PATCH 5/7] lint

---
 resources/js/Pages/City/Index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index dac9045d..7b4bd7bc 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -62,11 +62,8 @@ function setRating(starIndex) {
 
 function toggleRegulations() {
   regulationsOpen.value = !regulationsOpen.value
-  console.log(regulationsOpen)
 }
 
-console.log(props.city)
-
 function fetchRegulations() {
   axios.get(`/api/rules/`+props.city.country.name+`/`+props.city.name)
     .then(response => {

From 553ebccce85ae2b75645011e9cf59927fac8647d Mon Sep 17 00:00:00 2001
From: zmigroo <patrykzmigro@gmail.com>
Date: Sat, 13 Jan 2024 13:00:25 +0100
Subject: [PATCH 6/7] regulations padding

---
 resources/js/Pages/City/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 7b4bd7bc..4e7235a1 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -122,8 +122,8 @@ function createOpinion() {
             {{ city.latitude }}, {{ city.longitude }}
           </h2>
           <ProviderIcons class="pt-4" :item="city" :providers="props.providers" />
-          <div class="regulations relative rounded border-gray-200 border-solid border-[1px] overflow-hidden">
-            <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-0 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
+          <div class="px-3 regulations relative rounded border-gray-200 border-solid border-[1px] overflow-hidden">
+            <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-3 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
             <div :class="regulationsOpen?'show':''" class="overflow-scroll transition">{{ rules.rulesENG }}</div>
           </div>
           <form v-if="isAuth" class="mt-8 flex flex-col" @submit.prevent="createOpinion">

From e7af7393796c1c2989bf2860d0dcfd69d187deb8 Mon Sep 17 00:00:00 2001
From: Artur Flis <leeos10100@gmail.com>
Date: Sat, 13 Jan 2024 13:02:02 +0100
Subject: [PATCH 7/7] translation rules

---
 resources/js/Pages/City/Index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Pages/City/Index.vue b/resources/js/Pages/City/Index.vue
index 4e7235a1..959e8b46 100644
--- a/resources/js/Pages/City/Index.vue
+++ b/resources/js/Pages/City/Index.vue
@@ -123,7 +123,7 @@ function createOpinion() {
           </h2>
           <ProviderIcons class="pt-4" :item="city" :providers="props.providers" />
           <div class="px-3 regulations relative rounded border-gray-200 border-solid border-[1px] overflow-hidden">
-            <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Regulations') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-3 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
+            <div class="my-3 text-2xl font-bold flex items-center text-gray-700 cursor-pointer" @click="toggleRegulations()">{{ __('Rules') }} <ArrowDownIcon :class="regulationsOpen ? 'rotated' : ''" class="absolute right-3 inline-block transition-all h-6 w-6"></ArrowDownIcon></div>
             <div :class="regulationsOpen?'show':''" class="overflow-scroll transition">{{ rules.rulesENG }}</div>
           </div>
           <form v-if="isAuth" class="mt-8 flex flex-col" @submit.prevent="createOpinion">