Skip to content

Commit 9f78c7d

Browse files
committed
Removed Firebase related functionality
1 parent aba39de commit 9f78c7d

17 files changed

+17
-1012
lines changed

src/contexts/ApplicationProvider/ApplicationProvider.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { StrictMode } from 'react';
66
import { App } from 'components/App';
77
import { Notifications } from 'components/Notifications';
88
import {
9-
FirebaseProvider,
109
HuntingMapTypeProvider,
1110
SettingsProvider,
1211
TutorialProvider,
@@ -23,16 +22,14 @@ export const ApplicationProvider = (props: PropsWithChildren) => {
2322
return (
2423
<StrictMode>
2524
<QueryClientProvider client={queryClient}>
26-
<FirebaseProvider>
27-
<SettingsProvider>
28-
<TutorialProvider>
29-
<HuntingMapTypeProvider value={mapTypeManager}>
30-
<Notifications />
31-
<App>{children}</App>
32-
</HuntingMapTypeProvider>
33-
</TutorialProvider>
34-
</SettingsProvider>
35-
</FirebaseProvider>
25+
<SettingsProvider>
26+
<TutorialProvider>
27+
<HuntingMapTypeProvider value={mapTypeManager}>
28+
<Notifications />
29+
<App>{children}</App>
30+
</HuntingMapTypeProvider>
31+
</TutorialProvider>
32+
</SettingsProvider>
3633
</QueryClientProvider>
3734
</StrictMode>
3835
);

src/contexts/FirebaseContext/FirebaseContext.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/contexts/FirebaseContext/FirebaseProvider.tsx

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/contexts/FirebaseContext/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/contexts/FirebaseContext/types.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/contexts/SettingsContext/SettingsProvider.tsx

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import type { PropsWithChildren } from 'react';
44
import { useCallback } from 'react';
55
import { LoadingOverlay } from 'components/LoadingOverlay';
6-
import { useFirestoreSettings, useLocalSettings } from 'hooks';
6+
import { useLocalSettings } from 'hooks';
77
import { sendGoogleEvent } from 'lib/tracking';
88
import type { UserSettingsKey, UserSettingsTypeMap } from 'types/settings';
99
import { SettingsContext } from './SettingsContext';
@@ -18,11 +18,6 @@ export const SettingsProvider = (props: PropsWithChildren) => {
1818
onSettingsUpdateAsync: onLocalSettingsUpdateAsync,
1919
} = useLocalSettings();
2020

21-
const {
22-
onSettingsClearAsync: onFirestoreSettingsClearAsync,
23-
onSettingsUpdateAsync: onFirestoreSettingsUpdateAsync,
24-
} = useFirestoreSettings();
25-
2621
/**
2722
* Update value of the specified configuration key
2823
*/
@@ -32,7 +27,6 @@ export const SettingsProvider = (props: PropsWithChildren) => {
3227
value?: UserSettingsTypeMap[TKey],
3328
) => {
3429
await onLocalSettingsUpdateAsync(key, value);
35-
await onFirestoreSettingsUpdateAsync(key, value);
3630

3731
// Send Google tracking event
3832
switch (key) {
@@ -48,7 +42,7 @@ export const SettingsProvider = (props: PropsWithChildren) => {
4842
return sendGoogleEvent('settings_markers_need_zone', { value });
4943
}
5044
},
51-
[onFirestoreSettingsUpdateAsync, onLocalSettingsUpdateAsync],
45+
[onLocalSettingsUpdateAsync],
5246
);
5347

5448
/**
@@ -62,22 +56,14 @@ export const SettingsProvider = (props: PropsWithChildren) => {
6256
[onSettingsRead],
6357
);
6458

65-
/**
66-
* Handle clearing all stored settings
67-
*/
68-
const handleClearAsync = useCallback(async () => {
69-
await onLocalSettingsClearAsync();
70-
await onFirestoreSettingsClearAsync();
71-
}, [onFirestoreSettingsClearAsync, onLocalSettingsClearAsync]);
72-
7359
if (!initialized) {
7460
return <LoadingOverlay />;
7561
}
7662

7763
return (
7864
<SettingsContext.Provider
7965
value={{
80-
onSettingsClearAsync: handleClearAsync,
66+
onSettingsClearAsync: onLocalSettingsClearAsync,
8167
onSettingsRead: handleGetValue,
8268
onSettingsUpdateAsync: handleUpdateAsync,
8369
}}

src/contexts/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export * from './ApplicationProvider';
22
export * from './CustomMarkerContext';
3-
export * from './FirebaseContext';
43
export * from './HuntingMapTypeContext';
54
export * from './SettingsContext';
65
export * from './TutorialContext';

src/hooks/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
export * from './useAnimalMarkers';
22
export * from './useCustomMarkers';
33
export * from './useDatabase';
4-
export * from './useFirebase';
5-
export * from './useFirestoreSettings';
64
export * from './useForceUpdate';
75
export * from './useHuntingMapType';
86
export * from './useHuntingMapTypeManager';

src/hooks/useAnimalMarkers.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import { useCallback } from 'react';
44
import type { MapId } from 'types/cartography';
55
import type { AnimalMarkerRecord } from 'types/markers';
6-
import { useFirestoreAnimalMarkers } from './useFirestoreAnimalMarkers';
76
import { useLocalAnimalMarkers } from './useLocalAnimalMarkers';
87

98
/**
@@ -17,12 +16,6 @@ export const useAnimalMarkers = (mapId: MapId) => {
1716
onUpdateRecordAsync: onUpdateLocalRecordAsync,
1817
} = useLocalAnimalMarkers(mapId);
1918

20-
const {
21-
onCreateRecordAsync: onCreateFirestoreRecordAsync,
22-
onDeleteRecordAsync: onDeleteFirestoreRecordAsync,
23-
onUpdateRecordAsync: onUpdateFirestoreRecordAsync,
24-
} = useFirestoreAnimalMarkers(mapId);
25-
2619
/**
2720
* Handle creating a new animal marker record
2821
*/
@@ -37,9 +30,8 @@ export const useAnimalMarkers = (mapId: MapId) => {
3730

3831
// Create marker record on the server
3932
await onCreateLocalRecordAsync(patch);
40-
await onCreateFirestoreRecordAsync(patch);
4133
},
42-
[onCreateFirestoreRecordAsync, onCreateLocalRecordAsync],
34+
[onCreateLocalRecordAsync],
4335
);
4436

4537
/**
@@ -63,9 +55,8 @@ export const useAnimalMarkers = (mapId: MapId) => {
6355

6456
// Update marker record on the server
6557
await onUpdateLocalRecordAsync(patch);
66-
await onUpdateFirestoreRecordAsync(patch);
6758
},
68-
[onUpdateFirestoreRecordAsync, onUpdateLocalRecordAsync],
59+
[onUpdateLocalRecordAsync],
6960
);
7061

7162
/**
@@ -75,9 +66,8 @@ export const useAnimalMarkers = (mapId: MapId) => {
7566
async (record: AnimalMarkerRecord) => {
7667
// Delete marker record from the server
7768
await onDeleteLocalRecordAsync(record);
78-
await onDeleteFirestoreRecordAsync(record);
7969
},
80-
[onDeleteFirestoreRecordAsync, onDeleteLocalRecordAsync],
70+
[onDeleteLocalRecordAsync],
8171
);
8272

8373
return {

src/hooks/useCustomMarkers.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { getCoordinateHash } from 'lib/markers';
66
import type { MapId } from 'types/cartography';
77
import type { Point } from 'types/generic';
88
import type { CustomMarker, CustomMarkerType } from 'types/markers';
9-
import { useFirestoreCustomMarkers } from './useFirestoreCustomMarkers';
109
import { useLocalCustomMarkers } from './useLocalCustomMarkers';
1110

1211
export const useCustomMarkers = (mapId: MapId) => {
@@ -17,19 +16,12 @@ export const useCustomMarkers = (mapId: MapId) => {
1716
onDeleteCustomMarkerAsync: onDeleteLocalCustomMarkerAsync,
1817
} = useLocalCustomMarkers(mapId);
1918

20-
const {
21-
onClearTrackingMarkersAsync: onClearFirestoreTrackingMarkersAsync,
22-
onCreateCustomMarkerAsync: onCreateFirestoreCustomMarkerAsync,
23-
onDeleteCustomMarkerAsync: onDeleteFirestoreCustomMarkerAsync,
24-
} = useFirestoreCustomMarkers(mapId);
25-
2619
/**
2720
* Handle clearing all tracking markers
2821
*/
2922
const handleClearTrackingAsync = useCallback(async () => {
30-
await onClearFirestoreTrackingMarkersAsync();
3123
await onClearLocalTrackingMarkersAsync();
32-
}, [onClearFirestoreTrackingMarkersAsync, onClearLocalTrackingMarkersAsync]);
24+
}, [onClearLocalTrackingMarkersAsync]);
3325

3426
/**
3527
* Handle creating a new custom marker
@@ -45,21 +37,19 @@ export const useCustomMarkers = (mapId: MapId) => {
4537
type,
4638
};
4739

48-
await onCreateFirestoreCustomMarkerAsync(marker);
4940
await onCreateLocalCustomMarkerAsync(marker);
5041
},
51-
[onCreateFirestoreCustomMarkerAsync, onCreateLocalCustomMarkerAsync],
42+
[onCreateLocalCustomMarkerAsync],
5243
);
5344

5445
/**
5546
* Handle deleting an existing custom marker
5647
*/
5748
const handleDeleteCustomAsync = useCallback(
5849
async (marker: CustomMarker) => {
59-
await onDeleteFirestoreCustomMarkerAsync(marker);
6050
await onDeleteLocalCustomMarkerAsync(marker);
6151
},
62-
[onDeleteFirestoreCustomMarkerAsync, onDeleteLocalCustomMarkerAsync],
52+
[onDeleteLocalCustomMarkerAsync],
6353
);
6454

6555
return {

0 commit comments

Comments
 (0)