From 1adb8ecf5b77c32639b3dedfb7fef0c617dff943 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 28 Mar 2016 14:18:44 -0400 Subject: [PATCH 01/13] Add page component to jobs view Fixes #398 --- src/views/jobs/jobs.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/jobs/jobs.jsx b/src/views/jobs/jobs.jsx index 5a4d4c8ce..232d0e32d 100644 --- a/src/views/jobs/jobs.jsx +++ b/src/views/jobs/jobs.jsx @@ -2,6 +2,8 @@ var React = require('react'); var render = require('../../lib/render.jsx'); var FormattedMessage = require('react-intl').FormattedMessage; +var Page = require('../../components/page/page.jsx'); + require('./jobs.scss'); var Jobs = React.createClass({ @@ -52,4 +54,4 @@ var Jobs = React.createClass({ } }); -render(, document.getElementById('view')); +render(, document.getElementById('app')); From c9157e70b91a6d847a5582748e2346a09667a283 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Tue, 29 Mar 2016 18:38:39 -0400 Subject: [PATCH 02/13] Fix reference to session Caused by merging an old branch which didn't have conflicts, but did have a different understanding of session. --- src/components/navigation/navigation.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx index 8e81c302b..fbcb401b0 100644 --- a/src/components/navigation/navigation.jsx +++ b/src/components/navigation/navigation.jsx @@ -268,9 +268,9 @@ var Navigation = React.createClass({ ] : []} - {this.state.session.permissions.student ? [ + {this.props.session.permissions.student ? [
  • - +
    • From 7734ee893137acc9c5753af556ee130c200ef29f Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Fri, 1 Apr 2016 10:29:13 -0400 Subject: [PATCH 03/13] Add community counselor job Fixes #406 --- src/views/jobs/jobs.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/jobs/jobs.jsx b/src/views/jobs/jobs.jsx index 232d0e32d..db0cdf07e 100644 --- a/src/views/jobs/jobs.jsx +++ b/src/views/jobs/jobs.jsx @@ -46,6 +46,14 @@ var Jobs = React.createClass({ (MIT Media Lab, Cambridge, MA) +
  • + + Community Counselor + + + (MIT Media Lab, Cambridge, MA or Remote) + +
    • From 09d095b963cee0bdb106ae4d4f4526aaaf596e3c Mon Sep 17 00:00:00 2001 From: The_Grits Date: Wed, 6 Apr 2016 17:42:05 -0400 Subject: [PATCH 04/13] Change supporting organizations As per #413. Specific additions: - Cartoon Network - Lemann Foundation --- src/views/credits/credits.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 89f6bd1c6..e72589348 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -244,6 +244,8 @@ var Credits = React.createClass({ Google, LEGO Foundation, Intel Foundation, + Cartoon Network, + Lemann Foundation, MacArthur Foundation.

    From 6d349cb7f9aa8ef1f33dbcd6de40a7fb689505b9 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Wed, 6 Apr 2016 17:49:30 -0400 Subject: [PATCH 05/13] Update supporting organizations Changed according to #413 --- src/views/about/l10n.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/about/l10n.json b/src/views/about/l10n.json index 7c0bb5279..58d36e6cc 100644 --- a/src/views/about/l10n.json +++ b/src/views/about/l10n.json @@ -22,5 +22,5 @@ "about.research": "Research", "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see Scratch: Programming for All). Find out more about Scratch research and statistics about Scratch.", "about.support": "Support and Funding", - "about.supportDescription": "The Scratch project, initiated in 2003, has received generous support from the National Science Foundation (grants 0325828, 1002713, 1027848, 1019396), Intel Foundation, Microsoft, MacArthur Foundation, LEGO Foundation, Code-to-Learn Foundation, Google, Dell, Fastly, Inversoft, and MIT Media Lab research consortia. If you'd like to support Scratch, please see our donate page, or contact us at donate@scratch.mit.edu." -} \ No newline at end of file + "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu." +} From 855154edcfb6755ab9612658350156e1b97610aa Mon Sep 17 00:00:00 2001 From: The_Grits Date: Thu, 7 Apr 2016 09:36:45 -0400 Subject: [PATCH 06/13] Update CN url As per https://github.com/LLK/scratch-www/pull/414#issuecomment-206880466 --- src/views/credits/credits.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index e72589348..b461bcde1 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -244,7 +244,7 @@ var Credits = React.createClass({ Google, LEGO Foundation, Intel Foundation, - Cartoon Network, + Cartoon Network, Lemann Foundation, MacArthur Foundation.

    From 7aeaaeb480ed841af6efbe7c805f7a613e2ae567 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 7 Apr 2016 16:49:35 -0400 Subject: [PATCH 07/13] Wrap wedo2 view in page component --- src/views/wedo2/wedo2.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wedo2/wedo2.jsx b/src/views/wedo2/wedo2.jsx index e9826bef4..9b26f8f0c 100644 --- a/src/views/wedo2/wedo2.jsx +++ b/src/views/wedo2/wedo2.jsx @@ -2,6 +2,7 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage; var FormattedMessage = require('react-intl').FormattedMessage; var React = require('react'); +var Page = require('../../components/page/page.jsx'); var render = require('../../lib/render.jsx'); require('./wedo2.scss'); @@ -130,4 +131,4 @@ var Wedo2 = React.createClass({ } }); -render(, document.getElementById('view')); +render(, document.getElementById('app')); From 174b35184544ece0ef7fb45ebe64b9d515d84064 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Sat, 9 Apr 2016 14:28:05 -0400 Subject: [PATCH 08/13] Delete the extra space --- src/views/about/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/about/l10n.json b/src/views/about/l10n.json index 58d36e6cc..2fadeb2b9 100644 --- a/src/views/about/l10n.json +++ b/src/views/about/l10n.json @@ -22,5 +22,5 @@ "about.research": "Research", "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see Scratch: Programming for All). Find out more about Scratch research and statistics about Scratch.", "about.support": "Support and Funding", - "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu." + "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu." } From 7aa05b1784834a72ad7d96c3a5c420614a73dcab Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Wed, 13 Apr 2016 15:21:25 -0400 Subject: [PATCH 09/13] Upgrade css-loader and autoprefixer-loader These depended on postcss < 5, which caused the errors like Container#eachAtRule is deprecated. Use Container#walkAtRules instead. Container#eachRule is deprecated. Use Container#walkRules instead. Container#eachDecl is deprecated. Use Container#walkDecls instead. Node#style() is deprecated. Use Node#raw() Node#_value was deprecated. Use Node#raws.value Container#remove is deprecated. Use Container#removeChild The autoprefixer-loader package is deprecated now and recommends using postcss-loader + autoprefixer itself. --- package.json | 5 +++-- webpack.config.js | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d81a60fbd..f1f822352 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ "raven": "0.10.0" }, "devDependencies": { - "autoprefixer-loader": "2.1.0", + "autoprefixer": "6.3.6", "classnames": "2.1.3", "cookie": "0.2.2", "copy-webpack-plugin": "0.2.0", - "css-loader": "0.17.0", + "css-loader": "0.23.1", "eslint": "1.3.1", "eslint-plugin-react": "3.3.1", "exenv": "1.2.0", @@ -54,6 +54,7 @@ "node-sass": "3.3.3", "pako": "0.2.8", "po2icu": "git://github.com/LLK/po2icu.git#develop", + "postcss-loader": "0.8.2", "react-addons-test-utils": "0.14.7", "react-modal": "0.6.1", "react-onclickoutside": "4.1.1", diff --git a/webpack.config.js b/webpack.config.js index 78474b3e1..df6094736 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,4 @@ +var autoprefixer = require('autoprefixer'); var CopyWebpackPlugin = require('copy-webpack-plugin'); var path = require('path'); var webpack = require('webpack'); @@ -40,7 +41,7 @@ module.exports = { }, { test: /\.scss$/, - loader: 'style!css!autoprefixer-loader?browsers=last 3 versions!sass' + loader: 'style!css!postcss-loader!sass' }, { test: /\.(png|jpg|gif|eot|svg|ttf|woff)$/, @@ -48,6 +49,9 @@ module.exports = { } ] }, + postcss: function () { + return [autoprefixer({browsers: ['last 3 versions']})]; + }, node: { fs: 'empty' }, From d6b08a0bff758627e8af97a42a7e85267df18e99 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Thu, 14 Apr 2016 12:36:20 -0400 Subject: [PATCH 10/13] Add Chris and Julia As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924 --- src/views/credits/credits.jsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index b461bcde1..efee06eb1 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -124,6 +124,16 @@ var Credits = React.createClass({ Hannah Avatar Hannah Cole + +
  • + Chris Avatar + Chris Garrity +
    • + +
  • + Julia Avatar + Julia Zimmerman +

    • The team of Scratch moderators manages, supports, and improves the Scratch online community:

    From 1a2e30fccd1c64f351906757bd0dbc2dbdde2773 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 15 Apr 2016 15:58:11 -0400 Subject: [PATCH 11/13] mailto anchor --- src/views/about/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/about/l10n.json b/src/views/about/l10n.json index 2fadeb2b9..92786f184 100644 --- a/src/views/about/l10n.json +++ b/src/views/about/l10n.json @@ -22,5 +22,5 @@ "about.research": "Research", "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see Scratch: Programming for All). Find out more about Scratch research and statistics about Scratch.", "about.support": "Support and Funding", - "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu." + "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu" } From 08ccaa7721164d3d05c94f4a3b96be7d26ab0664 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 15 Apr 2016 15:59:32 -0400 Subject: [PATCH 12/13] Spaces and Intel --- src/views/credits/credits.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index efee06eb1..2c7469186 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -253,9 +253,9 @@ var Credits = React.createClass({ Scratch Foundation, Google, LEGO Foundation, - Intel Foundation, - Cartoon Network, - Lemann Foundation, + Intel, + Cartoon Network, + Lemann Foundation, MacArthur Foundation.

    From c9492ae38bbdf6f41c714a89d8c3b40212ec90b2 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 15 Apr 2016 16:12:17 -0400 Subject: [PATCH 13/13] Update l10n.json --- src/views/about/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/about/l10n.json b/src/views/about/l10n.json index 92786f184..7205ffdb5 100644 --- a/src/views/about/l10n.json +++ b/src/views/about/l10n.json @@ -22,5 +22,5 @@ "about.research": "Research", "about.researchDescription": "The MIT Scratch Team and collaborators are researching how people use and learn with Scratch (for an introduction, see Scratch: Programming for All). Find out more about Scratch research and statistics about Scratch.", "about.support": "Support and Funding", - "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu" + "about.supportDescription": "The Scratch project has received financial support from the National Science Foundation, Scratch Foundation, Google, LEGO Foundation, Intel, Cartoon Network, Lemann Foundation, and MacArthur Foundation. See the credits page for more information. If you'd like to support Scratch, please see the Scratch Foundation donate page, or contact us at donate@scratch.mit.edu." }