Merge branch 'main' into fix-title-display

3DStreet · Jun 11, 2024 · 0d838ee · 0d838ee
2 parents 56eedbb + ea4fe4d
commit 0d838ee
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 21 deletions.
diff --git a/index.html b/index.html
@@ -73,6 +73,12 @@
     </button>
   </div>
 
+  <!-- maps copyright start -->
+  <div id="map-data-attribution" style="visibility: hidden;">
+    <div id="map-logo">Map Attribution:</div>
+    <span id="map-copyright"></span>
+  </div>
+
   <!-- <div class="right-fixed">
     <ul class="right-menu">
       <li onclick="buttonScreenshotTock()"> <a class="camera" href="#"> <span> Capture image as PNG </span> <img

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,6 @@
     "@babel/eslint-parser": "^7.24.5",
     "@babel/preset-env": "^7.24.0",
     "@babel/preset-react": "^7.23.3",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@storybook/addon-essentials": "^7.6.3",
     "@storybook/addon-interactions": "^7.6.3",
     "@storybook/addon-links": "^7.6.3",
@@ -76,7 +75,6 @@
     "nyc": "^15.1.0",
     "prettier": "^3.1.0",
     "pretty": "^2.0.0",
-    "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
     "rewire": "^7.0.0",
     "sass": "^1.69.5",
@@ -107,4 +105,4 @@
       "eslint"
     ]
   }
-}
+}
diff --git a/src/components/street-geo.js b/src/components/street-geo.js
@@ -30,6 +30,9 @@ AFRAME.registerComponent('street-geo', {
       this[mapType + 'Update'].bind(this);
     }
   },
+  remove: function () {
+    document.getElementById('map-data-attribution').style.visibility = 'hidden';
+  },
   update: function (oldData) {
     const data = this.data;
 
@@ -51,6 +54,10 @@ AFRAME.registerComponent('street-geo', {
         // remove element from DOM and from this object
         this.el.removeChild(this[mapType]);
         this[mapType] = null;
+        if (mapType === 'google3d') {
+          document.getElementById('map-data-attribution').style.visibility =
+            'hidden';
+        }
       }
     }
   },
@@ -81,6 +88,7 @@ AFRAME.registerComponent('street-geo', {
     mapbox2dElement.setAttribute('data-ignore-raycaster', '');
     el.appendChild(mapbox2dElement);
     this['mapbox2d'] = mapbox2dElement;
+    document.getElementById('map-data-attribution').style.visibility = 'hidden';
   },
   google3dCreate: function () {
     const data = this.data;
@@ -100,12 +108,15 @@ AFRAME.registerComponent('street-geo', {
         geoTransform: 'WGS84Cartesian',
         maximumSSE: 16,
         maximumMem: 400,
-        cameraEl: '#camera'
+        cameraEl: '#camera',
+        copyrightEl: '#map-copyright'
       });
       google3dElement.classList.add('autocreated');
       google3dElement.setAttribute('data-ignore-raycaster', '');
       el.appendChild(google3dElement);
       self['google3d'] = google3dElement;
+      document.getElementById('map-data-attribution').style.visibility =
+        'visible';
     };
 
     // check whether the library has been imported. Download if not

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
@@ -5,7 +5,7 @@ import {
   isSceneAuthor,
   checkIfImagePathIsEmpty
 } from '../../api/scene';
-import { Cloud24Icon, RemixIcon, Save24Icon, Upload24Icon } from '../../icons';
+import { Cloud24Icon, Save24Icon, Upload24Icon } from '../../icons';
 import Events from '../../lib/Events';
 import { saveBlob } from '../../lib/utils';
 import { Button, ProfileButton, ScreenshotButton } from '../components';
@@ -368,13 +368,12 @@ export default class Toolbar extends Component {
     return (
       <div id="toolbar">
         <div className="toolbarActions">
-          {this.state.showSaveBtn &&
-          !!this.props.isAuthor &&
-          this.props.currentUser ? (
+          {this.state.showSaveBtn && this.props.currentUser ? (
             <div className="saveButtonWrapper" ref={this.saveButtonRef}>
               <Button
                 className={'actionBtn'}
                 onClick={this.toggleSaveActionState.bind(this)}
+                disabled={!this.props.isAuthor}
               >
                 <div
                   className="iconContainer"
@@ -437,9 +436,9 @@ export default class Toolbar extends Component {
                   margin: '-2.5px 0px -2.5px -2px'
                 }}
               >
-                <RemixIcon />
+                <Save24Icon />
               </div>
-              <div className={'innerText'}>Remix</div>
+              <div className={'innerText'}>Save</div>
             </Button>
           )}
           {this.state.showLoadBtn && (

diff --git a/src/viewer-styles.css b/src/viewer-styles.css
@@ -18,6 +18,32 @@ body {
 	margin: 0;
 }
 
+/* maps copyright notice */
+#map-data-attribution {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	font-size: 10px;
+	background-color: rgba(0, 0, 0, 0.3);
+	color: #bebebe;
+	z-index: 1;
+}
+
+#map-logo {
+	display: inline;
+	font-style: normal;
+	font-size: 10px;
+	line-height: 10px;
+	color: #bebebe;
+}
+
+#map-copyright {
+	display: inline-block;
+	line-height: 10px;
+	color: #bebebe;
+
+}
+
 /* notification hack */
 .notyf__message {
 	font-size: 20px !important;

diff --git a/webpack.config.js b/webpack.config.js
@@ -2,7 +2,6 @@ const webpack = require('webpack');
 const path = require('path');
 const Dotenv = require('dotenv-webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 
 module.exports = {
   mode: 'development',
@@ -23,8 +22,6 @@ module.exports = {
       import: ['./src/editor/index.js'],
       filename: '3dstreet-editor.js'
     },
-    // react-refresh doesn't work with multiple entry points so we use the production build of aframe-street-component.js in development,
-    // you will need to run `npm run dist` to see your changes or uncomment temporarily the following line and run `npm start` again.
     core: { import: './src/index.js', filename: 'aframe-street-component.js' }
   },
   output: {
@@ -37,7 +34,6 @@ module.exports = {
     three: 'THREE'
   },
   plugins: [
-    new ReactRefreshWebpackPlugin(),
     new Dotenv({
       path: './config/.env.development'
     }),
@@ -58,10 +54,7 @@ module.exports = {
         test: /\.jsx?$/,
         exclude: /node_modules/,
         use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: ['react-refresh/babel']
-          }
+          loader: 'babel-loader'
         }
       },
       {

diff --git a/webpack.prod.config.js b/webpack.prod.config.js
@@ -35,7 +35,12 @@ module.exports = {
     }),
     new CopyWebpackPlugin({
       patterns: [
-        { from: 'src/lib/aframe-mapbox-component.min.js' },
+        {
+          from: 'src/lib/aframe-mapbox-component.min.js',
+          info: {
+            minimized: true
+          }
+        },
         { from: 'src/notyf.min.css' },
         { from: 'src/viewer-styles.css' }
       ]