From dd9971591710903fa543a2382ebc454b9bd8059e Mon Sep 17 00:00:00 2001 From: Aquino Luane Date: Mon, 28 Oct 2024 15:04:53 +0900 Subject: [PATCH] feat: set projectId from url --- src/lib/hash-parser-hoc.jsx | 2 +- src/reducers/project-state.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/hash-parser-hoc.jsx b/src/lib/hash-parser-hoc.jsx index bb139ddca..dd6a6e227 100644 --- a/src/lib/hash-parser-hoc.jsx +++ b/src/lib/hash-parser-hoc.jsx @@ -41,7 +41,7 @@ const HashParserHOC = function (WrappedComponent) { window.removeEventListener('hashchange', this.handleHashChange); } handleHashChange () { - const hashMatch = window.location.hash.match(/#(\d+)/); + const hashMatch = window.location.hash.match(/\/(\d+)$/); const hashProjectId = hashMatch === null ? defaultProjectId : hashMatch[1]; this.props.setProjectId(hashProjectId.toString()); } diff --git a/src/reducers/project-state.js b/src/reducers/project-state.js index e5e413170..76955d589 100644 --- a/src/reducers/project-state.js +++ b/src/reducers/project-state.js @@ -23,7 +23,7 @@ const START_REMIXING = 'scratch-gui/project-state/START_REMIXING'; const START_UPDATING_BEFORE_CREATING_COPY = 'scratch-gui/project-state/START_UPDATING_BEFORE_CREATING_COPY'; const START_UPDATING_BEFORE_CREATING_NEW = 'scratch-gui/project-state/START_UPDATING_BEFORE_CREATING_NEW'; -const defaultProjectId = '1'; // hardcoded id of default project +const defaultProjectId = '0'; // hardcoded id of default project const LoadingState = keyMirror({ NOT_LOADED: null,