chore(rebuild): finish navigation refactoring #2048
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
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 |
|---|---|---|
| @@ -1,67 +1,67 @@ | ||
| // Import External Dependencies | ||
| import React from 'react'; | ||
| import Banner from 'react-banner'; | ||
| import DocSearch from 'docsearch.js'; | ||
|
|
||
| // Import Utilities/Images | ||
| import GitHubIcon from '../../styles/icons/github.svg'; | ||
|
|
||
| // Import Components | ||
| import Link from '../Link/Link'; | ||
| import Container from '../Container/Container'; | ||
| import Logo from '../Logo/Logo'; | ||
| import Dropdown from '../Dropdown/Dropdown'; | ||
|
|
||
| // Load Styling | ||
| import 'docsearch.js/dist/cdn/docsearch.css'; | ||
| import './Navigation.scss'; | ||
| import './Search.scss'; | ||
|
|
||
| export default class Navigation extends React.Component { | ||
| render() { | ||
| let { pathname, links, toggleSidebar } = this.props; | ||
|
|
||
| return ( | ||
| <Banner | ||
| blockName="navigation" | ||
| logo={ <Logo light={ true } /> } | ||
| url={ pathname } | ||
| items={[ | ||
| ...links, | ||
| { | ||
| title: 'GitHub Repository', | ||
| url: 'https://github.com/webpack/webpack', | ||
| className: 'navigation__item--icon', | ||
| content: <i className="icon-github" /> | ||
| }, | ||
| { | ||
| title: 'Webpack on Stack Overflow', | ||
| url: 'https://stackoverflow.com/questions/tagged/webpack', | ||
| className: 'navigation__item--icon', | ||
| content: <i className="icon-stack-overflow" /> | ||
| }, | ||
| { | ||
| className: 'navigation__item--icon', | ||
| content: ( | ||
| <Dropdown | ||
| className="navigation__languages" | ||
| items={[ | ||
| { title: 'English', url: 'https://webpack.js.org/' }, | ||
| { title: '中文', url: 'https://doc.webpack-china.org/' } | ||
| ]} /> | ||
| ) | ||
| } | ||
| ]} | ||
| link={ Link } | ||
| onMenuClick={ toggleSidebar } /> | ||
| ); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| DocSearch({ | ||
| apiKey: 'fac401d1a5f68bc41f01fb6261661490', | ||
| indexName: 'webpack-js-org', | ||
| inputSelector: '.navigation-search__input' | ||
| }); | ||
| } | ||
| } | ||
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
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 |
|---|---|---|
|
|
@@ -62,16 +62,16 @@ class Site extends React.Component { | |
| toggleSidebar={ this._toggleSidebar } | ||
| links={[ | ||
| { | ||
| content: 'Documentation', | ||
| url: '/concepts', | ||
|
There was a problem hiding this comment. We need to rethink how URLs are formed, when trying to build the site to work under a path I had to do a lot of changes (https://github.com/webpack/webpack.js.org/tree/fix/v3-docs), we need to work on it now in order to be able to support multiple versions in the future There was a problem hiding this comment. Yeah that's definitely something we need to tackle at some point, but is that something that needs to happen before Personally I think figure out version management as a follow up after finishing There was a problem hiding this comment. this is indeed a pain point for community, though lets try to keep it to the plan and get There was a problem hiding this comment. No, after merging I have tried to push that change, without success #1992 :/ |
||
| isActive: url => /^\/(api|concepts|configuration|guides|loaders|plugins)/.test(url), | ||
| children: this._strip( | ||
| sections.filter(item => item.name !== 'contribute') | ||
| ) | ||
| }, | ||
| { content: 'Contribute', url: '/contribute' }, | ||
| { content: 'Vote', url: '/vote' }, | ||
| { content: 'Blog', url: 'https://medium.com/webpack' } | ||
| ]} /> | ||
|
|
||
| { window.document !== undefined ? ( | ||
|
|
@@ -165,6 +165,7 @@ class Site extends React.Component { | |
| _strip = array => { | ||
| return array.map(({ title, name, url, group, sort, anchors, children }) => ({ | ||
| title: title || name, | ||
| content: title || name, | ||
| url, | ||
| group, | ||
| sort, | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Is this dependency used? I can't spot it. I'm seeing we are using the class for the icon font instead.
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.
Good catch, I’ll remove it. Played around with it momentarily and the fixed font metrics instead.