This repository has been archived by the owner on Jul 18, 2024. It is now read-only.
[WIP] [Don't Merge] Utilize frontend-component-header for studio header #69
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,8 +37,9 @@ | |
| "dependencies": { | ||
| "@edx/brand": "npm:@edx/[email protected]", | ||
| "@edx/frontend-component-footer": "10.2.1", | ||
| "@edx/frontend-component-header": "github:brian-smith-tcril/frontend-component-header#studio-header-for-prs", | ||
| "@edx/frontend-platform": "^3.0.0", | ||
| "@edx/paragon": "^20.11.1", | ||
| "@fortawesome/fontawesome-svg-core": "1.2.36", | ||
| "@fortawesome/free-brands-svg-icons": "5.15.4", | ||
| "@fortawesome/free-regular-svg-icons": "5.15.4", | ||
|
|
@@ -83,6 +84,7 @@ | |
| "reactifex": "1.1.1", | ||
| "redux-mock-store": "1.5.4", | ||
| "rosie": "2.0.1", | ||
| "webpack-cli": "^4.10.0", | ||
| "webpack-merge": "5.8.0" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,25 +20,31 @@ import { | |
| LibraryEditPage, | ||
| LibraryListPage, | ||
| LibraryCreatePage, | ||
| LibraryAccessPage, | ||
| LibraryAuthoringPage, | ||
| StudioHeaderWrapper, | ||
| } from './library-authoring'; | ||
| import './index.scss'; | ||
| import './assets/favicon.ico'; | ||
|
|
||
| mergeConfig({ | ||
| LIB_AUTHORING_BASE_URL: process.env.BASE_URL, | ||
| STUDIO_BASE_URL: process.env.STUDIO_BASE_URL, | ||
| LOGO_URL: process.env.LOGO_TRADEMARK_URL, | ||
| BLOCKSTORE_COLLECTION_UUID: process.env.BLOCKSTORE_COLLECTION_UUID, | ||
| SECURE_ORIGIN_XBLOCK_BOOTSTRAP_HTML_URL: process.env.SECURE_ORIGIN_XBLOCK_BOOTSTRAP_HTML_URL, | ||
| }); | ||
|
|
||
| subscribe(APP_READY, () => { | ||
| ReactDOM.render( | ||
| <AppProvider store={store}> | ||
| {/* todo: look for a better way to do this, using these routes in | ||
|
There was a problem hiding this comment. Interested in hearing suggestions for alternatives. I assume you're wrapping There was a problem hiding this comment. my main issue with this implementation is having multiple route switches in the i did add it in f934987 to clear the state (since i was hoping i'd have some better ideas by now, but nothing is coming to mind There was a problem hiding this comment. For what it's worth, it seems to me like a legitimate use of There was a problem hiding this comment. sounds good, i'll remove the todo |
||
| a switch feels less than ideal */} | ||
| <Switch> | ||
| <Route path={ROUTES.Detail.HOME} component={StudioHeaderWrapper} /> | ||
| <Route path="*" component={StudioHeaderWrapper} /> | ||
| </Switch> | ||
| <main className="library-authoring__main-content"> | ||
| <Switch> | ||
| <Route exact path={ROUTES.List.HOME} component={LibraryListPage} /> | ||
| <Route exact path={ROUTES.List.CREATE} component={LibraryCreatePage} /> | ||
|
|
@@ -56,7 +62,6 @@ subscribe(APP_READY, () => { | |
| </main> | ||
| <AboutLibrariesHyperlink /> | ||
| <Footer /> | ||
| </AppProvider>, | ||
| document.getElementById('root'), | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this. Makes it much easier to test.
Do you mind making a PR out of the
frontend-component-headerchanges, though? However WIP it still is.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
openedx/frontend-component-header#264
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent, thank you!