Merge pull request #10 from mitmedialab/maya-attempt-2

Maya attempt 2
mitmedialab · May 21, 2024 · 7701767 · 7701767
2 parents 911319a + 65b0fb6
commit 7701767
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 31 deletions.
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
@@ -812,23 +812,6 @@ class MenuBar extends React.Component {
                         )}
                     </div>
                     <Divider className={classNames(styles.divider)} />
-                    {true ? (
-                        <div>
-                            <div
-                                aria-label={this.props.intl.formatMessage(ariaMessages.tutorials)}
-                                className={classNames(styles.menuBarItem, styles.hoverable)}
-                                onClick={this.props.onOpenTipLibrary}
-                            >
-                                <img
-                                    className={styles.helpIcon}
-                                    src={helpIcon}
-                                />
-                                <FormattedMessage {...ariaMessages.tutorials} />
-                            </div>
-                        </div>) :
-                        null
-                    }
-                    <Divider className={classNames(styles.divider)} />
                     {this.props.canEditTitle ? (
                         <div className={classNames(styles.menuBarItem, styles.growable)}>
                             <MenuBarItemTooltip

diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx
@@ -209,7 +209,7 @@ const WrappedGui = compose(
     ProjectSaverHOC,
     vmListenerHOC,
     vmManagerHOC,
-    //SBFileUploaderHOC,
+    SBFileUploaderHOC,
     cloudManagerHOC,
     systemPreferencesHOC
 )(ConnectedGUI);

diff --git a/src/css/colors.css b/src/css/colors.css
@@ -17,7 +17,7 @@ $text-primary-transparent: hsla(225, 15%, 40%, 0.75);
 $motion-primary: hsla(215, 100%, 65%, 1); /* #4C97FF */
 $motion-tertiary: hsla(215, 60%, 50%, 1); /* #3373CC */
 
-$looks-secondary: hsla(260, 60%, 60%, 1); /* #855CD6 */
+$looks-secondary: hsla(215, 100%, 65%, 1); /* #855CD6 */
 $looks-transparent: hsla(260, 60%, 60%, 0.35); /* 35% transparent version of looks-tertiary */
 $looks-light-transparent: hsla(260, 60%, 60%, 0.15); /* 15% transparent version of looks-tertiary */
 $looks-secondary-dark: 	hsla(260, 42%, 51%, 1); /* #714EB6 */

diff --git a/src/lib/default-project/index.js b/src/lib/default-project/index.js
@@ -1,19 +1,21 @@
 import projectData from './project-data';
 
 /* eslint-disable import/no-unresolved */
-import popWav from '!arraybuffer-loader!./83a9787d4cb6f3b7632b4ddfebf74367.wav';
-import meowWav from '!arraybuffer-loader!./83c36d806dc92327b9e7049a565c6bff.wav';
-import motorWav from '!arraybuffer-loader!./tinybit_motor.wav';
-import backdrop from '!raw-loader!./cd21514d0531fdffb22204e0ec5ed84a.svg';
-import costume1 from '!raw-loader!./tinybit_top.svg';
-import costume2 from '!raw-loader!./tinybit_heart.svg';
+import popWav from '!!arraybuffer-loader!./83a9787d4cb6f3b7632b4ddfebf74367.wav';
+import meowWav from '!!arraybuffer-loader!./83c36d806dc92327b9e7049a565c6bff.wav';
+import motorWav from '!!arraybuffer-loader!./tinybit_motor.wav';
+import backdrop from '!!raw-loader!./cd21514d0531fdffb22204e0ec5ed84a.svg';
+import costume1 from '!!raw-loader!./tinybit_top.svg';
+import costume2 from '!!raw-loader!./tinybit_heart.svg';
 /* eslint-enable import/no-unresolved */
 
 const defaultProject = translator => {
+
     let _TextEncoder;
     if (typeof TextEncoder === 'undefined') {
         _TextEncoder = require('text-encoding').TextEncoder;
     } else {
+        /* global TextEncoder */
         _TextEncoder = TextEncoder;
     }
     const encoder = new _TextEncoder();
@@ -28,7 +30,7 @@ const defaultProject = translator => {
         id: '83a9787d4cb6f3b7632b4ddfebf74367',
         assetType: 'Sound',
         dataFormat: 'WAV',
-        data: new Uint8Array(popWav)
+        data: new Uint8Array(popWav),
     }, {
         id: '83c36d806dc92327b9e7049a565c6bff',
         assetType: 'Sound',
@@ -38,14 +40,14 @@ const defaultProject = translator => {
         id: '93c36d806dc92327b9e7049a565c6bff',
         assetType: 'Sound',
         dataFormat: 'WAV',
-        data: new Uint8Array(motorWav)
+        data: new Uint8Array(motorWav),
     }, {
         id: 'cd21514d0531fdffb22204e0ec5ed84a',
         assetType: 'ImageVector',
         dataFormat: 'SVG',
         data: encoder.encode(backdrop)
     }, {
-        id: 'bcf454acf82e4504149f7ffe07081dbc',
+        id: 'b7853f557e4426412e64bb3da6531a99',
         assetType: 'ImageVector',
         dataFormat: 'SVG',
         data: encoder.encode(costume1)
@@ -59,4 +61,4 @@ const defaultProject = translator => {
     ];
 };
 
-export default defaultProject;
+export default defaultProject;
diff --git a/src/lib/default-project/project-data.js b/src/lib/default-project/project-data.js
@@ -74,10 +74,10 @@ const projectData = translateFunction => {
                 currentCostume: 0,
                 costumes: [
                     {
-                        assetId: 'bcf454acf82e4504149f7ffe07081dbc',
+                        assetId: 'b7853f557e4426412e64bb3da6531a99',
                         name: translator(messages.costume, {index: 1}),
                         bitmapResolution: 1,
-                        md5ext: 'bcf454acf82e4504149f7ffe07081dbc.svg',
+                        md5ext: 'b7853f557e4426412e64bb3da6531a99.svg',
                         dataFormat: 'svg',
                         rotationCenterX: 128,
                         rotationCenterY: 145

diff --git a/src/lib/libraries/extensions/arduino_extension/gizmo_extension.png b/src/lib/libraries/extensions/arduino_extension/gizmo_extension.png