Skip to content

Commit

Permalink
Merge pull request #40 from Plant-for-the-Planet-org/feature/uppercas…
Browse files Browse the repository at this point in the history
…e_file_names_used

have to import with uppercase filenames on MacOS
  • Loading branch information
sagararyal authored Jun 30, 2023
2 parents 312d1cd + fbfa246 commit 9adbb33
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion apps/nativeapp/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {ToastProvider} from 'react-native-toast-notifications';

import {store} from './redux/store';
import {TRPCProvider} from './services/trpc';
import AppNavigator from './routes/appNavigator';
import AppNavigator from './routes/AppNavigator';
import {MapLayerProvider} from './global/reducers/mapLayers';

MapboxGL.setAccessToken(Config.MAPBOXGL_ACCCESS_TOKEN);
Expand Down
16 changes: 8 additions & 8 deletions apps/nativeapp/app/components/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Switch from './switch/switch';
import Switch from './switch/Switch';
import AlertModal from './alertModal';
import OtpInput from './otpInput/otpInput';
import BottomBar from './bottomBar/bottomBar';
import CustomButton from './button/customButton';
import LayerModal from './layerModal/layerModal';
import PhoneInput from './phoneInput/phoneInput';
import FloatingInput from './inputs/floatingInput';
import BottomSheet from './bottomSheet/bottomSheet';
import OtpInput from './otpInput/OtpInput';
import BottomBar from './bottomBar/BottomBar';
import CustomButton from './button/CustomButton';
import LayerModal from './layerModal/LayerModal';
import PhoneInput from './phoneInput/PhoneInput';
import FloatingInput from './inputs/FloatingInput';
import BottomSheet from './bottomSheet/BottomSheet';

export {
Switch,
Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/app/components/layerModal/LayerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Modal, StyleSheet, Text, TouchableOpacity, View} from 'react-native';

import {LayerCheck} from '../../assets/svgs';
import {Colors, Typography} from '../../styles';
import {SELECT_MAP_LAYER} from '../../global/actions/types';
import {SELECT_MAP_LAYER} from '../../global/actions/Types';
import {MapLayerContext, useMapLayers} from '../../global/reducers/mapLayers';

interface ILayerModalProps {
Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/app/global/reducers/mapLayers.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {createContext, useContext, useReducer} from 'react';

import {SELECT_MAP_LAYER} from '../actions/types';
import {SELECT_MAP_LAYER} from '../actions/Types';

const initialState = 'Satellite';

Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/app/routes/stack/CommonStack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
UploadPolygon,
SelectLocation,
} from '../../screens';
import BottomTab from '../bottomTab/bottomTab';
import BottomTab from '../bottomTab/BottomTab';

const screenOptions = {headerShown: false};
const Stack = createNativeStackNavigator();
Expand Down
4 changes: 2 additions & 2 deletions apps/nativeapp/app/routes/stack/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CommonStack from './commonStack';
import SignInStack from './signInStack';
import CommonStack from './CommonStack';
import SignInStack from './SignInStack';

export {CommonStack, SignInStack};
4 changes: 2 additions & 2 deletions apps/nativeapp/app/screens/CreatePolygon/CreatePolygon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import {
CustomButton,
FloatingInput,
} from '../../components';
import Map from './mapMarking/map';
import Map from './MapMarking/Map';
import {trpc} from '../../services/trpc';
import {useFetchSites} from '../../utils/api';
import {Colors, Typography} from '../../styles';
import {
PermissionBlockedAlert,
PermissionDeniedAlert,
} from '../home/permissionAlert/locationPermissionAlerts';
} from '../Home/PermissionAlert/LocationPermissionAlerts';
import {locationPermission} from '../../utils/permissions';
import {toLetters} from '../../utils/mapMarkingCoordinate';
import distanceCalculator from '../../utils/distanceCalculator';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {SvgXml} from 'react-native-svg';
import Config from 'react-native-config';
import MapboxGL, {Logger} from '@rnmapbox/maps';

import Markers from '../markers';
import Markers from '../Markers';
import {
useMapLayers,
MapLayerContext,
Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/app/screens/CreatePolygon/Markers/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Config from 'react-native-config';
import {useEffect, useRef, useState} from 'react';

import {Colors} from '../../../styles';
import MarkerSVG from '../markerSVG';
import MarkerSVG from '../MarkerSVG';
import {toLetters} from '../../../utils/mapMarkingCoordinate';

MapboxGL.setAccessToken(Config.MAPBOXGL_ACCCESS_TOKEN);
Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/app/screens/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import {
import {
PermissionDeniedAlert,
PermissionBlockedAlert,
} from './permissionAlert/locationPermissionAlerts';
} from './PermissionAlert/LocationPermissionAlerts';

import {WEB_URLS} from '../../constants';
import {trpc} from '../../services/trpc';
Expand Down
16 changes: 8 additions & 8 deletions apps/nativeapp/app/screens/index.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Home from './home/home';
import Login from './login/login';
import Otp from './verification/otp';
import Settings from './settings/settings';
import Verification from './verification/verification';
import UploadPolygon from './uploadPolygon/uploadPolygon';
import CreatePolygon from './createPolygon/createPolygon';
import SelectLocation from './selectLocation/selectLocation';
import Home from './Home/Home';
import Login from './Login/Login';
import Otp from './Verification/Otp';
import Settings from './Settings/Settings';
import Verification from './Verification/Verification';
import UploadPolygon from './uploadPolygon/UploadPolygon';
import CreatePolygon from './CreatePolygon/CreatePolygon';
import SelectLocation from './selectLocation/SelectLocation';

export {
Otp,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
import {
PermissionDeniedAlert,
PermissionBlockedAlert,
} from '../home/permissionAlert/locationPermissionAlerts';
} from '../Home/PermissionAlert/LocationPermissionAlerts';

import {
AlertModal,
Expand Down
2 changes: 1 addition & 1 deletion apps/nativeapp/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import {AppRegistry} from 'react-native';
import App from './app/app.tsx';
import App from './app/App.tsx';
import {name as appName} from './app.json';

AppRegistry.registerComponent(appName, () => App);

1 comment on commit 9adbb33

@vercel
Copy link

@vercel vercel bot commented on 9adbb33 Jun 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.