refactoring

Author: gitnamehere

src/components/LocationSearchbar.vue

@@ -21,7 +21,7 @@ const getLocations = () => {
   }, 500);
 };
 
-const getWeather = () => {
+const getWeatherBySearch = () => {
   if (!location.value) return;
 
   clearTimeout(timer);
@@ -35,9 +35,9 @@ const getWeather = () => {
   });
 };
 
-const getWeatherByCoords = (location: any) => {
+const getWeatherByLocation = (location: any) => {
   locationsSearched.value = false;
-  weatherStore.getWeatherFromGeocoding(location);
+  weatherStore.getWeatherByGeocoding(location);
   router.push({
     name: "weather",
     params: {
@@ -55,7 +55,7 @@ const getWeatherByCoords = (location: any) => {
         class="location-searchbar__input"
         placeholder="Enter a city or zip code"
         @keyup.stop="getLocations"
-        @keyup.enter="getWeather"
+        @keyup.enter="getWeatherBySearch"
       >
       <button
         class="location-searchbar__button"
@@ -64,7 +64,7 @@ const getWeatherByCoords = (location: any) => {
             ? 'location-searchbar__button--day'
             : 'location-searchbar__button--night'
         ]"
-        @click="getWeather"
+        @click="getWeatherBySearch"
       >
         <font-awesome-icon
           :icon="['fas', 'magnifying-glass']"
@@ -80,7 +80,7 @@ const getWeatherByCoords = (location: any) => {
         v-for="locationName in locations"
         :key="locationName"
         class="location-searchbar__list-item"
-        @click="getWeatherByCoords(locationName)"
+        @click="getWeatherByLocation(locationName)"
       >
         <p>{{ locationName.name }}, {{ locationName.admin1 }}</p>
       </div>

src/components/CardItem.vue renamed to src/components/core/CardItem.vue

@@ -4,7 +4,7 @@ import { storeToRefs } from "pinia";
 import { useWeatherStore } from "@/stores/weather";
 import { parseWeatherCode } from "@/utils/weatherCodes";
 
-import CardItem from "@/components/CardItem.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 const daysOfTheWeek = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 

src/components/HumidityGauge.vue renamed to src/components/core/HumidityGauge.vue

@@ -4,7 +4,7 @@ import { storeToRefs } from "pinia";
 import { useWeatherStore } from "@/stores/weather";
 import { parseWeatherCode } from "@/utils/weatherCodes";
 
-import CardItem from "@/components/CardItem.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 const weatherStore = useWeatherStore();
 const { weather } = storeToRefs(weatherStore);

src/components/weather/DailyWeather.vue

@@ -3,11 +3,11 @@ import { storeToRefs } from "pinia";
 import { useWeatherStore } from "@/stores/weather";
 
 import GridContainer from "@/components/grid/GridContainer.vue";
-import HumidityCard from "@/components/weather/HumidityCard.vue";
-import PressureCard from "@/components/weather/PressureCard.vue";
-import WindCard from "@/components/weather/WindCard.vue";
-import AQICard from "@/components/weather/AQICard.vue";
-import CardItem from "@/components/CardItem.vue";
+import HumidityCard from "@/components/weather/cards/HumidityCard.vue";
+import PressureCard from "@/components/weather/cards/PressureCard.vue";
+import WindCard from "@/components/weather/cards/WindCard.vue";
+import AQICard from "@/components/weather/cards/AQICard.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 const weatherStore = useWeatherStore();
 

src/components/weather/HourlyWeather.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import CardItem from "@/components/CardItem.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 interface Props {
   aqi: number;

src/components/weather/WeatherGrid.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import CardItem from "@/components/CardItem.vue";
-import HumidityGauge from "@/components/HumidityGauge.vue";
+import CardItem from "@/components/core/CardItem.vue";
+import HumidityGauge from "@/components/core/HumidityGauge.vue";
 
 defineProps<{
   humidity: number;

src/components/weather/AQICard.vue renamed to src/components/weather/cards/AQICard.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import CardItem from "@/components/CardItem.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 interface Props {
   pressure: number;

src/components/weather/HumidityCard.vue renamed to src/components/weather/cards/HumidityCard.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import CardItem from "@/components/CardItem.vue";
+import CardItem from "@/components/core/CardItem.vue";
 
 interface Props {
   direction: number;