Merge pull request #360 from Catatomik/dev

🐛 Stop area add

Author: Catatomik

package-lock.json

@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@capacitor/assets": "^3.0.4",
-    "@capacitor/cli": "^5.5.1",
+    "@capacitor/cli": "^5.6.0",
     "@rushstack/eslint-patch": "^1.7.2",
     "@types/node": "^18",
     "@vitejs/plugin-vue": "^5.0.3",

package.json

@@ -11,7 +11,7 @@ export interface Modal {
 const props = withDefaults(defineProps<Modal>(), { initShown: false, bgColor: "bg-slate-100" });
 
 const emit = defineEmits<{
-  (e: "update:shown", shown: boolean): void;
+  "update:shown": [shown: boolean];
 }>();
 
 const focusDiv = ref<HTMLDivElement | null>(null);

src/components/BaseModal.vue

@@ -12,8 +12,8 @@ interface Props {
 const props = withDefaults(defineProps<Props>(), { initShown: false });
 
 const emit = defineEmits<{
-  (e: "update:shown", shown: boolean): void;
-  (e: "update:modelValue", settings: Settings): void;
+  "update:shown": [shown: boolean];
+  "update:modelValue": [settings: Settings];
 }>();
 
 fetchSettings().then((r) => {

src/components/BaseSettings.vue

@@ -15,7 +15,7 @@ export interface Modal {
 defineProps<Modal>();
 
 const emit = defineEmits<{
-  (e: "update:shown", shown: boolean): void;
+  "update:shown": [shown: boolean];
 }>();
 
 const focusDiv = ref<HTMLDivElement | null>(null);

src/components/JourneyModal.vue

@@ -18,7 +18,7 @@ const checked = ref<Checked>(
 );
 
 const emit = defineEmits<{
-  (e: "update:checked", checked: Checked): void;
+  "update:checked": [checked: Checked];
 }>();
 
 emit("update:checked", checked.value);

src/components/RouteHeader.vue

@@ -18,15 +18,15 @@ import {
   removeStopPoint,
   removeStopArea,
   getWantedStops,
-  selectedStops,
+  selectedStopAreas,
   excludedStopPoints,
 } from "@/store/StopsManager";
 import {
   extractLineCode,
   fetchLineDetails,
   fetchStopPointDetails,
   type FullyDescribedRoute,
-  type FullyDescribedStopArea,
+  type StopAreaDetails,
   type lineType,
   type StopPoint,
   type TBMLineType,
@@ -36,7 +36,7 @@ import { mapAsync } from "@/store";
 import RouteName from "./RouteName.vue";
 
 interface Props {
-  stopArea: FullyDescribedStopArea;
+  stopArea: StopAreaDetails;
 }
 
 const props = defineProps<Props>();
@@ -50,13 +50,13 @@ const restoreStopComp = ref<InstanceType<typeof BaseModal> | null>(null);
 
 const excludedStopPointsToRestore = ref<(StopPoint & { routes: FullyDescribedRoute[] })[]>([]);
 
-async function getExcludedStopPoints() {
+async function getExcludedStopPointsToRestore() {
   excludedStopPointsToRestore.value = await mapAsync(
     excludedStopPoints.value
       .filter(([stopAreaId]) => stopAreaId === props.stopArea.id)
       .map<StopPoint | undefined>(([_, stopPointId]) =>
-        selectedStops.value
-          .flatMap((stopArea) => stopArea.details.stopPoints)
+        selectedStopAreas.value
+          .flatMap((stopArea) => stopArea.stopPoints)
           .find((stopPoint) => stopPoint.id === stopPointId),
       )
       .filter((sp): sp is StopPoint => sp !== undefined),
@@ -89,7 +89,7 @@ async function getExcludedStopPoints() {
     restoreStopComp.value.show(false);
 }
 
-watch(excludedStopPoints, getExcludedStopPoints);
+watch(excludedStopPoints, getExcludedStopPointsToRestore);
 
 fetchMinimized();
 </script>
@@ -159,7 +159,7 @@ fetchMinimized();
           class="mx-2 my-3 grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 overflow-hidden transition-margin"
         >
           <StopPointComp
-            v-for="stopPoint of getWantedStops(selectedStops).filter(
+            v-for="stopPoint of getWantedStops(selectedStopAreas).filter(
               (stopPoint) => stopPoint.stopAreaId === stopArea.id,
             )"
             :key="stopPoint.id"
@@ -176,7 +176,7 @@ fetchMinimized();
       ref="restoreStopComp"
       @update:shown="
         (s) => {
-          if (s) getExcludedStopPoints();
+          if (s) getExcludedStopPointsToRestore();
         }
       "
     >

src/components/StopArea.vue

@@ -30,7 +30,7 @@ interface Props {
 const props = defineProps<Props>();
 
 const emit = defineEmits<{
-  (e: "delete"): void;
+  delete: [];
 }>();
 
 const realtimeRoutesSchedules = ref<{

src/components/StopPoint.vue

@@ -24,13 +24,13 @@ router.beforeResolve(async (to, from) => {
     try {
       const { value } = await Preferences.get({ key: preferencesKeys.location });
       return value && value !== "/" ? value : true;
-    } catch (_) {
+    } catch {
       return true;
     }
 
   try {
     await Preferences.set({ key: preferencesKeys.location, value: to.fullPath });
-  } catch (_) {}
+  } catch {}
 });
 
 App.addListener("appUrlOpen", function (event: URLOpenListenerEvent) {