diff --git a/src/views/splash/hoc/middle-banner.jsx b/src/views/splash/hoc/middle-banner.jsx deleted file mode 100644 index 718220075..000000000 --- a/src/views/splash/hoc/middle-banner.jsx +++ /dev/null @@ -1,115 +0,0 @@ -var FormattedMessage = require('react-intl').FormattedMessage; -var injectIntl = require('react-intl').injectIntl; -var MediaQuery = require('react-responsive'); -var React = require('react'); - -var FlexRow = require('../../../components/flex-row/flex-row.jsx'); -var TitleBanner = require('../../../components/title-banner/title-banner.jsx'); -var TTTModal = require('../../../components/modal/ttt/modal.jsx'); -var TTTTile = require('../../../components/ttt-tile/ttt-tile.jsx'); - -var frameless = require('../../../lib/frameless'); -var tiles = require('../../tips/ttt'); - -require('../../../components/forms/button.scss'); -require('./middle-banner.scss'); - -var MiddleBanner = injectIntl(React.createClass({ - getInitialState: function () { - return { - currentTile: tiles[1], - TTTModalOpen: false - }; - }, - showTTTModal: function (tile) { - return this.setState({ - currentTile: tile, - TTTModalOpen: true - }); - }, - hideTTTModal: function () { - return this.setState({TTTModalOpen: false}); - }, - renderTTTTiles: function () { - var formatMessage = this.props.intl.formatMessage; - - var tileObjects = { - flyTile: { - title: formatMessage({id: tiles[1].title}), - description: formatMessage({id: tiles[1].description}), - tutorialLoc: tiles[1].tutorialLoc, - activityLoc: formatMessage({id: tiles[1].activityLoc}), - guideLoc: formatMessage({id: tiles[1].guideLoc}), - thumbUrl: tiles[1].thumbUrl, - bannerUrl: tiles[1].bannerUrl - }, - musicTile: { - title: formatMessage({id: tiles[2].title}), - description: formatMessage({id: tiles[2].description}), - tutorialLoc: tiles[2].tutorialLoc, - activityLoc: formatMessage({id: tiles[2].activityLoc}), - guideLoc: formatMessage({id: tiles[2].guideLoc}), - thumbUrl: tiles[2].thumbUrl, - bannerUrl: tiles[2].bannerUrl - }, - pongTile: { - title: formatMessage({id: tiles[7].title}), - description: formatMessage({id: tiles[7].description}), - tutorialLoc: tiles[7].tutorialLoc, - activityLoc: formatMessage({id: tiles[7].activityLoc}), - guideLoc: formatMessage({id: tiles[7].guideLoc}), - thumbUrl: tiles[7].thumbUrl, - bannerUrl: tiles[7].bannerUrl - } - }; - - return [ - , - , - - ]; - }, - render: function () { - return ( - -
- -

- -

- - - -
- - - {this.renderTTTTiles()} - - - -
-
- ); - } -})); - -module.exports = MiddleBanner; diff --git a/src/views/splash/hoc/middle-banner.scss b/src/views/splash/hoc/middle-banner.scss deleted file mode 100644 index 2e39668d4..000000000 --- a/src/views/splash/hoc/middle-banner.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import "../../../colors"; -@import "../../../frameless"; - -.title-banner.mod-splash-middle { - background: url("/images/blocks-pattern.png"); - background-color: $ui-purple; - background-repeat: repeat; - background-size: 180px 180px; -} - -.middle-banner-header { - margin-bottom: 1rem; - justify-content: space-between; - align-items: center; -} - -.middle-banner-header-h1 { - color: $type-white; -} - -.mod-ttt-try-button { - &:link, - &:visited, - &:active - &:hover { - color: $type-white; - } -} - -.ttt-tile.mod-banner { - background-color: $background-color; -} - -@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) { - .mod-last-tile { - display: none; - } - - .middle-banner-header { - flex-direction: column; - align-items: center; - } -} - -@media only screen and (max-width: $tablet - 1) { - .title-banner.mod-splash-middle { - display: none; - } -} diff --git a/src/views/splash/hoc/top-banner.jsx b/src/views/splash/hoc/top-banner.jsx deleted file mode 100644 index c82ce4b4f..000000000 --- a/src/views/splash/hoc/top-banner.jsx +++ /dev/null @@ -1,115 +0,0 @@ -var FormattedMessage = require('react-intl').FormattedMessage; -var injectIntl = require('react-intl').injectIntl; -var React = require('react'); - -var FlexRow = require('../../../components/flex-row/flex-row.jsx'); -var TitleBanner = require('../../../components/title-banner/title-banner.jsx'); -var TTTModal = require('../../../components/modal/ttt/modal.jsx'); - -require('../../../components/forms/button.scss'); -require('./top-banner.scss'); - -var nameTile = { - title: 'ttt.AnimateYourNameTitle', - description: 'ttt.AnimateYourNameDescription', - thumbUrl: '/images/ttt/animate-your-name.jpg', - bannerUrl: '/images/ttt/animate-your-name-banner.jpg', - tutorialLoc: '/projects/editor/?tip_bar=name', - activityLoc: 'cards.nameCardsLink', - guideLoc: 'guides.NameGuideLink' -}; - -var TopBanner = injectIntl(React.createClass({ - type: 'TopBanner', - propTypes: { - loggedIn: React.PropTypes.bool.isRequired - }, - getInitialState: function () { - // use translated tile - var formatMessage = this.props.intl.formatMessage; - var translatedTile = {}; - translatedTile = { - title: formatMessage({id: nameTile.title}), - description: formatMessage({id: nameTile.description}), - tutorialLoc: nameTile.tutorialLoc, - activityLoc: formatMessage({id: nameTile.activityLoc}), - guideLoc: formatMessage({id: nameTile.guideLoc}), - thumbUrl: nameTile.thumbUrl, - bannerUrl: nameTile.bannerUrl - }; - return {currentTile: translatedTile, TTTModalOpen: false}; - }, - showTTTModal: function () { - this.setState({TTTModalOpen: true}); - }, - hideTTTModal: function () { - this.setState({TTTModalOpen: false}); - }, - render: function () { - return ( - - - - - - - - - - - - - - - - - ); - } -})); - -module.exports = TopBanner; - diff --git a/src/views/splash/hoc/top-banner.scss b/src/views/splash/hoc/top-banner.scss deleted file mode 100644 index 9df878291..000000000 --- a/src/views/splash/hoc/top-banner.scss +++ /dev/null @@ -1,228 +0,0 @@ -@import "../../../colors"; -@import "../../../frameless"; - -.title-banner.mod-splash-top { - background-color: $ui-aqua; - background-image: url("/images/hoc/splash-left.png"), url("/images/hoc/splash-right.png"); - background-repeat: no-repeat, no-repeat; - background-position: left bottom, right bottom; - background-size: 40% auto, 40% auto; -} - -.banner-top { - background-image: url("/images/hoc/doodads.png"); - background-repeat: no-repeat; - background-position: top; - background-size: 70%; - flex-direction: column; -} - -.top-banner-header { - justify-content: space-between; -} - -.top-banner-header-h1 { - margin-bottom: 1.25rem; - color: $type-white; -} - -.banner-image.mod-top { - width: 100%; -} - -.top-animation { - margin: auto; - padding-top: 2rem; - padding-bottom: 1rem; - width: 70%; -} - -.top-animation-letter { - animation-duration: 1s; - animation-iteration-count: infinite; - animation-fill-mode: both; - width: 100%; -} - -@keyframes jump { - from, - to { - transform: translate3d(0, 0, 0); - } - - 12.5%, - 62.5% { - transform: translate3d(0, 10px, 0); - } - - 37.5%, - 87.5% { - transform: translate3d(0, -10px, 0); - } -} - -.mod-letter-s { - // width: 16.6%; - animation-name: jump; - width: 13.3%; -} - -@keyframes pulse { - from { - transform: scale3d(1, 1, 1); - } - - 50% { - transform: scale3d(1.25, 1.25, 1.25); - } - - to { - transform: scale3d(1, 1, 1); - } -} - -.mod-letter-c1 { - // width: 12.5%; - animation-name: pulse; - width: 10%; -} - -@keyframes spin-left { - 90% { - transform: rotate3d(0, 0, 1, -360deg); - } - - to { - transform: rotate3d(0, 0, 1, -360deg); - } -} - -.mod-letter-r { - // width: 14%; - animation-name: spin-left; - width: 11.2%; -} - -@keyframes swing { - 25% { - transform: rotate3d(0, 0, 1, 40deg); - } - - 75% { - transform: rotate3d(0, 0, 1, -40deg); - } - - from, - to { - transform: rotate3d(0, 0, 1, 0deg); - } -} - -.mod-letter-a { - // width: 14.4%; - animation-name: swing; - width: 11.5%; -} - -@keyframes shake { - from, - to { - transform: translate3d(0, 0, 0); - } - - 12.5%, - 62.5% { - transform: translate3d(-10px, 0, 0); - } - - 37.5%, - 87.5% { - transform: translate3d(10px, 0, 0); - } -} - -.mod-letter-t { - // width: 15.5%; - animation-name: shake; - width: 12.4%; -} - -@keyframes spin-right { - 90% { - transform: rotate3d(0, 0, 1, 360deg); - } - - to { - transform: rotate3d(0, 0, 1, 360deg); - } -} - -.mod-letter-c2 { - // width: 12.5%; - animation-name: spin-right; - width: 10%; -} - -@keyframes inverse-jump { - from, - to { - transform: translate3d(0, 0, 0); - } - - 12.5%, - 62.5% { - transform: translate3d(0, -10px, 0); - } - - 37.5%, - 87.5% { - transform: translate3d(0, 10px, 0); - } -} - -.mod-letter-h { - // width: 14.4%; - animation-name: inverse-jump; - width: 11.5%; -} - -.mod-top-button { - &:active &:hover, - &:link, - &:visited { - color: $type-white; - font-size: 1rem; - } -} - -.mod-top-button { - border: 1px solid $active-gray; - box-shadow: none; - background-color: $ui-blue; -} - -.top-links { - display: flex; - flex-direction: column; - justify-content: space-around; - align-items: center; -} - -.mod-guides-link { - cursor: pointer; - padding: 1.25rem 0; - color: $ui-white; - font-size: 1rem; - font-weight: 500; -} - -.top-open-modal { - display: inline-block; - padding: 0 .25rem; - vertical-align: top; -} -@media only screen and (max-width: $tablet - 1) { - .flex-row.top-animation { - flex-direction: row; - } -} diff --git a/src/views/splash/l10n-static.json b/src/views/splash/l10n-static.json deleted file mode 100644 index 12fd6c5a1..000000000 --- a/src/views/splash/l10n-static.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "cards.nameCardsLink": "https://resources.scratch.mit.edu/www/cards/en/nameCards.pdf", - "cards.flyCardsLink": "https://resources.scratch.mit.edu/www/cards/en/flyCards.pdf", - "cards.musicCardsLink": "https://resources.scratch.mit.edu/www/cards/en/musicCards.pdf", - "cards.pongCardsLink": "https://resources.scratch.mit.edu/www/cards/en/pongCards.pdf", - "guides.NameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/NameGuide.pdf", - "guides.FlyGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf", - "guides.MusicGuideLink": "https://resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf", - "guides.PongGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PongGuide.pdf" -} diff --git a/src/views/splash/l10n.json b/src/views/splash/l10n.json index 6956d38b0..b289b440e 100644 --- a/src/views/splash/l10n.json +++ b/src/views/splash/l10n.json @@ -28,28 +28,6 @@ "teacherbanner.subgreeting": "Teacher Account", "teacherbanner.classesButton": "My Classes", "teacherbanner.faqButton": "Teacher Account FAQ", - - "middleBanner.header": "Get Creative with Coding", - "middleBanner.ttt": "See more activities", - "topBanner.getStarted": "Get Started with Coding!", - "ttt.tutorial": "Tutorial", - "ttt.open": "Open", - "ttt.tutorialSubtitle": "Find out how to make this project using a step-by-step tutorial in Scratch.", - "ttt.activityTitle": "Activity Cards", - "ttt.activitySubtitle": "Explore new coding ideas using this set of illustrated cards you can print out.", - "ttt.educatorTitle": "Educator Guide", - "ttt.educatorSubtitle": "Use this educator guide to plan and lead a one-hour Scratch workshop.", - "tile.tryIt": "Try It", - "tile.guides": "See Cards and Guides", - "ttt.download": "Download", - "ttt.AnimateYourNameTitle": "Animate a Name", - "ttt.AnimateYourNameDescription": "Animate the letters of your username, initials, or favorite word.", - "ttt.MakeItFlyTitle": "Make It Fly", - "ttt.MakeItFlyDescription": "Animate the Scratch Cat, The Powerpuff Girls, or even a taco!", - "ttt.MakeMusicTitle": "Make Music", - "ttt.MakeMusicDescription": "Choose instruments, add sounds, and press keys to play music.", - "ttt.PongTitle": "Pong Game", - "ttt.PongDescription": "Make a bouncing ball game with sounds, points, and other effects.", "welcome.welcomeToScratch": "Welcome to Scratch!", "welcome.learn": "Learn how to make a project in Scratch", diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx index 8e699bc6c..d03808260 100644 --- a/src/views/splash/presentation.jsx +++ b/src/views/splash/presentation.jsx @@ -11,8 +11,6 @@ var Box = require('../../components/box/box.jsx'); var Button = require('../../components/forms/button.jsx'); var Carousel = require('../../components/carousel/carousel.jsx'); var LegacyCarousel = require('../../components/carousel/legacy-carousel.jsx'); -var TopBanner = require('./hoc/top-banner.jsx'); -var MiddleBanner = require('./hoc/middle-banner.jsx'); var Intro = require('../../components/intro/intro.jsx'); var IframeModal = require('../../components/modal/iframe/modal.jsx'); var News = require('../../components/news/news.jsx'); @@ -255,8 +253,6 @@ var SplashPresentation = injectIntl(React.createClass({ {this.props.isEducator ? [ ] : []} -
{this.props.sessionStatus === sessionActions.Status.FETCHED ? ( Object.keys(this.props.user).length !== 0 ? [ @@ -276,12 +272,6 @@ var SplashPresentation = injectIntl(React.createClass({ ]) : [] } - - {featured.shift()} - {featured.shift()} -
- -
{featured} diff --git a/static/images/hoc/a.png b/static/images/hoc/a.png deleted file mode 100644 index d0a33f66f..000000000 Binary files a/static/images/hoc/a.png and /dev/null differ diff --git a/static/images/hoc/c1.png b/static/images/hoc/c1.png deleted file mode 100644 index fdbefd662..000000000 Binary files a/static/images/hoc/c1.png and /dev/null differ diff --git a/static/images/hoc/c2.png b/static/images/hoc/c2.png deleted file mode 100644 index 23d10fd80..000000000 Binary files a/static/images/hoc/c2.png and /dev/null differ diff --git a/static/images/hoc/cn-logo.png b/static/images/hoc/cn-logo.png deleted file mode 100644 index 6f56b7da0..000000000 Binary files a/static/images/hoc/cn-logo.png and /dev/null differ diff --git a/static/images/hoc/code-org-logo.png b/static/images/hoc/code-org-logo.png deleted file mode 100644 index 531df3c31..000000000 Binary files a/static/images/hoc/code-org-logo.png and /dev/null differ diff --git a/static/images/hoc/dance-bg.jpg b/static/images/hoc/dance-bg.jpg deleted file mode 100644 index a7198e69d..000000000 Binary files a/static/images/hoc/dance-bg.jpg and /dev/null differ diff --git a/static/images/hoc/dance-tutorial.jpg b/static/images/hoc/dance-tutorial.jpg deleted file mode 100644 index 26441b4d5..000000000 Binary files a/static/images/hoc/dance-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/doodads.png b/static/images/hoc/doodads.png deleted file mode 100644 index be7be7733..000000000 Binary files a/static/images/hoc/doodads.png and /dev/null differ diff --git a/static/images/hoc/getting-started-tutorial.jpg b/static/images/hoc/getting-started-tutorial.jpg deleted file mode 100644 index 814e7433d..000000000 Binary files a/static/images/hoc/getting-started-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/h.png b/static/images/hoc/h.png deleted file mode 100644 index 886a47bc3..000000000 Binary files a/static/images/hoc/h.png and /dev/null differ diff --git a/static/images/hoc/hide-bg.jpg b/static/images/hoc/hide-bg.jpg deleted file mode 100644 index c2dd3a49c..000000000 Binary files a/static/images/hoc/hide-bg.jpg and /dev/null differ diff --git a/static/images/hoc/hide-seek-tutorial.jpg b/static/images/hoc/hide-seek-tutorial.jpg deleted file mode 100644 index 8f5340292..000000000 Binary files a/static/images/hoc/hide-seek-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/made-with-code-logo.png b/static/images/hoc/made-with-code-logo.png deleted file mode 100644 index 4954be191..000000000 Binary files a/static/images/hoc/made-with-code-logo.png and /dev/null differ diff --git a/static/images/hoc/make-it-fly-tutorial.jpg b/static/images/hoc/make-it-fly-tutorial.jpg deleted file mode 100644 index eb1e6a301..000000000 Binary files a/static/images/hoc/make-it-fly-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/make-music-tutorial.png b/static/images/hoc/make-music-tutorial.png deleted file mode 100644 index ae699c7a1..000000000 Binary files a/static/images/hoc/make-music-tutorial.png and /dev/null differ diff --git a/static/images/hoc/name-bg.jpg b/static/images/hoc/name-bg.jpg deleted file mode 100644 index 8b207c221..000000000 Binary files a/static/images/hoc/name-bg.jpg and /dev/null differ diff --git a/static/images/hoc/name-tutorial.jpg b/static/images/hoc/name-tutorial.jpg deleted file mode 100644 index 5adee44c1..000000000 Binary files a/static/images/hoc/name-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/paa-logo.png b/static/images/hoc/paa-logo.png deleted file mode 100644 index 723eb9af4..000000000 Binary files a/static/images/hoc/paa-logo.png and /dev/null differ diff --git a/static/images/hoc/pocketcode-logo.png b/static/images/hoc/pocketcode-logo.png deleted file mode 100644 index ce0a44b93..000000000 Binary files a/static/images/hoc/pocketcode-logo.png and /dev/null differ diff --git a/static/images/hoc/pong-tutorial.jpg b/static/images/hoc/pong-tutorial.jpg deleted file mode 100644 index 222815eae..000000000 Binary files a/static/images/hoc/pong-tutorial.jpg and /dev/null differ diff --git a/static/images/hoc/r.png b/static/images/hoc/r.png deleted file mode 100644 index e7579f99f..000000000 Binary files a/static/images/hoc/r.png and /dev/null differ diff --git a/static/images/hoc/s.png b/static/images/hoc/s.png deleted file mode 100644 index 1f19af45a..000000000 Binary files a/static/images/hoc/s.png and /dev/null differ diff --git a/static/images/hoc/scratchEd-logo.png b/static/images/hoc/scratchEd-logo.png deleted file mode 100644 index f116ff7b8..000000000 Binary files a/static/images/hoc/scratchEd-logo.png and /dev/null differ diff --git a/static/images/hoc/splash-left.png b/static/images/hoc/splash-left.png deleted file mode 100644 index 0c637c13f..000000000 Binary files a/static/images/hoc/splash-left.png and /dev/null differ diff --git a/static/images/hoc/splash-right.png b/static/images/hoc/splash-right.png deleted file mode 100644 index 70f3f57bc..000000000 Binary files a/static/images/hoc/splash-right.png and /dev/null differ diff --git a/static/images/hoc/t.png b/static/images/hoc/t.png deleted file mode 100644 index 1589eade1..000000000 Binary files a/static/images/hoc/t.png and /dev/null differ diff --git a/static/images/hoc/tips-test-animation.gif b/static/images/hoc/tips-test-animation.gif deleted file mode 100644 index 15f856b84..000000000 Binary files a/static/images/hoc/tips-test-animation.gif and /dev/null differ