Merge branch 'findme-geolocation' of https://github.com/map-of-pi/map-of-pi-frontend-react into findme-geolocation

Author: adisa39

.env.development

@@ -8,4 +8,4 @@ NEXT_PUBLIC_API_URL=http://localhost:8001/api/v1
 NEXT_PUBLIC_PI_SDK_URL=https://sdk.minepi.com/pi-sdk.js
 
 NEXT_PUBLIC_SENTRY_DSN="ADD YOUR SENTRY DSN"
-NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL='/path/to/default/image.png'
+NEXT_PUBLIC_IMAGE_PLACEHOLDER_URL="ADD YOUR IMAGE PLACEHOLDER URL"

src/app/[locale]/page.tsx

@@ -10,12 +10,12 @@ import { useContext, useEffect, useState, useRef } from 'react';
 import { Button } from '@/components/shared/Forms/Buttons/Buttons';
 import SearchBar from '@/components/shared/SearchBar/SearchBar';
 import { fetchSellers } from '@/services/sellerApi';
-import { fetchUserLocation, fetchUserSettings } from '@/services/userSettingsApi';
+import { fetchUserSettings } from '@/services/userSettingsApi';
 import { DeviceLocationType, IUserSettings } from '@/constants/types';
+import { userLocation } from '@/utils/geolocation';
 
 import { AppContext } from '../../../context/AppContextProvider';
 import logger from '../../../logger.config.mjs';
-import { userLocation } from '@/utils/resolveUserLocation';
 
 export default function Index() {
   const t = useTranslations();
@@ -37,9 +37,6 @@ export default function Index() {
 
   const { isSigningInUser, currentUser, autoLoginUser, reload, setReload } = useContext(AppContext);
 
-  // Default map center (example: New York City)
-  const defaultMapCenter = { lat: 20, lng: -74.006 };
-
   useEffect(() => {
     setReload(false)
     if (!currentUser) {

src/components/shared/map/Map.tsx

@@ -245,8 +245,6 @@ const Map = ({
         setLocationError(false);
         if (center) {
           map.setView(center, zoom, { animate: false });
-          // setInitialLocationSet(true);
-          // setIsLocationAvailable(true);
         }
       },
       locationerror() {
@@ -340,10 +338,6 @@ const Map = ({
             url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
             noWrap={true}
           />
-          {/* <Marker
-              position={center as LatLngExpression}
-              icon={crosshairIcon}
-            ></Marker> */}
           <LocationMarker />
           {sellers.map((seller) => (
             <Marker

src/components/shared/sidebar/sidebar.tsx

@@ -251,7 +251,7 @@ function Sidebar(props: any) {
         logger.info('User Settings saved successfully:', { data });
         toast.success(t('SIDE_NAVIGATION.VALIDATION.SUCCESSFUL_PREFERENCES_SUBMISSION'));
         if (pathname === '/' || pathname === `/${local}`) {
-        setReload(true)
+          setReload(true);
         }
       }
     } catch (error) {
@@ -295,11 +295,11 @@ function Sidebar(props: any) {
 
   const translateFindMeOptions = [
     {
-      value: 'Auto',
+      value: 'auto',
       name: t('SIDE_NAVIGATION.FIND_ME_OPTIONS.PREFERRED_AUTO'),
     },
     {
-      value: 'GPS',
+      value: 'deviceGPS',
       name: t('SIDE_NAVIGATION.FIND_ME_OPTIONS.PREFERRED_DEVICE_GPS'),
     },
     {

src/constants/types.ts

@@ -61,6 +61,12 @@ export interface ReviewInt {
   image: string;
 }
 
+export enum DeviceLocationType {
+  Automatic = 'auto',
+  GPS = 'deviceGPS',
+  SearchCenter = 'searchCenter'
+}
+
 // Select specific fields from IUserSettings
 export type PartialUserSettings = Pick<IUserSettings, 'user_name' | 'email' | 'phone_number' | 'findme' | 'trust_meter_rating'>;
 
@@ -74,8 +80,3 @@ export type PartialReview = {
 
 export interface IReviewOutput extends IReviewFeedback, PartialReview {}
 
-export enum DeviceLocationType {
-  Automatic = 'Auto',
-  GPS = 'GPS',
-  SearchCenter = 'searchCenter'
-}

src/utils/resolveUserLocation.ts renamed to src/utils/geolocation.ts

@@ -1,12 +1,6 @@
-import { IUserSettings } from '@/constants/types';
+import { DeviceLocationType, IUserSettings } from '@/constants/types';
 import logger from '../../logger.config.mjs';
 
-export enum DeviceLocationType {
-  Automatic = 'Auto',
-  GPS = 'GPS',
-  SearchCenter = 'searchCenter',
-}
-
 // Get device location, first trying GPS, and then falling back to IP-based geolocation
 const getDeviceLocation = async (): Promise<[number, number] | null> => {
   if (navigator.geolocation) {