Skip to content

feat: Refactor navigation component rendering logic #9911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+50 −38
Open

feat: Refactor navigation component rendering logic #9911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 50 additions & 38 deletions src/components/navigation/www/navigation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,49 +92,57 @@ class Navigation extends React.Component {
}
window.location.href = targetUrl;
}
render () {
const createLink = this.props.user ? '/projects/editor/' : '/projects/editor/?tutorial=getStarted';
return (
<NavigationBox
className={classNames({
'logged-in': this.props.user
})}
>
<ul>
<li className="logo">
<a
aria-label="Scratch"
href="/"
/>
</li>
render () {
const createLink = this.props.user
? '/projects/editor/'
: '/projects/editor/?tutorial=getStarted';

<li className="link create">
<a href={createLink}>
<FormattedMessage id="general.create" />
</a>
</li>
<li className="link explore">
<a href="/explore/projects/all">
<FormattedMessage id="general.explore" />
return (
<NavigationBox
className={classNames({
'logged-in': this.props.user
})}
>
<ul>
<li className="logo">
<a aria-label="Scratch" href="/" />
</li>

<li className="link create">
<a href={createLink}>
<FormattedMessage id="general.create" />
</a>
</li>

<li className="link explore">
<a href="/explore/projects/all">
<FormattedMessage id="general.explore" />
</a>
</li>

<li className="link ideas">
<a href="/ideas">
<FormattedMessage id="general.ideas" />
</a>
</li>

{this.props.isLoggedIn === false ? (
<li className="link membership">
<a href="/membership">
<FormattedMessage id="general.membership" />
</a>
</li>
<li className="link ideas">
<a href="/ideas">
<FormattedMessage id="general.ideas" />
) : (
<li className="link about">
<a href="/about">
<FormattedMessage id="general.about" />
</a>
</li>
{
!this.props.user &&
(
<li className="link membership">
<a
href="/membership"
>
<FormattedMessage id="general.membership" />
</a>
</li>
)
}
)}
</ul>
</NavigationBox>
);
}

<li className="search">
<Form onSubmit={this.handleSearchSubmit}>
Expand Down Expand Up @@ -254,6 +262,7 @@ Navigation.propTypes = {
handleToggleAccountNav: PropTypes.func,
handleToggleLoginOpen: PropTypes.func,
intl: intlShape,
isLoggedIn: PropTypes.bool,
permissions: PropTypes.shape({
admin: PropTypes.bool,
social: PropTypes.bool,
Expand Down Expand Up @@ -290,6 +299,9 @@ const mapStateToProps = state => ({
searchTerm: state.navigation.searchTerm,
unreadMessageCount: state.messageCount.messageCount,
user: state.session && state.session.session && state.session.session.user,
isLoggedIn: state.session && state.session.status === sessionActions.Status.FETCHED ?
!!(state.session.session && state.session.session.user) :
null,
useScratch3Registration: state.navigation.useScratch3Registration
});

Expand Down