Added again the backpack for travis, refers to #1

CoderDojoTrento · Aug 30, 2020 · 68f87fc · 68f87fc
1 parent 4434e4d
commit 68f87fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
@@ -24,7 +24,7 @@ import CostumeLibrary from '../../containers/costume-library.jsx';
 import BackdropLibrary from '../../containers/backdrop-library.jsx';
 import Watermark from '../../containers/watermark.jsx';
 
-// import Backpack from '../../containers/backpack.jsx';
+import Backpack from '../../containers/backpack.jsx';
 import WebGlModal from '../../containers/webgl-modal.jsx';
 import TipsLibrary from '../../containers/tips-library.jsx';
 import Cards from '../../containers/cards.jsx';
@@ -67,8 +67,8 @@ const GUIComponent = props => {
         authorUsername,
         basePath,
         backdropLibraryVisible,
-        /* backpackHost,
-        backpackVisible, */
+        backpackHost,
+        backpackVisible,
         blocksTabVisible,
         cardsVisible,
         canChangeLanguage,
@@ -388,9 +388,9 @@ const GUIComponent = props => {
                                 </TabPanel>
 
                             </Tabs>
-                            {/* {backpackVisible ? (
+                            {backpackVisible ? (
                                 <Backpack host={backpackHost} />
-                            ) : null} */}
+                            ) : null}
                         </Box>
 
                         <Box className={classNames(styles.stageAndTargetWrapper, styles[stageSize])}>
@@ -422,8 +422,8 @@ GUIComponent.propTypes = {
     authorThumbnailUrl: PropTypes.string,
     authorUsername: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]), // can be false
     backdropLibraryVisible: PropTypes.bool,
-    /* backpackHost: PropTypes.string,
-    backpackVisible: PropTypes.bool, */
+    backpackHost: PropTypes.string,
+    backpackVisible: PropTypes.bool,
     basePath: PropTypes.string,
     blocksTabVisible: PropTypes.bool,
     canChangeLanguage: PropTypes.bool,
@@ -479,8 +479,8 @@ GUIComponent.propTypes = {
     vm: PropTypes.instanceOf(VM).isRequired
 };
 GUIComponent.defaultProps = {
-    /* backpackHost: null,
-    backpackVisible: false, */
+    backpackHost: null,
+    backpackVisible: false,
     basePath: './',
     canChangeLanguage: true,
     canCreateNew: false,

diff --git a/src/playground/render-gui.jsx b/src/playground/render-gui.jsx
@@ -40,8 +40,8 @@ export default appTarget => {
     )(GUI);
 
     // TODO a hack for testing the backpack, allow backpack host to be set by url param
-    // const backpackHostMatches = window.location.href.match(/[?&]backpack_host=([^&]*)&?/);
-    // const backpackHost = backpackHostMatches ? backpackHostMatches[1] : null;
+    const backpackHostMatches = window.location.href.match(/[?&]backpack_host=([^&]*)&?/);
+    const backpackHost = backpackHostMatches ? backpackHostMatches[1] : null;
 
     const scratchDesktopMatches = window.location.href.match(/[?&]isScratchDesktop=([^&]+)/);
     let simulateScratchDesktop;
@@ -75,9 +75,9 @@ export default appTarget => {
             /> :
             <WrappedGui
                 canEditTitle
-                // backpackVisible
+                backpackVisible
                 // showComingSoon
-                // backpackHost={backpackHost}
+                backpackHost={backpackHost}
                 canSave={false}
                 onClickLogo={onClickLogo}
             />,