scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 17:16:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #3580 from LLK/release/2019-12-04

Browse source 
[Master] Release 2019 12 04
This commit is contained in:
Paul Kaplan 2019-12-05 10:23:30 -05:00 committed by GitHub
commit a5c5f3194a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 466 additions and 418 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

246
README.md
View file

@ -1,45 +1,102 @@
## scratch-www # scratch-www
#### Standalone web client for Scratch #### Standalone web client for Scratch
[![Build Status](https://travis-ci.org/LLK/scratch-www.svg)](https://travis-ci.org/LLK/scratch-www) [![Build Status](https://travis-ci.org/LLK/scratch-www.svg)](https://travis-ci.org/LLK/scratch-www)
[![Coverage Status](https://coveralls.io/repos/github/LLK/scratch-www/badge.svg?branch=develop)](https://coveralls.io/github/LLK/scratch-www?branch=develop) [![Coverage Status](https://coveralls.io/repos/github/LLK/scratch-www/badge.svg?branch=develop)](https://coveralls.io/github/LLK/scratch-www?branch=develop)
[![dependencies Status](https://david-dm.org/llk/scratch-www/status.svg)](https://david-dm.org/llk/scratch-www) [![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-www.svg)](https://greenkeeper.io/)
[![devDependencies Status](https://david-dm.org/llk/scratch-www/dev-status.svg)](https://david-dm.org/llk/scratch-www?type=dev) [![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-www.svg)](https://greenkeeper.io/)
### Where am I? ## Overview
Physically? No idea.
Digitally? You’re at Scratch’s open source web client! This is Scratch’s open source web client! This is the code for much of the [Scratch website](https://scratch.mit.edu).
We’re working to update the [Scratch website](https://scratch.mit.edu) to use a new codebase, contained in this repository. In particular, this codebase includes code for:
* the "project page", which shows a playable version of the project, along with the project's title, description, comments, remixes and studios; this page operates in the background when you "See inside" a project
* the site's home page
* the Ideas page
* landing pages for various Scratch extensions, such as LEGO MINDSTORMS and micro:bit
* the info page for Scratch Desktop
* and other pages such as Credits and FAQ.
We’re currently building Scratch using [React](https://facebook.github.io/react/) and [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html). Here are some resources to help you get acquainted with how we’re working on the Scratch codebase: ### How this fits in with other Scratch repos
The scratch-www project has lots of aspects of its design that are particular to our backend systems.
To use it for your own project, you would have to look at all the places it makes backend calls, and
create your own backend systems to perform those functions.
The [scratch-gui](https://github.com/LLK/scratch-gui) project, on the other hand, is designed to be
able to be used by anyone, without needing to create backend systems, though it also can support
backend systems for project and asset saving.
### Contributing
We welcome your contributions to this codebase! You may want to start by browsing [the current
list of open issues labeled "help wanted"](https://github.com/LLK/scratch-www/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
Contributing to scratch-www can be more difficult than contributing to
[scratch-gui](https://github.com/LLK/scratch-gui). This is because scratch-gui can be run on its
own, without needing any other services to be running, while scratch-www needs to communicate
with several backend systems that the Scratch team runs (see "How this fits in with other Scratch
repos" above). If you are new to contributing to Scratch's source code, we suggest you start
by becoming familiar with scratch-gui and its [list of open issues labeled "help
wanted"](https://github.com/LLK/scratch-gui/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
To contribute, please follow the [standard steps for contributing to a project on
GitHub](https://github.com/firstcontributions/first-contributions).
### License
See the [LICENSE](https://github.com/LLK/scratch-www/blob/master/LICENSE) file in this repo.
## Understanding this codebase
### Guides
Here are some resources to help you get acquainted with how we’re working on the Scratch codebase:
* [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide) * [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide)
* [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide-for-Bugfixes) * [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide-for-Bugfixes)
* [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide) * [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide)
* [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map) * [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map)
### Core technologies
Significant core technologies this codebase uses include:
#### Development technologies
* [Node](https://nodejs.org/)
* [Webpack](https://webpack.js.org/)
* [React](https://facebook.github.io/react/)
* [Redux](https://redux.js.org/)
* [Sass](http://sass-lang.com/documentation/file.SASS_REFERENCE.html)
#### Testing technologies
Our tests use:
* [Jest](https://jestjs.io/) (we are writing most new tests in Jest)
* [Tap](https://node-tap.org/) (we are moving away from using Tap, but many tests still use it)
* [Enzyme](https://airbnb.io/enzyme/)
* [Selenium](https://selenium.dev/)
## Developing scratch-www
### Before Getting Started ### Before Getting Started
* Make sure you have node (v4.2 or higher) and npm [installed](https://docs.npmjs.com/getting-started/installing-node)
We use npm (Node Package Manager) to maintain and update packages required to build the site. Make sure you have installed:
* [node](https://docs.npmjs.com/getting-started/installing-node): version 8 or higher
* npm (Node Package Manager): used to maintain and update packages required to build the site
### Update Packages ### Update Packages
It's important to make sure that all of the dependencies are up to date because the scratch-www code only works with specific versions of the dependencies. You can update the packages by running this command:
It's important to make sure that all of the dependencies are up to date because the
scratch-www code only works with specific versions of the dependencies.
You can update the packages by using the command:
```bash ```bash
npm install npm install
``` ```
### To Build
To compile the source code into HTML and JavaScript bundles browsers can read, run this command:
```bash
npm run build
```
If you want to run a server that rebuilds the files as you edit them, skip to the To Run section below.
#### Warnings during npm install #### Warnings during npm install
These warnings can be safely ignored: These warnings can be safely ignored:
@ -52,34 +109,54 @@ npm WARN react-addons-test-utils@0.14.7 requires a peer of react@^0.14.7 but non
npm WARN react-dom@0.14.8 requires a peer of react@^0.14.8 but none was installed. npm WARN react-dom@0.14.8 requires a peer of react@^0.14.8 but none was installed.
``` ```
These currently exist in static/js/lib These currently exist in static/js/lib .
### To Run ### To Build
If you would like to create a temporary version of the site on your machine that you can access through your web browser run the command below. Building (see To Build above) is not necessary for this step and the temporary server can be turned off (see To Stop below).
The intl directory must be built separately with the `npm run translate` line below in order for the text to appear properly. To compile the source code into HTML and JavaScript bundles browsers can read, you can create
a temporary version of the site on your machine that you can access through your web browser.
You can either "build" the site a single time, by running:
```bash
npm run build
```
Or, you can run a server that rebuilds the files as you edit them, by running the commands:
```bash ```bash
npm run translate npm run translate
npm start npm start
``` ```
The site hosted on your local machine can now be accessed by a web browser by entering localhost:8333 into your web browser. *NOTE: `npm run translate` builds the intl directory. The site will build fine without it,
but translatable text strings will not show up correctly until you have built intl.*
During development, `npm start` watches any update you make to files in either `./static` or `./src` and triggers a rebuild of the project. In development, the build is stored in memory, and not served from the `./build` directory. During development, `npm start` watches any update you make to files in either
`./static` or `./src` and triggers a rebuild of the project. In development,
the build is stored in memory, and not served from the `./build` directory.
### Viewing the local site
Once you have built the local site, using either `npm run build` or `npm start`,
the site hosted on your local machine can be accessed by a web browser by entering
`localhost:8333` into your browser's address bar.
### Troubleshooting
When running `npm start`, here are some important log messages to keep an eye out for: When running `npm start`, here are some important log messages to keep an eye out for:
* `webpack: bundle is now VALID.` – The bundle has been loaded into memory and is now viewable in the browser. This will show up both once `npm start` has completed its setup, and also once updates you make to files have been re-compiled for viewing in the browser. * `webpack: bundle is now VALID.` – The bundle has been loaded into memory and is now viewable in the browser. This will show up both once `npm start` has completed its setup, and also once updates you make to files have been re-compiled for viewing in the browser.
* `webpack: bundle is now INVALID.` – If you see this, then it means you have made updates to files that are still being compiled for browser viewing. Pages will still be viewable, but they will not see any updates you made yet. * `webpack: bundle is now INVALID.` – If you see this, then it means you have made updates to files that are still being compiled for browser viewing. Pages will still be viewable, but they will not see any updates you made yet.
Once running, open `http://localhost:8333` in your browser. If you wish to have the server reload automatically, you can install either [nodemon](https://github.com/remy/nodemon) or [forever](https://github.com/foreverjs/forever). ### To stop npm
### To stop To stop the `npm start` process which is making the site available to your web browser
To stop the process that is making the site available to your web browser (created above in To Start) use `^C`. (created above in "To Build"), use `^C` (control-c) in the terminal.
#### Configuration #### Configuration
`npm start` can be configured with the following environment variables `npm start` can be configured with the following environment variables, by setting them in
the beginning of the command, before `npm start`:
| Variable | Default | Description | | Variable | Default | Description |
| --------------- | ---------------------------------- | ---------------------------------------------- | | --------------- | ---------------------------------- | ---------------------------------------------- |
@ -93,33 +170,87 @@ To stop the process that is making the site available to your web browser (creat
| `NODE_ENV` | `null` | If not `production`, app acts like development | | `NODE_ENV` | `null` | If not `production`, app acts like development |
| `PORT` | `8333` | Port for devserver (http://localhost:XXXX) | | `PORT` | `8333` | Port for devserver (http://localhost:XXXX) |
**NOTE:** Because by default `API_HOST=https://api.scratch.mit.edu`, please be aware that, by default, you will be seeing and interacting with real data on the Scratch website. *NOTE: Because by default `API_HOST=https://api.scratch.mit.edu`, please be aware that, by default, you will be seeing and interacting with real data on the Scratch website.*
## Tests
### Unit tests
Most of our unit tests run using Jest, but older unit tests use the TAP framework.
#### Run all tests
To build the application and run all unit and localization tests, use the command:
### Unit Tests
To run:
```bash ```bash
npm test npm test
``` ```
This will build the application and run the unit and localization tests. Some of the tests are run using the TAP framework and others run using Jest.
#### Run one test
To run a single unit test file from the command-line using Jest, use the command:
```bash
node_modules/.bin/jest ./test/unit/PATH/TO/FILENAME.test.js
```
*NOTE: replace `PATH/TO/FILENAME` with the actual path to the file you wish to run.*
### Integration tests ### Integration tests
We are transitioning from using TAP to using Jest as our testing framework so for the time being our tests run using both.
Our integration tests assume that a larger environment is running than just scratch-www
on its own; for instance, many require that a test user be able to log in to the site,
which requires backend and database support.
By default, tests run against our Staging instance, but you can pass in a different
location with the ROOT_URL environment variable (see below) if you want to run the
tests against another location--for instance, your local build.
We are transitioning from using TAP to using Jest as our testing framework,
so for the time being our tests run using both.
#### Running the tests #### Running the tests
* By default, tests run against our Staging instance, but you can pass in a different location with the ROOT_URL environment variable (see below) if you want to run the tests against e.g. your local build To run all integration tests from the command-line:
#### Running the tests ```bash
* Run all tests from the command-line: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu npm run test:integration` SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu npm run test:integration
* To run a single file from the command-line using TAP: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu node_modules/.bin/tap ./test/integration-legacy/smoke-testing/filename.js --timeout=3600` ```
* The timeout var is for the length of the entire tap test-suite; if you are getting a timeout error, you may need to adjust this value (some of the Selenium tests take a while to run)
* To run a single file from the command-line using Jest: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu node_modules/.bin/jest ./test/integration/filename.test.js` To run a single file from the command-line using Jest:
```bash
SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu node_modules/.bin/jest ./test/integration/filename.test.js
```
To run a single file from the command-line using TAP:
```bash
SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu node_modules/.bin/tap ./test/integration-legacy/smoke-testing/filename.js -R classic --no-coverage --timeout=3600
```
* the `-R classic` makes tap use the old reporting style, which avoids an error with the "nyc" package
* `--no-coverage` is because we do not use the coverage-tracking feature of tap
* the `timeout` argument is for the length of the entire tap test-suite; if you are getting a timeout error, you may need to adjust this value (some of the Selenium tests take a while to run)
#### Running Remote tests #### Running Remote tests
* TAP tests can be run using Saucelabs, an online service that can test browser/os combinations remotely. Currently all tests are written for use for chrome on mac.
* You will need a Saucelabs account in order to use it for testing. To find the Access Key, click your username and select User Settings from the dropdown menu. Near the bottom of the page is your access key that you can copy and use in the command line. Integration tests can be run using Saucelabs, an online service that can test multiple
* Currently Jest tests will not run with Saucelabs. browser/OS combinations remotely. (Currently, all tests are written for use for Chrome on Mac).
* To run tests using saucelabs run this command `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password SAUCE_USERNAME=saucelabsUsername SAUCE_ACCESS_KEY=saucelabsAccessKey ROOT_URL=https://scratch.mit.edu npm run test:integration:remote`
You will need a Saucelabs account in order to use it for testing. If you have one, you can
find your Access Key:
1. click your username
1. select "User Settings" from the dropdown menu
1. near the bottom of the page is your access key
To run tests using Saucelabs, run the command:
```bash
SMOKE_USERNAME=username SMOKE_PASSWORD=password SAUCE_USERNAME=saucelabsUsername SAUCE_ACCESS_KEY=saucelabsAccessKey ROOT_URL=https://scratch.mit.edu npm run test:integration:remote
```
*NOTE: Currently Jest tests will not run with Saucelabs.*
#### Configuration #### Configuration
@ -133,7 +264,7 @@ We are transitioning from using TAP to using Jest as our testing framework so fo
| `SAUCE_USERNAME` | `None` | Username for your Sauce Labs account | | `SAUCE_USERNAME` | `None` | Username for your Sauce Labs account |
| `SAUCE_ACCESS_KEY` | `None` | Access Key for Sauce Labs found under User Settings | | `SAUCE_ACCESS_KEY` | `None` | Access Key for Sauce Labs found under User Settings |
### To Deploy ## To Deploy
Deploying to staging or production will upload code to S3 and configure Fastly. Deploying to staging or production will upload code to S3 and configure Fastly.
@ -154,20 +285,31 @@ npm run build && npm run deploy
| `AWS_SECRET_ACCESS_KEY` | `''` | AWS secret access key for S3 | | `AWS_SECRET_ACCESS_KEY` | `''` | AWS secret access key for S3 |
| `S3_BUCKET_NAME` | `''` | S3 bucket name to deploy into | | `S3_BUCKET_NAME` | `''` | S3 bucket name to deploy into |
## Windows
For development on Windows, you will probably need to use a program that provides you a Unix interface.
There are several options for doing this:
* Use the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10) to run Linux inside Windows
* Use [Cygwin](https://www.cygwin.com/)
* Use Wubi, a Windows Installer for Ubuntu that allows you to have Ubuntu and Windows on one disk, without the need of an extra partition. There is a [version for Windows XP, Vista, or 7](https://wiki.ubuntu.com/WubiGuide) and a [version for Windows 8 or higher](https://github.com/hakuna-m/wubiuefi).
In addition, you will need to install Node; [here are instructions for installing Node on WSL](https://docs.microsoft.com/en-us/windows/nodejs/setup-on-wsl2#install-nvm-nodejs-and-npm).
## Current issues with developing scratch-www
### Current issues with the development
We're currently in the process of transitioning into this web client from Scratch's existing structure. As we transition, there are going to be some issues along the way that relate to how this client needs to interact with the existing infrastructure to work properly in production. We're currently in the process of transitioning into this web client from Scratch's existing structure. As we transition, there are going to be some issues along the way that relate to how this client needs to interact with the existing infrastructure to work properly in production.
#### FALLBACK ### FALLBACK
On top of migrating to using this as our web client, Scratch is also transitioning into using a new API backend, Scratch REST API. As that is also currently in development and incomplete, we are set up to fall back to using existing Scratch endpoints if an API endpoint does not exist – which is where the `FALLBACK` comes in.
On top of migrating to using this as our web client, Scratch is also transitioning into using a new API backend, Scratch REST API (closed-source). As that is also currently in development and incomplete, we are set up to fall back to using existing Scratch endpoints if an API endpoint does not exist – which is where the `FALLBACK` comes in.
Most of the issues we have currently revolve around the use of `FALLBACK`. This variable is used to specify what URL to fall back onto should a request fail within the context of this web client, or when using the `API_HOST`. If not specified in the process, it will not be used, and any request that is not made through the web client or the API will be unreachable. Most of the issues we have currently revolve around the use of `FALLBACK`. This variable is used to specify what URL to fall back onto should a request fail within the context of this web client, or when using the `API_HOST`. If not specified in the process, it will not be used, and any request that is not made through the web client or the API will be unreachable.
Setting `FALLBACK=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being: Setting `FALLBACK=https://scratch.mit.edu` allows the web client to retrieve data from the Scratch website in your development environment. However, because of security concerns, trying to send data to Scratch through your development environment won't work. This means the following things will be broken for the time being:
* Login on the splash page (*In the process of being fixed*) * Login on the splash page (*In the process of being fixed*)
* Some update attempts to production data made through a development version of the web client * Some update attempts to production data made through a development version of the web client
Additionally, if you set `FALLBACK=https://scratch.mit.edu`, be aware that clicking on links to parts of the website not yet migrated over (currently such as `Explore`, `Discuss`, `Profile`, etc.) will take you to the Scratch website itself. Additionally, if you set `FALLBACK=https://scratch.mit.edu`, be aware that clicking on links to parts of the website not yet migrated over (currently such as `Discuss`, `Profile`, `My Stuff`, etc.) will take you to the Scratch website itself.
#### Windows
Some users have experienced difficulties when trying to get our web client to work on Windows. One solution could be to use [Cygwin](https://www.cygwin.com/). If that doesn't work, you might want to use [Wubi](https://wiki.ubuntu.com/WubiGuide) (Windows XP, Vista, 7) or [Wubiuefi](https://github.com/hakuna-m/wubiuefi) (Windows 8 or higher). Wubi(uefi) is a Windows Installer for Ubuntu that allows you to have Ubuntu and Windows on one disk, without the need of an extra partition.

204
package-lock.json generated
View file

@ -5,13 +5,13 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@babel/cli": { "@babel/cli": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.4.tgz",
"integrity": "sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A==", "integrity": "sha512-O7mmzaWdm+VabWQmxuM8hqNrWGGihN83KfhPUzp2lAW4kzIMwBxujXkZbD4fMwKMYY9FXTbDvXsJqU+5XHXi4A==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": "^2.1.8", "chokidar": "^2.1.8",
"commander": "^2.8.1", "commander": "^4.0.1",
"convert-source-map": "^1.1.0", "convert-source-map": "^1.1.0",
"fs-readdir-recursive": "^1.1.0", "fs-readdir-recursive": "^1.1.0",
"glob": "^7.0.0", "glob": "^7.0.0",
@ -110,6 +110,12 @@
"upath": "^1.1.1" "upath": "^1.1.1"
} }
}, },
"commander": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz",
"integrity": "sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==",
"dev": true
},
"debug": { "debug": {
"version": "2.6.9", "version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@ -477,18 +483,18 @@
} }
}, },
"@babel/core": { "@babel/core": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.4.tgz",
"integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==", "integrity": "sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.5.5", "@babel/code-frame": "^7.5.5",
"@babel/generator": "^7.7.2", "@babel/generator": "^7.7.4",
"@babel/helpers": "^7.7.0", "@babel/helpers": "^7.7.4",
"@babel/parser": "^7.7.2", "@babel/parser": "^7.7.4",
"@babel/template": "^7.7.0", "@babel/template": "^7.7.4",
"@babel/traverse": "^7.7.2", "@babel/traverse": "^7.7.4",
"@babel/types": "^7.7.2", "@babel/types": "^7.7.4",
"convert-source-map": "^1.7.0", "convert-source-map": "^1.7.0",
"debug": "^4.1.0", "debug": "^4.1.0",
"json5": "^2.1.0", "json5": "^2.1.0",
@ -508,84 +514,84 @@
} }
}, },
"@babel/generator": { "@babel/generator": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
"integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.2", "@babel/types": "^7.7.4",
"jsesc": "^2.5.1", "jsesc": "^2.5.1",
"lodash": "^4.17.13", "lodash": "^4.17.13",
"source-map": "^0.5.0" "source-map": "^0.5.0"
} }
}, },
"@babel/helper-function-name": { "@babel/helper-function-name": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
"integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-get-function-arity": "^7.7.0", "@babel/helper-get-function-arity": "^7.7.4",
"@babel/template": "^7.7.0", "@babel/template": "^7.7.4",
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/helper-get-function-arity": { "@babel/helper-get-function-arity": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
"integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/helper-split-export-declaration": { "@babel/helper-split-export-declaration": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
"integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.7.3", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz",
"integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==", "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
"integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
"@babel/parser": "^7.7.0", "@babel/parser": "^7.7.4",
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/traverse": { "@babel/traverse": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
"integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.5.5", "@babel/code-frame": "^7.5.5",
"@babel/generator": "^7.7.2", "@babel/generator": "^7.7.4",
"@babel/helper-function-name": "^7.7.0", "@babel/helper-function-name": "^7.7.4",
"@babel/helper-split-export-declaration": "^7.7.0", "@babel/helper-split-export-declaration": "^7.7.4",
"@babel/parser": "^7.7.2", "@babel/parser": "^7.7.4",
"@babel/types": "^7.7.2", "@babel/types": "^7.7.4",
"debug": "^4.1.0", "debug": "^4.1.0",
"globals": "^11.1.0", "globals": "^11.1.0",
"lodash": "^4.17.13" "lodash": "^4.17.13"
} }
}, },
"@babel/types": { "@babel/types": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
"integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
"dev": true, "dev": true,
"requires": { "requires": {
"esutils": "^2.0.2", "esutils": "^2.0.2",
@ -721,86 +727,86 @@
} }
}, },
"@babel/helpers": { "@babel/helpers": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
"integrity": "sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==", "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/template": "^7.7.0", "@babel/template": "^7.7.4",
"@babel/traverse": "^7.7.0", "@babel/traverse": "^7.7.4",
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
}, },
"dependencies": { "dependencies": {
"@babel/generator": { "@babel/generator": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
"integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.2", "@babel/types": "^7.7.4",
"jsesc": "^2.5.1", "jsesc": "^2.5.1",
"lodash": "^4.17.13", "lodash": "^4.17.13",
"source-map": "^0.5.0" "source-map": "^0.5.0"
} }
}, },
"@babel/helper-function-name": { "@babel/helper-function-name": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
"integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==", "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/helper-get-function-arity": "^7.7.0", "@babel/helper-get-function-arity": "^7.7.4",
"@babel/template": "^7.7.0", "@babel/template": "^7.7.4",
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/helper-get-function-arity": { "@babel/helper-get-function-arity": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
"integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==", "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/helper-split-export-declaration": { "@babel/helper-split-export-declaration": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
"integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==", "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.7.3", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.4.tgz",
"integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==", "integrity": "sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
"version": "7.7.0", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
"integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==", "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
"@babel/parser": "^7.7.0", "@babel/parser": "^7.7.4",
"@babel/types": "^7.7.0" "@babel/types": "^7.7.4"
} }
}, },
"@babel/traverse": { "@babel/traverse": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
"integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.5.5", "@babel/code-frame": "^7.5.5",
"@babel/generator": "^7.7.2", "@babel/generator": "^7.7.4",
"@babel/helper-function-name": "^7.7.0", "@babel/helper-function-name": "^7.7.4",
"@babel/helper-split-export-declaration": "^7.7.0", "@babel/helper-split-export-declaration": "^7.7.4",
"@babel/parser": "^7.7.2", "@babel/parser": "^7.7.4",
"@babel/types": "^7.7.2", "@babel/types": "^7.7.4",
"debug": "^4.1.0", "debug": "^4.1.0",
"globals": "^11.1.0", "globals": "^11.1.0",
"lodash": "^4.17.13" "lodash": "^4.17.13"
@ -818,9 +824,9 @@
} }
}, },
"@babel/types": { "@babel/types": {
"version": "7.7.2", "version": "7.7.4",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
"integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
"dev": true, "dev": true,
"requires": { "requires": {
"esutils": "^2.0.2", "esutils": "^2.0.2",
@ -15653,15 +15659,15 @@
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20191120175131", "version": "0.1.0-prerelease.20191205143447",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20191120175131.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20191205143447.tgz",
"integrity": "sha512-eNr4hNLW4EI3/5WO5w2/7fzhKL8h3imHS5WbjP8SQMS3CIGrE9un7e30RepR0jT9VnsWoNL7nNMLVclBZpeoLA==", "integrity": "sha512-dx2ssVXXmCIXEoWbhOp9DM7oAZ6Nd0BHBhMQrDtSy+G2smODMsTqx7xsvfuQ+4+xtd8Sru7qjWG2RxPrJ6Fdkw==",
"dev": true "dev": true
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.6.20191120161253", "version": "3.6.20191204142956",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.6.20191120161253.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.6.20191204142956.tgz",
"integrity": "sha512-M315ak1Y/VF+0Yv2nrSlQM8qIEV2MlkPC2VVHz7/Ag64ib6PJBuPNLXmQ26u4ToDxA97ouzgBDWUoupJS3n96g==", "integrity": "sha512-3IKAbV9PDEpYrvnyZrHclyibGGqTnr+/eo98pg27lk46Vo2hdH92SBV/PntOkz5r88A51tqf+vJq1VPRHslXZw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",

2
package.json
View file

@ -127,7 +127,7 @@
"redux-mock-store": "^1.2.3", "redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20191120175131", "scratch-gui": "0.1.0-prerelease.20191205143447",
"scratch-l10n": "latest", "scratch-l10n": "latest",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",

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

@ -22,7 +22,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="/jobs"> <a href="https://www.scratchfoundation.org/opportunities">
<FormattedMessage id="general.jobs" /> <FormattedMessage id="general.jobs" />
</a> </a>
</dd> </dd>
@ -83,7 +83,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="/jobs"> <a href="https://www.scratchfoundation.org/opportunities">
<FormattedMessage id="general.jobs" /> <FormattedMessage id="general.jobs" />
</a> </a>
</dd> </dd>

36
src/components/page/www/donor-recognition.jsx Normal file
View file

@ -0,0 +1,36 @@
const FormattedMessage = require('react-intl').FormattedMessage;
const injectIntl = require('react-intl').injectIntl;
const React = require('react');
require('./donor-recognition.scss');
const DonorRecognition = () => (
<div id="donor-text">
<div>
<FormattedMessage
id="footer.donorRecognition"
values={{
donorLink: (
<a
href="/credits#donors"
>
<FormattedMessage id="footer.donors" />
</a>
)
}}
/>
</div>
<div>
<FormattedMessage
id="footer.donorList"
values={{
donor1: 'Massachusetts Institute of Technology',
donor2: 'National Science Foundation',
donor3: 'Siegel Family Endowment'
}}
/>
</div>
</div>
);
module.exports = injectIntl(DonorRecognition);

38
src/components/page/www/donor-recognition.scss Normal file
View file

@ -0,0 +1,38 @@
@import "../../../colors";
@import "../../../frameless";
#donor {
color: $type-gray;
font-size: .875rem;
line-height: 1.5em;
background-color: $ui-gray;
padding-bottom: 2.5rem;
padding-top: 1rem;
#donor-text {
text-align: center;
width: $cols12;
margin: 0 auto;
}
}
@media only screen and (min-width: $tabletPortrait) and (max-width: $desktop) {
#donor {
#donor-text {
width: $cols11;
}
}
}
@media only screen and (min-width: $mobile) and (max-width: $tabletPortrait) {
#donor {
#donor-text {
width: $cols6;
}
}
}
@media only screen and (max-width: $mobile) {
#donor {
#donor-text {
width: $cols4;
}
}
}

12
src/components/page/www/page.jsx
View file

@ -4,11 +4,13 @@ const React = require('react');
const Navigation = require('../../navigation/www/navigation.jsx'); const Navigation = require('../../navigation/www/navigation.jsx');
const Footer = require('../../footer/www/footer.jsx'); const Footer = require('../../footer/www/footer.jsx');
const DonorRecognition = require('./donor-recognition.jsx');
const ErrorBoundary = require('../../errorboundary/errorboundary.jsx'); const ErrorBoundary = require('../../errorboundary/errorboundary.jsx');
const Page = ({ const Page = ({
children, children,
className className,
showDonorRecognition
}) => ( }) => (
<ErrorBoundary componentName="Page"> <ErrorBoundary componentName="Page">
<div className={classNames('page', className)}> <div className={classNames('page', className)}>
@ -26,13 +28,19 @@ const Page = ({
<div id="footer"> <div id="footer">
<Footer /> <Footer />
</div> </div>
{showDonorRecognition &&
<div id="donor">
<DonorRecognition />
</div>
}
</div> </div>
</ErrorBoundary> </ErrorBoundary>
); );
Page.propTypes = { Page.propTypes = {
children: PropTypes.node, children: PropTypes.node,
className: PropTypes.string className: PropTypes.string,
showDonorRecognition: PropTypes.bool
}; };
module.exports = Page; module.exports = Page;

3
src/l10n.json
View file

@ -122,6 +122,9 @@
"footer.discuss": "Discussion Forums", "footer.discuss": "Discussion Forums",
"footer.scratchFamily": "Scratch Family", "footer.scratchFamily": "Scratch Family",
"footer.donorRecognition": "Scratch is available for free thanks to generous support from our {donorLink}. We are grateful to our Founding Partners:",
"footer.donors": "donors",
"footer.donorList": "{donor1}, {donor2}, and {donor3}.",
"form.validationRequired": "This field is required", "form.validationRequired": "This field is required",

15
src/routes.json
View file

@ -148,18 +148,9 @@
"title": "Ideas" "title": "Ideas"
}, },
{ {
"name": "jobs", "name": "jobs-redirect",
"pattern": "^/jobs/?$", "pattern": "^/jobs/?(\\?.*)?$",
"routeAlias": "/jobs(/moderator)?/?$", "redirect": "https://www.scratchfoundation.org/opportunities/"
"view": "jobs/jobs",
"title": "Jobs"
},
{
"name": "jobs-moderator",
"pattern": "^/jobs/moderator/?$",
"routeAlias": "/jobs(/moderator)?/?$",
"view": "jobs/moderator/moderator",
"title": "Community Moderator"
}, },
{ {
"name": "join", "name": "join",

22
src/views/credits/credits.jsx
View file

@ -32,12 +32,20 @@ const Credits = () => (
key={`person-${index}`} key={`person-${index}`}
> >
<div> <div>
<a href={`https://scratch.mit.edu/users/${person.userName}/`}> {person.userName ? (
<a href={`https://scratch.mit.edu/users/${person.userName}/`}>
<Avatar
alt=""
src={`https://cdn.scratch.mit.edu/get_image/user/${person.userId || 'default'}_80x80.png`}
/>
</a>
) : (
/* if userName is not given, there's no chance userId is given */
<Avatar <Avatar
alt="" alt=""
src={`https://cdn.scratch.mit.edu/get_image/user/${person.userId || 'default'}_80x80.png`} src={`https://cdn.scratch.mit.edu/get_image/user/default_80x80.png`}
/> />
</a> )}
</div> </div>
<span className="avatar-text"> <span className="avatar-text">
{person.name} {person.name}
@ -46,7 +54,10 @@ const Credits = () => (
))} ))}
</ul> </ul>
</div> </div>
<div className="supporters"> <div
className="supporters"
id="donors"
>
<div className="mid-header"> <div className="mid-header">
<h2> <h2>
<FormattedMessage id="credits.currentSponsors" /> <FormattedMessage id="credits.currentSponsors" />
@ -145,7 +156,8 @@ const Credits = () => (
Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou, Lily Kim, Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou, Lily Kim,
Tauntaun Kim, Saskia Leggett, Tim Mickel, Amon Millner, Ricarose Roque, Tauntaun Kim, Saskia Leggett, Tim Mickel, Amon Millner, Ricarose Roque,
Andrea Saxman, Jay Silver, Tammy Stern, Lis Sylvan, Hanako Tjia, Claudia Andrea Saxman, Jay Silver, Tammy Stern, Lis Sylvan, Hanako Tjia, Claudia
Urrea, Oren Zuckerman. Urrea, Oren Zuckerman, Tina Quach, My Nguyen, Lisa O&apos;Brien, Joel Gritter,
Linda Fernsel, Ellen Daoust, Julia Zimmerman.
</p> </p>
<p> <p>
<FormattedMessage id="credits.partnersBody" /> <FormattedMessage id="credits.partnersBody" />

66
src/views/credits/people.json
View file

@ -39,11 +39,6 @@
"userId": 27383273, "userId": 27383273,
"name": "Karishma Chadha" "name": "Karishma Chadha"
}, },
{
"userName": "SunnyDay4aBlueJay",
"userId": 24164779,
"name": "Ellen Daoust"
},
{ {
"userName": "shruti", "userName": "shruti",
"userId": 3714374, "userId": 3714374,
@ -54,11 +49,6 @@
"userId": 900283, "userId": 900283,
"name": "Champika Fernando" "name": "Champika Fernando"
}, },
{
"userName": "LiFaytheGoblin",
"userId": 1048810,
"name": "Linda Fernsel"
},
{ {
"userName": "dietbacon", "userName": "dietbacon",
"userId": 24137617, "userId": 24137617,
@ -84,11 +74,6 @@
"userId": 49156, "userId": 49156,
"name": "Mark Goff" "name": "Mark Goff"
}, },
{
"userName": "GulpTea",
"userId": 26249744,
"name": "Joel Gritter"
},
{ {
"userName": "codubee", "userName": "codubee",
"userId": 10866958, "userId": 10866958,
@ -104,11 +89,6 @@
"userId": 22183577, "userId": 22183577,
"name": "Sean Hickey" "name": "Sean Hickey"
}, },
{
"userName": "theladynico",
"userId": 35550237,
"name": "Nicole Hughes"
},
{ {
"userName": "sgcc_", "userName": "sgcc_",
"userId": 21986973, "userId": 21986973,
@ -134,16 +114,6 @@
"userId": 24838781, "userId": 24838781,
"name": "Marian Muthui" "name": "Marian Muthui"
}, },
{
"userName": "me_win",
"userId": 7664502,
"name": "My Nguyen"
},
{
"userName": "lob12",
"userId": 2860339,
"name": "Lisa O'Brien"
},
{ {
"userName": "", "userName": "",
"userId": "", "userId": "",
@ -164,11 +134,6 @@
"userId": 2286560, "userId": 2286560,
"name": "Carmelo Presicce" "name": "Carmelo Presicce"
}, },
{
"userName": "quacht",
"userId": 25500116,
"name": "Tina Quach"
},
{ {
"userName": "mres", "userName": "mres",
"userId": 167, "userId": 167,
@ -235,8 +200,33 @@
"name": "Kathy Wu" "name": "Kathy Wu"
}, },
{ {
"userName": "stymphalianbirb", "userName": "amylaser",
"userId": 2796185, "userId": 17462181,
"name": "Julia Zimmerman" "name": "Amy Lee"
},
{
"userName": "algorithmar",
"userId": 43013126,
"name": "Maren Vernon"
},
{
"userName": "bluecrazie",
"userId": 50257624,
"name": "JT Galla"
},
{
"userName": "Za-Chary",
"userId": 974363,
"name": "Zachary Deiman"
},
{
"userName": "Mos20",
"userId": 52545208,
"name": "Joan Fusco"
},
{
"userName": "pixelmoth",
"userId": 2408962,
"name": "Jacy Edelman"
} }
] ]

2
src/views/developers/developers.jsx
View file

@ -228,7 +228,7 @@ const Developers = () => (
id="developers.joinBody" id="developers.joinBody"
values={{ values={{
jobsPageLink: ( jobsPageLink: (
<a href="/jobs"> <a href="https://www.scratchfoundation.org/opportunities">
<FormattedMessage id="developers.joinBodyJobsLinkText" /> <FormattedMessage id="developers.joinBodyJobsLinkText" />
</a> </a>
), ),

45
src/views/jobs/jobs.jsx
View file

@ -1,45 +0,0 @@
const React = require('react');
const render = require('../../lib/render.jsx');
const FormattedMessage = require('react-intl').FormattedMessage;
const Page = require('../../components/page/www/page.jsx');
require('./jobs.scss');
const Jobs = () => (
<div className="jobs">
<div className="top">
<div className="inner">
<img src="/images/jobs.png" />
<h2><FormattedMessage id="jobs.titleQuestion" /></h2>
</div>
</div>
<div className="middle">
<div className="inner">
<h3><FormattedMessage id="jobs.joinScratchTeam" /></h3>
<p><FormattedMessage id="jobs.info" /></p>
<p><FormattedMessage id="jobs.workEnvironment" /></p>
</div>
</div>
<div className="bottom">
<div className="inner">
<h3><FormattedMessage id="jobs.openings" /></h3>
{/* <FormattedMessage id="jobs.nojobs" /> */}
<ul>
<li>
<a href="https://scratch.mit.edu/jobs/moderator">
Community Moderator
</a>
<span>
Remote
</span>
</li>
</ul>
</div>
</div>
</div>
);
render(<Page><Jobs /></Page>, document.getElementById('app'));

42
src/views/jobs/jobs.scss
View file

@ -1,42 +0,0 @@
@import "../../colors";
.jobs {
.top {
img {
margin-bottom: 10px;
width: 100%;
}
}
.middle {
margin: 20px 0;
background-color: $ui-gray;
padding: 40px 0;
width: 100%;
}
.bottom {
width: 100%;
line-height: 200%;
.thin-heading {
padding: 20px 0;
}
p {
margin: auto;
width: 70%;
}
ul {
padding-left: 0;
list-style: none;
li {
span {
margin-left: 10px;
}
}
}
}
}

8
src/views/jobs/l10n.json
View file

@ -1,8 +0,0 @@
{
"jobs.info": "With Scratch, young people from all backgrounds are learning to program their own interactive stories, games, and animations. Children and teens from around the world have created and shared more than 10 million projects in the rapidly-growing Scratch online community.",
"jobs.joinScratchTeam": "Join the Scratch Team!",
"jobs.openings": "Current Job Openings",
"jobs.titleQuestion": "Want to work on an innovative project that is transforming the ways young people create, share, and learn?",
"jobs.workEnvironment":"We’re seeking curious and motivated people to join our Scratch Team at the MIT Media Lab. We're a diverse group of educators, designers, and engineers, who work together in a playful, creative environment full of LEGO bricks, craft materials, and maker tools. We strongly value diversity, collaboration, and respect in the workplace.",
"jobs.nojobs":"We don't have any open positions at this time. Please check back soon for opportunities!"
}

108
src/views/jobs/moderator/moderator.jsx
View file

@ -1,108 +0,0 @@
const React = require('react');
const Page = require('../../../components/page/www/page.jsx');
const render = require('../../../lib/render.jsx');
const InformationPage = require('../../../components/informationpage/informationpage.jsx');
const Moderator = () => (
<InformationPage title={'Community Moderator'}>
<div className="inner info-inner">
<p>
Interested in online communities, internet culture, and
working with kids? We&#39;re seeking community moderators
to work with the <a href="/">Scratch</a> Team. Scratch
Moderators help keep Scratch a safe, trusted, and friendly
environment.
</p>
<p>
Scratch is a free service where young people learn to
program by creating interactive stories, games, and
animations which they can share to an online community.
Scratch has grown to more than 30 million registered
members (ages 8 and up) who create and share thousands
of projects each day. Moderators will gain valuable
experience working online with youth in a creative,
interest-driven setting.
</p>
<h3>Responsibilities:</h3>
<ul>
<li>
Promote the values and core ideas of the Scratch
project (such as inclusiveness, creative collaboration,
and constructive feedback)
</li>
<li>
Review reported users, projects, studios, and comments
for appropriateness on the Scratch website
</li>
<li>
Work with young people to help them understand what they
did that breaks our <a href="/community_guidelines">Community Guidelines</a>
</li>
<li>
Determine when a person is or isn’t likely to be able to
participate constructively in the Scratch online community
</li>
</ul>
<br />
<h3>Qualifications:</h3>
<ul>
<li>
Active participation in online communities, forums,
or social media
</li>
<li>
Excellent writing and communication skills
</li>
<li>
Comfortable learning to use new software and websites
</li>
<li>
Strong online research skills
</li>
<li>
Good judgement and ability to consider issues from
multiple perspectives
</li>
<li>
Able to work well independently, manage your time
well, and stay focused while working remotely
</li>
<li>
Able to work well as part of a team and participate
in group discussions
</li>
<li>
Not required, but would be nice: ability to read and
write in multiple languages (especially if one of those
languages is Japanese, Korean, or Russian!)
</li>
</ul>
<br />
<p>
This position is part-time (10-15 hours per week),
flexible hours (this work can be done 24/7 and we
set a schedule which fits in with your life),
under contract with starting pay of $12 per hour.
All candidates must be at least 18 years old and
have authorization to work in the United States.
</p>
<p><b>(MIT Media Lab, Cambridge, MA or Remote)</b></p>
<p>
Send a copy of your resume, links to one or more of your online
presences, and cover letter to{' '}
<a href="mailto:jobs+moderator@scratch.mit.edu">jobs+moderator@scratch.mit.edu</a>.
</p>
<p>
<i>
Really want the gig? <a href="/create">Create</a> an
awesome Scratch project to introduce yourself, share
it on the Scratch website, and send us a link.
</i>
</p>
</div>
</InformationPage>
);
render(<Page><Moderator /></Page>, document.getElementById('app'));

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

@ -271,7 +271,11 @@ const ConnectedSplash = connect(
)(Splash); )(Splash);
render( render(
<Page><ConnectedSplash /></Page>, <Page
showDonorRecognition
>
<ConnectedSplash />
</Page>,
document.getElementById('app'), document.getElementById('app'),
{splash: splashActions.splashReducer} {splash: splashActions.splashReducer}
); );

4
test/integration-legacy/smoke-testing/test_footer_links.js
View file

@ -101,9 +101,9 @@ tap.test('clickCreditsLink', options, t => {
// JOBS // JOBS
tap.test('clickJobsLink', options, t => { tap.test('clickJobsLink', options, t => {
const linkText = 'Jobs'; const linkText = 'Jobs';
const expectedHref = '/jobs'; const expectedUrl = 'https://www.scratchfoundation.org/opportunities/';
clickFooterLinks(linkText).then(url => { clickFooterLinks(linkText).then(url => {
t.equal(url.substr(-expectedHref.length), expectedHref); t.equal(url, expectedUrl);
t.end(); t.end();
}); });
}); });

21
test/unit/components/page.test.jsx Normal file
View file

@ -0,0 +1,21 @@
const React = require('react');
const {shallowWithIntl} = require('../../helpers/intl-helpers.jsx');
const Page = require('../../../src/components/page/www/page.jsx');
describe('Page', () => {
test('Do not show donor recognition', () => {
const component = shallowWithIntl(
<Page />
);
expect(component.find('#donor')).toHaveLength(0);
});
test('Show donor recognition', () => {
const component = shallowWithIntl(
<Page
showDonorRecognition
/>
);
expect(component.find('#donor')).toHaveLength(1);
});
});