flowrix 1.0.1-beta.130 → 1.0.1-beta.131

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "flowrix",
   "configKey": "flowrix",
-  "version": "1.0.1-beta.130",
+  "version": "1.0.1-beta.131",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/useLocation.d.ts

@@ -53,11 +53,13 @@ export declare function useLocation(): {
     changeStates: (selectedCountry: string | number) => void;
     changeLocation: (data?: Partial<LocationInputs>) => Promise<void>;
     updateLocationData: (data?: Partial<LocationInputs>) => Promise<void>;
-    getLocation: () => Promise<void>;
+    getLocation: (skipBrowserRequest?: boolean) => Promise<void>;
     checkCurrentLocation: () => void;
     initLocationInputs: () => void;
     loadLocation: () => LocationData | null;
     checkLocationPermission: () => Promise<string>;
     initializeCountriesAndStates: () => Promise<void>;
+    requestBrowserLocation: () => Promise<boolean>;
+    openLocationModal: () => void;
 };
 export {};

package/dist/runtime/composables/useLocation.js

@@ -134,37 +134,40 @@ export function useLocation() {
       return "error";
     }
   };
-  const getBrowserLocation = async () => {
-    return new Promise((resolve, reject) => {
+  const requestBrowserLocation = async () => {
+    return new Promise((resolve) => {
       if (!navigator.geolocation) {
-        reject(new Error("Geolocation not supported"));
+        console.log("Geolocation not supported");
+        resolve(false);
         return;
       }
       navigator.geolocation.getCurrentPosition(
         async (position) => {
           try {
             await processGeolocation(position);
-            resolve();
+            resolve(true);
           } catch (error) {
-            reject(error);
+            console.error("Error processing geolocation:", error);
+            resolve(false);
           }
         },
-        async (error) => {
-          console.error("Geolocation error:", error);
-          if (profile.value?.iplocation && !location.value) {
-            await locationStore.getLocation();
-          } else {
-            manualLocationHeading.value = "We need your location to check service availability in your area. You can add your location manually.";
-            const changeLocationBtn = document.querySelector(".change_location");
-            if (changeLocationBtn) {
-              changeLocationBtn.click();
-            }
-          }
-          reject(error);
+        (error) => {
+          console.log("Geolocation denied or failed:", error.message);
+          resolve(false);
+        },
+        {
+          timeout: 1e4,
+          maximumAge: 0
         }
       );
     });
   };
+  const getBrowserLocation = async () => {
+    const success = await requestBrowserLocation();
+    if (!success) {
+      throw new Error("Browser location unavailable");
+    }
+  };
   const processGeolocation = async (position) => {
     const lat = position.coords.latitude;
     const lng = position.coords.longitude;
@@ -199,9 +202,7 @@ export function useLocation() {
       }
     } catch (error) {
       console.error("Geocoding error:", error);
-      if (profile.value?.iplocation && !location.value) {
-        await locationStore.getLocation();
-      }
+      throw error;
     }
   };
   const extractLocationData = (results) => {
@@ -236,11 +237,11 @@ export function useLocation() {
   const initializeCountriesAndStates = async () => {
     try {
       if (!countries.value || countries.value.length === 0) {
-        const fetchedCountries = await countriesStore.getCountries();
+        await countriesStore.getCountries();
       }
       await nextTick();
       if (countries.value && countries.value.length > 0) {
-        const statesResult = getStates(companyCountryId.value);
+        getStates(companyCountryId.value);
         const defaultCountry = countries.value.find((c) => c.id === companyCountryId.value);
         if (defaultCountry) {
           locationInputs.value.country = defaultCountry.name;
@@ -251,7 +252,7 @@ export function useLocation() {
       console.error("Error initializing countries and states:", error);
     }
   };
-  const getLocation = async () => {
+  const getLocation = async (skipBrowserRequest = true) => {
     try {
       await initializeCountriesAndStates();
       if (location.value) {
@@ -261,14 +262,6 @@ export function useLocation() {
       if (profile.value) {
         profile.value.iplocation = true;
       }
-      if (window.GeocodingAPI && !location.value) {
-        try {
-          await getBrowserLocation();
-          return;
-        } catch (error) {
-          console.log("Browser location failed, falling back to IP location");
-        }
-      }
       if (profile.value?.iplocation && !location.value) {
         await locationStore.getLocation();
       }
@@ -315,6 +308,12 @@ export function useLocation() {
     }
     return null;
   };
+  const openLocationModal = () => {
+    const changeLocationBtn = document.querySelector(".change_location");
+    if (changeLocationBtn) {
+      changeLocationBtn.click();
+    }
+  };
   watch(location, (newLocation) => {
     if (newLocation) {
       initLocationInputs();
@@ -352,6 +351,10 @@ export function useLocation() {
     initLocationInputs,
     loadLocation,
     checkLocationPermission,
-    initializeCountriesAndStates
+    initializeCountriesAndStates,
+    requestBrowserLocation,
+    // NEW
+    openLocationModal
+    // NEW
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowrix",
-  "version": "1.0.1-beta.130",
+  "version": "1.0.1-beta.131",
   "description": "Plug-and-play Nuxt eCommerce cart powered by FLOWRiX. Subscription required.",
   "license": "MIT",
   "type": "module",