scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

initial pass

Browse source
This commit is contained in:
Connor Hudson 2016-05-31 16:37:42 -04:00
parent d645e95bd7
commit e402363576
3 changed files with 114 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/navigation/www/navigation.jsx
View file

@ -225,7 +225,8 @@ var Navigation = React.createClass({
<Input type="hidden" name="sort_by" value="datetime_shared" /> <Input type="hidden" name="sort_by" value="datetime_shared" />
</form> </form>
</li> </li>
{this.props.session.user ? [ {this.props.session.loaded ? (
this.props.session.user ? [
<li className="link right messages" key="messages"> <li className="link right messages" key="messages">
<a <a
href="/messages/" href="/messages/"
@ -317,6 +318,7 @@ var Navigation = React.createClass({
error={this.state.loginError} /> error={this.state.loginError} />
</Dropdown> </Dropdown>
</li> </li>
]) : [
]} ]}
</ul> </ul>
<Modal isOpen={this.state.canceledDeletionOpen} <Modal isOpen={this.state.canceledDeletionOpen}

1
src/redux/session.js
View file

@ -32,6 +32,7 @@ module.exports.setSessionError = function (error) {
}; };
module.exports.setSession = function (session) { module.exports.setSession = function (session) {
session.loaded = true;
return { return {
type: Types.SET_SESSION, type: Types.SET_SESSION,
session: session session: session

6
src/views/splash/splash.jsx
View file

@ -373,7 +373,8 @@ var Splash = injectIntl(React.createClass({
] : []} ] : []}
<CNBanner /> <CNBanner />
<div key="inner" className="inner"> <div key="inner" className="inner">
{this.props.session.user ? [ {this.props.session.user ? (
this.props.session.user ? [
<div key="header" className="splash-header"> <div key="header" className="splash-header">
{this.shouldShowWelcome() ? [ {this.shouldShowWelcome() ? [
<Welcome key="welcome" <Welcome key="welcome"
@ -386,7 +387,8 @@ var Splash = injectIntl(React.createClass({
</div> </div>
] : [ ] : [
<Intro projectCount={this.state.projectCount} messages={messages} key="intro"/> <Intro projectCount={this.state.projectCount} messages={messages} key="intro"/>
]} ]) : ()
}
{featured} {featured}