Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
map_UT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anael Lacour
map_UT
Commits
49f0bdec
Commit
49f0bdec
authored
2 years ago
by
Antoine Marquis
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of
https://gitlab.utc.fr/lacouran/map_ut
into develop
parents
b0f6cece
fb2ec539
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
frontend/babel.config.js
+10
-3
10 additions, 3 deletions
frontend/babel.config.js
frontend/package.json
+1
-0
1 addition, 0 deletions
frontend/package.json
frontend/src/pages/map/map.js
+3
-16
3 additions, 16 deletions
frontend/src/pages/map/map.js
with
14 additions
and
19 deletions
frontend/babel.config.js
+
10
−
3
View file @
49f0bdec
module
.
exports
=
function
(
api
)
{
module
.
exports
=
function
(
api
)
{
api
.
cache
(
true
);
return
{
presets
:
[
'
babel-preset-expo
'
],
return
{
presets
:
[
'
babel-preset-expo
'
],
plugins
:
[[
'
module:react-native-dotenv
'
,
{
'
moduleName
'
:
'
@env
'
,
'
path
'
:
'
.env
'
,
'
blacklist
'
:
null
,
'
whitelist
'
:
null
,
'
safe
'
:
false
,
'
allowUndefined
'
:
true
}]]
};
};
This diff is collapsed.
Click to expand it.
frontend/package.json
+
1
−
0
View file @
49f0bdec
...
...
@@ -26,6 +26,7 @@
"react-google-maps"
:
"^9.4.5"
,
"react-google-maps-loader"
:
"^4.3.0"
,
"react-native"
:
"0.68.1"
,
"react-native-dotenv"
:
"^3.3.1"
,
"react-native-elements"
:
"^3.4.2"
,
"react-native-normalize"
:
"^1.0.1"
,
"react-native-paper"
:
"^4.12.0"
,
...
...
This diff is collapsed.
Click to expand it.
frontend/src/pages/map/map.js
+
3
−
16
View file @
49f0bdec
import
{
TouchableOpacity
}
from
'
react-native
'
;
const
MY_API_KEY
=
"
AIzaSyB6HzGgBMx02aU48usTEQU6eijbvT8Sswo
"
import
{
API_KEY
}
from
'
@env
'
const
MY_API_KEY
=
API_KEY
console
.
log
(
MY_API_KEY
)
import
React
,
{
Component
,
useEffect
,
useRef
,
useState
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
isEmpty
from
'
lodash.isempty
'
;
import
jsonFile
from
'
../../../public/places.json
'
;
import
GoogleMap
from
'
../../components/googleMap
'
;
import
useComponentVisible
from
'
../../components/ComponentVisible
'
...
...
@@ -39,7 +39,6 @@ const InfoWindow = (props) => {
<
div
ref
=
{
ref
}
>
{
isComponentVisible
&&
(
<
TouchableOpacity
>
<
div
style
=
{
infoWindowStyle
}
>
<
div
style
=
{{
fontSize
:
16
}}
>
...
...
@@ -102,19 +101,7 @@ class MarkerInfoWindow extends Component {
places
:
[],
};
}
componentDidMount
()
{
// const getPlaces = async () => {
// const response = await fetch("./places.json");
// if (!response.ok) {
// throw new Error(`HTTP error ${response.status}`);
// }
// return await response.json();
// };
// const placesJson=getPlaces()
// console.log(placesJson)
jsonFile
.
results
.
forEach
((
result
)
=>
{
result
.
show
=
false
;
// eslint-disable-line no-param-reassign
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment