Skip to content

Commit 1cd556f

Browse files
authored
Merge pull request #540 from 3DStreet/street-geo-editor
Street geo editor
2 parents 5552174 + 5205ac3 commit 1cd556f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2061
-524
lines changed

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@ gh-pages/
77
npm-debug.log*
88
build/
99
*.sw[pomn]
10-
# That's /src/lib/aframe-loader-3dtiles-component.min.js
11-
dist/48406973e3ad4d65cbdd.js*
12-
dist/aframe-mapbox-component.min.js
13-
dist/notyf.min.css
14-
dist/viewer-styles.css
10+
dist/
11+
/public/assets

dist/aframe-street-component.js

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

index.html

Lines changed: 161 additions & 150 deletions
Large diffs are not rendered by default.

package-lock.json

Lines changed: 83 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
"start": "webpack serve --config webpack.config.js --open --progress",
88
"start:prod": "serve public -l 3333",
99
"dist": "webpack --config webpack.prod.config.js --progress",
10+
"dist:staging": "cross-env DEPLOY_ENV=development webpack --config webpack.prod.config.js --progress",
1011
"lint": "eslint --ext .js,.jsx src",
11-
"lint:fix": "eslint 'src/**/*.js' 'src/**/*.jsx' --fix",
12+
"lint:fix": "eslint --ext .js,.jsx --fix src",
1213
"prefirebase": "cp -R assets public && cp -R ui_assets public && cp index.html public && cp -R dist public",
1314
"prepare": "husky install",
1415
"prepublish": "npm run dist",
1516
"test": "nyc --reporter=lcov --reporter=text mocha --recursive --full-trace test/*.test.js",
1617
"test:watch": "mocha --recursive --full-trace --watch test/*.test.js",
1718
"prettier": "prettier --write 'src/**/*.js' 'src/**/*.jsx'",
18-
"deploy": "npm run prefirebase && cd public && firebase deploy --only hosting:app3dstreet",
19+
"deploy": "npm run dist && npm run prefirebase && cd public && firebase use dstreet-305604 && firebase deploy --only hosting:app3dstreet",
20+
"deploy:staging": "npm run dist:staging && npm run prefirebase && cd public && firebase use dev-3dstreet && firebase deploy --only hosting:dev-3dstreet",
1921
"storybook": "storybook dev -p 6006",
2022
"build-storybook": "storybook build"
2123
},
@@ -24,6 +26,7 @@
2426
"homepage": "https://github.com/3dstreet/3dstreet/",
2527
"license": "AGPLv3",
2628
"dependencies": {
29+
"@react-google-maps/api": "^2.19.3",
2730
"aframe-atlas-uvs-component": "^3.0.0",
2831
"classnames": "^2.3.2",
2932
"clipboard": "^2.0.11",
@@ -56,6 +59,7 @@
5659
"babel-loader": "^9.1.3",
5760
"copy-webpack-plugin": "^12.0.2",
5861
"css-loader": "^6.10.0",
62+
"cross-env": "^7.0.3",
5963
"css-minimizer-webpack-plugin": "^6.0.0",
6064
"dotenv-webpack": "^8.0.1",
6165
"eslint": "^8.57.0",
@@ -101,4 +105,4 @@
101105
"eslint"
102106
]
103107
}
104-
}
108+
}

public/assets/.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
*
2-
*/
3-
!.gitignore
1+
.DS_Store

0 commit comments

Comments
 (0)