Skip to content

GitLab

S
scratch-www
Commit e5d14ff0 authored by rschamp's avatar rschamp
Browse files
Options

Update content for 2019

parent 976cfa4a
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 24 deletions
src/views/splash/hoc/middle-banner.jsx
View file @ e5d14ff0
......@@ -18,26 +18,26 @@ const MiddleBanner = () => (
</h1>
<a
className="hoc-more-activities button"
href="/tips"
href="/projects/editor?tutorial=all"
>
<img src="/svgs/tutorials.svg" />
<FormattedMessage id="hocbanner.moreActivities" />
</a>
</FlexRow>
<FlexRow className="hoc-banner-images">
<a href="http://localhost:8333/projects/editor/?tip_bar=name">
<a href="/projects/editor?tutorial=imagine">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/animate-your-name.jpg" />
<img src="/images/hoc/imagine.jpg" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.name" />
<FormattedMessage id="hocbanner.imagine" />
</div>
</FlexRow>
</a>
<a href="http://localhost:8333/projects/editor/?tip_bar=fly">
<a href="/projects/331474033/editor?tutorial=code-cartoon">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/make-it-fly.jpg" />
<img src="/images/hoc/code-a-cartoon.jpg" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.fly" />
<FormattedMessage id="hocbanner.codeACartoon" />
</div>
</FlexRow>
</a>
......@@ -45,11 +45,11 @@ const MiddleBanner = () => (
key="frameless-desktop"
minWidth={frameless.desktop}
>
<a href="http://localhost:8333/projects/editor/?tip_bar=pong">
<a href="/projects/editor?tutorial=talking">
<FlexRow className="hoc-banner-image mod-middle-image column">
<img src="/images/ttt/pong-game.jpg" />
<img src="/images/hoc/talking.png" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.pong" />
<FormattedMessage id="hocbanner.talking" />
</div>
</FlexRow>
</a>
......
src/views/splash/hoc/top-banner.jsx
View file @ e5d14ff0
......@@ -19,7 +19,7 @@ const TopBanner = () => (
</h1>
<a
className="hoc-more-activities button"
href="https://beta.scratch.mit.edu/?tutorial=all"
href="/projects/editor?tutorial=all"
>
<img src="/svgs/tutorials.svg" />
<FormattedMessage id="hocbanner.moreActivities" />
......@@ -30,28 +30,28 @@ const TopBanner = () => (
key="frameless-desktop"
minWidth={frameless.desktop}
>
<a href="https://beta.scratch.mit.edu/?tutorial=getStarted">
<a href="/projects/editor?tutorial=imagine">
<FlexRow className="hoc-banner-image column">
<img src="/images/hoc/getting-started.jpg" />
<img src="/images/hoc/imagine.jpg" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.gettingStarted" />
<FormattedMessage id="hocbanner.imagine" />
</div>
</FlexRow>
</a>
</MediaQuery>
<a href="https://beta.scratch.mit.edu/?tutorial=animations-that-talk">
<a href="/projects/331474033/editor?tutorial=code-cartoon">
<FlexRow className="hoc-banner-image column">
<img src="/images/hoc/create-animations-that-talk.png" />
<img src="/images/hoc/code-a-cartoon.jpg" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.animationTalk" />
<FormattedMessage id="hocbanner.codeACartoon" />
</div>
</FlexRow>
</a>
<a href="https://beta.scratch.mit.edu/?tutorial=animate-an-adventure-game">
<a href="/projects/editor?tutorial=talking">
<FlexRow className="hoc-banner-image column">
<img src="/images/hoc/create-an-adventure-game.jpg" />
<img src="/images/hoc/talking.png" />
<div className="hoc-image-text">
<FormattedMessage id="hocbanner.adventureGame" />
<FormattedMessage id="hocbanner.talking" />
</div>
</FlexRow>
</a>
......
src/views/splash/l10n.json
View file @ e5d14ff0
......@@ -35,9 +35,9 @@
"hocbanner.title": "Get Creative with Coding!",
"hocbanner.moreActivities": "See more activities",
"hocbanner.gettingStarted": "Getting Started",
"hocbanner.animationTalk": "Create Animations that Talk",
"hocbanner.adventureGame": "Animate an Adventure Game",
"hocbanner.imagine": "Imagine a World",
"hocbanner.codeACartoon": "Code a Cartoon",
"hocbanner.talking": "Talking Tales",
"hocbanner.name": "Animate a Name",
"hocbanner.fly": "Make it Fly",
"hocbanner.pong": "Pong Game",
......
src/views/splash/presentation.jsx
View file @ e5d14ff0
......@@ -35,7 +35,7 @@ const ShareProjectMessage = require('./activity-rows/share-project.jsx');
const TopBanner = require('./hoc/top-banner.jsx');
const MiddleBanner = require('./hoc/middle-banner.jsx');
const HOC_START_TIME = 1575262800000; // 2019-12-02 00:00:00
const HOC_START_TIME = 157526280000; // 2019-12-02 00:00:00
const HOC_END_TIME = 1577077200000; // 2019-12-23 00:00:00
require('./splash.scss');
......@@ -419,6 +419,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
{
this.props.sessionStatus === sessionActions.Status.FETCHED &&
Object.keys(this.props.user).length === 0 && (// Only show top banner if user is not logged in
/* eslint-disable indent, react/jsx-indent, react/jsx-indent-props */
(Date.now() >= HOC_START_TIME && Date.now() < HOC_END_TIME) ? (
<MediaQuery
key="frameless-tablet"
......@@ -433,6 +434,7 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
/>
)
)
/* eslint-enable indent, react/jsx-indent, react/jsx-indent-props */
}
<div
className="inner mod-splash"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment