From dde6893be84510b51eff2086a8fd735971aac6c2 Mon Sep 17 00:00:00 2001 From: Brian Hall Date: Mon, 23 Oct 2017 18:30:38 -0500 Subject: [PATCH] Squashed 'services/id.webmaker.org/' changes from 4b892c1e..a576fbdc a576fbdc Merge pull request #442 from kritisingh1/favicon 00464ab6 minor changes b12bc398 added favicon b912dcc2 Merge pull request #439 from mozilla/appveyor 47ddc9b4 Merge branch 'master' into appveyor e10b1a1d Fix #440 - Update Node (#441) f7ae1a64 Update appveyor.yml a7d01252 Update .travis.yml d690cdbf Update .travis.yml 821a103b trailing newline 5316cb78 gotta use trusty! 36e37faa such break, very fragile e210550b oops 6419b8a4 fix travis + postgres 4a04ba18 Add appveyor.yml, test with PostgreSQL 9.6 on travis bd8b9ced Merge pull request #438 from mozilla/node6 f095c77c Create package.json 207d4553 Merge pull request #430 from mozilla/readme-fix 2c9168a4 Update package.json 4e8d587d Update .travis.yml 1015575d Merge pull request #437 from mozilla/dispatch-protection 6f9b3219 oops ffd9db6f wrap dispatches so that they only send once the dispatcher is free 4c0f2fa3 Merge pull request #435 from mozilla/button-updates af42aaf5 Removed test ref attribute 9c66de99 Disabled the sign up and log in buttons after they are clicked, re-enables when appropriate. d46ad71f Merge pull request #433 from mozilla/image-fixes 4633232e Updated images d38da4bc Merge pull request #432 from mozilla/logo-updates c846f860 Updated alt text for the mozilla logo in the header 0456bb20 Changed the logo to be just mozilla 3d1cf07b Updated mozilla logo, added Thimble to header, changed colors. 602f3b7d Merge pull request #428 from ryanwarsaw/copy-env-before-install c22e0345 Revise code formatting based on review suggestions 833dd8e7 Don't copy env if NODE_ENV variable is defined c93ed4d5 Merge pull request #429 from ryanwarsaw/remove-new-relic 201452b4 Add pre-install script to copy env before install a6ad53af Fix oauth doc link b4f42a76 Redundant dependency: newrelic git-subtree-dir: services/id.webmaker.org git-subtree-split: a576fbdcb8d080616eab210c209704fbfb79ff5f --- .gitignore | 1 + .travis.yml | 5 +- README.md | 3 +- appveyor.yml | 32 ++ package.json | 6 +- public/img/background.jpg | Bin 18525 -> 0 bytes .../{icon-check.svg => icon-check-email.svg} | 2 +- public/img/icon-check-tos.svg | 10 + public/img/idicon.png | Bin 0 -> 928 bytes public/img/mozilla-logo.svg | 8 + public/img/webmaker-horizontal.svg | 524 ------------------ public/index.html | 1 + public/tests/manual/index.html | 1 + sample.env | 11 - scripts/ensure-env.js | 5 + templates/components/header/header.jsx | 2 +- templates/less/components/button.less | 18 +- templates/less/components/header.less | 14 +- templates/less/pages/signup.less | 8 +- templates/lib/webmaker-actions.jsx | 40 +- templates/pages/login.jsx | 21 +- templates/pages/signup.jsx | 19 +- web/index.js | 1 - 23 files changed, 149 insertions(+), 583 deletions(-) create mode 100644 appveyor.yml delete mode 100644 public/img/background.jpg rename public/img/{icon-check.svg => icon-check-email.svg} (90%) create mode 100644 public/img/icon-check-tos.svg create mode 100644 public/img/idicon.png create mode 100644 public/img/mozilla-logo.svg delete mode 100644 public/img/webmaker-horizontal.svg create mode 100644 scripts/ensure-env.js diff --git a/.gitignore b/.gitignore index 0f1a8e12c..873e4e436 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ public/tests/mocha* .env npm-debug* newrelic_agent.log +package-lock.json diff --git a/.travis.yml b/.travis.yml index 401bf0d20..625400eca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ +dist: trusty language: node_js node_js: -- '4.6' +- '4' sudo: false cache: directories: - node_modules addons: - postgresql: "9.4" + postgresql: "9.6" before_script: - psql -c 'create database webmaker_oauth_test' -U postgres diff --git a/README.md b/README.md index 2e4a4e459..1ef1c75da 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ 1. Fork and clone this repository 2. Navigate to the directory of the repository, e.g. `cd id.webmaker.org` 3. `npm install` to install dependencies -4. Set configuration variables, by default `cp sample.env .env` or `copy sample.env .env` on Windows 5. `npm start` 6. Navigate your browser to [`http://localhost:1234`](http://localhost:1234) @@ -67,4 +66,4 @@ You can configure the following environment variables: ## Using OAuth2 -For information on creating an OAuth2 application that relies on this server, see [`docs/oauth.md`](https://github.com/mozilla/id.webmaker.org/blob/develop/docs/oauth.md). +For information on creating an OAuth2 application that relies on this server, see [`docs/oauth.md`](docs/oauth.md). diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..2dc213690 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,32 @@ +version: "{build}" + +environment: + nodejs_version: "4" + DATABASE_URL: postgres://postgres:Password12!@localhost:5432/webmaker_oauth_test + +services: + - postgresql + +install: + - ps: Install-Product node $env:nodejs_version + - npm install + +before_test: + - SET PGUSER=postgres + - SET PGPASSWORD=Password12! + - PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH% + - createdb webmaker_oauth_test + +test_script: + - node --version + - npm --version + - npm test + +build: off + +branches: + + only: + - master + +clone_depth: 1 diff --git a/package.json b/package.json index 2b24e16ad..7026f3ae4 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "jshint": "jshint -c node_modules/mofo-style/linters/.jshintrc lib test web webpack.config.js", "jsbeautify": "js-beautify lib test web *.js -r", "lint": "npm run jshint && npm run jscs", + "preinstall": "node scripts/ensure-env", "postinstall": "node scripts/build", "test:setup": "npm run test:droptables && npm run test:createtables && npm run test:insertdata", "test:droptables": "node scripts/drop-tables", @@ -69,7 +70,6 @@ "joi": "6.0.8", "jsx-loader": "0.12.2", "less": "1.7.5", - "newrelic": "1.20.1", "pass-test": "1.0.3", "pg": "4.3.0", "react": "0.12.2", @@ -90,7 +90,7 @@ "jscs": "1.11.3", "jshint": "2.6.3", "json-loader": "0.5.1", - "lab": "5.5.0", + "lab": "13.1.0", "less": "2.4.0", "mocha": "2.2.1", "mocha-phantomjs": "3.6.0", @@ -100,6 +100,6 @@ "phantomjs": "1.9.7-14" }, "engines": { - "node": "^4.6.0" + "node": "^4.8.4" } } diff --git a/public/img/background.jpg b/public/img/background.jpg deleted file mode 100644 index 1dac49edc80e2dcc00c6bba2abb29beb9bdab779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18525 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 diff --git a/public/img/icon-check.svg b/public/img/icon-check-email.svg similarity index 90% rename from public/img/icon-check.svg rename to public/img/icon-check-email.svg index a350fb74a..9e5d328dd 100644 --- a/public/img/icon-check.svg +++ b/public/img/icon-check-email.svg @@ -4,7 +4,7 @@ - diff --git a/public/img/icon-check-tos.svg b/public/img/icon-check-tos.svg new file mode 100644 index 000000000..c5be9f71d --- /dev/null +++ b/public/img/icon-check-tos.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/public/img/idicon.png b/public/img/idicon.png new file mode 100644 index 0000000000000000000000000000000000000000..08884b41f34503659ebd2df3fc5df06c1187b087 GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^M?jbZNH9D-dvQAh19Q5ki(^Oy694iwk8w$&x&HI#`7ciH z-yJYv65`8O)vfSzmC<^>Tjl@vb(-BeeD&u=79K9`5^GxX zYMt=^9r3rdE^l$OfA{WBveYf3i(gD5Qts63nf=RZ(*3>{ z6|vtw1>TaL?GvlzdvJ31&pexYOXqES^lIy-Jh0h#wxp9)cjw)?%pcEoZ2rwL^KQl2 z5Uncp&xL>WrngTC5Z(R4DJsZxcg7b+)soYB>rSr^c~Et|_4hP`90Q5T(?uUnjpcoK zPBrBCyJH>mz8rYRwl|yera}HslU1qmYj16AvDi32>{7GN&GVk`!jwAm->ek);$4+) zAG{^Hb5nZ!_J)q8#@g5`ajM5=?!DUNa`NA$y#r@XNi&a?;;5QrC3|C;=s)c%lY4GttuxVG`RLs1V?Gxrt-FyF z@`d%RS+Ls6xhJlNf0?+TeA5asIajicxQ;iwmrOd7^?N>t@Kre*CGnJm+S=JkM#4`IDmyLmz0d6{c5|b0UYE|5 zsk~C2Vjurr5ZqhZB5`AZ$hD^H&h8%A^$KP}qy@#3Th`HX1!0L1;z X@a~JuoTA;QJwZHAS3j3^P6 + + + + + + + \ No newline at end of file diff --git a/public/img/webmaker-horizontal.svg b/public/img/webmaker-horizontal.svg deleted file mode 100644 index a09f54ab6..000000000 --- a/public/img/webmaker-horizontal.svg +++ /dev/null @@ -1,524 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/index.html b/public/index.html index 0b8e6ad01..0b6154b8b 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ Webmaker Login V4 + diff --git a/public/tests/manual/index.html b/public/tests/manual/index.html index 7aa96f664..4a583745a 100644 --- a/public/tests/manual/index.html +++ b/public/tests/manual/index.html @@ -4,6 +4,7 @@ Manual tests +