Skip to content

Commit

Permalink
Merge branch 'street-geo-editor' of https://github.com/3DStreet/3dstreet
Browse files Browse the repository at this point in the history
 into street-geo-editor
  • Loading branch information
kfarr committed May 31, 2024
2 parents a314cd3 + 97b02e8 commit b0ad54f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/editor/components/modals/GeoModal/GeoModal.component.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useState, useCallback, useEffect } from 'react';
import styles from './GeoModal.module.scss';
import { Mangnifier20Icon } from '../../../icons';

import { firebaseConfig } from '../../../services/firebase.js';
import Modal from '../Modal.jsx';
import { Button, Input } from '../../components/index.js';
import { GoogleMap, useJsApiLoader, Marker } from '@react-google-maps/api';
Expand Down Expand Up @@ -43,7 +44,7 @@ const GeoModal = ({ isOpen, onClose }) => {
}, []);

const { isLoaded } = useJsApiLoader({
googleMapsApiKey: process.env.FIREBASE_API_KEY
googleMapsApiKey: firebaseConfig.apiKey
});

const onSaveHandler = () => {
Expand Down
3 changes: 2 additions & 1 deletion src/editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { initCameras } from './lib/cameras';
import { createEntity } from './lib/entity';
import { Shortcuts } from './lib/shortcuts';
import { Viewport } from './lib/viewport';
import { firebaseConfig } from './services/firebase.js';
import './style/index.scss';
import ReactGA from 'react-ga4';

Expand Down Expand Up @@ -325,7 +326,7 @@ Inspector.prototype = {
}
};

ReactGA.initialize(process.env.FIREBASE_MEASUREMENT_ID);
ReactGA.initialize(firebaseConfig.measurementId);
const inspector = (AFRAME.INSPECTOR = new Inspector());

export { inspector };
2 changes: 1 addition & 1 deletion src/editor/services/firebase.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ const auth = getAuth(app);
const storage = getStorage(app);
const db = getFirestore(app);

export { auth, storage, db };
export { firebaseConfig, auth, storage, db };

0 comments on commit b0ad54f

Please sign in to comment.