From 0ed5d80bb35455e89a6adc81d42bfe6e01d21b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geir=20G=C3=A5sodden?= Date: Sun, 19 Mar 2017 15:19:12 +0100 Subject: [PATCH] Adds tests. Updates README. Standard fixes --- .gitignore | 3 ++- README.md | 15 ++++++--------- components/loading.js | 21 ++++++++++----------- layouts/index.js | 2 +- package.json | 30 +++++++++++++++++++++--------- test/modules/ava-test.js | 7 +++++++ test/modules/dependencies-test.js | 12 ++++++++++++ test/modules/dev-dependencies-test.js | 12 ++++++++++++ 8 files changed, 71 insertions(+), 31 deletions(-) create mode 100644 test/modules/ava-test.js create mode 100644 test/modules/dependencies-test.js create mode 100644 test/modules/dev-dependencies-test.js diff --git a/.gitignore b/.gitignore index 79f0b0c..159a76d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ # IDE .idea +.vscode -# OS X +# Mac OS .DS_Store # Logs diff --git a/README.md b/README.md index 7c4de7b..e5f88cb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Website for five factor model of personality based on work from [IPIP-NEO-PI](ht Tests and evaluation is gathered from [ipip.ori.org](http://ipip.ori.org). -See it live @ https://bigfive.maccyber.io +See it live @ [bigfive.world](https://bigfive.world) Written in [nodejs](https://nodejs.org) using [next.js](https://github.com/zeit/next.js) framework and following [micro](https://github.com/zeit/micro) services: * [micro-bigfive-questions](https://github.com/maccyber/micro-bigfive-questions) - *Serves questions* @@ -38,13 +38,10 @@ npm run dev ``` Open web-browser at http://localhost:3000 -## Example -See https://bigfive.maccyber.io (not finished) - ## Deploy using [Now](https://zeit.co/now) ```sh -$ now https://github.com/maccyber/bigfive-web +$ now https://github.com/maccyber/bigfive-web --npm ``` ## Deploy using [Docker](https://www.docker.com/) @@ -66,7 +63,7 @@ npm run dev ## Screenshot -![alt text](http://bildr.no/image/bkozazVQ.jpeg "BigFive") +![BigFive screendump](http://bildr.no/image/bkozazVQ.jpeg "BigFive") ## License @@ -74,8 +71,8 @@ npm run dev ## About -Created by [zrrzzt](https://github.com/zrrrzzt) and [maccyber](https://github.com/maccyber) +Created with <3 by [zrrzzt](https://github.com/zrrrzzt) and [maccyber](https://github.com/maccyber) -![alt text](https://robots.kebabstudios.party/zrrrzzt.png "Robohash image of zrrrzzt") -![alt text](https://robots.kebabstudios.party/maccyber.png "Robohash image of maccyber") +![Robohash image of zrrrzzt](https://robots.kebabstudios.party/zrrrzzt.png "Robohash image of zrrrzzt") +![Robohash image of maccyber](https://robots.kebabstudios.party/maccyber.png "Robohash image of maccyber") diff --git a/components/loading.js b/components/loading.js index cb46027..ae44de3 100644 --- a/components/loading.js +++ b/components/loading.js @@ -4,21 +4,20 @@ export default ({ loading }) => (
{ loading - ? - -

- -

-

- LOADING ...

- - + + : null }
diff --git a/layouts/index.js b/layouts/index.js index d8afd9d..e8542bb 100644 --- a/layouts/index.js +++ b/layouts/index.js @@ -123,7 +123,7 @@ export default ({pageTitle, children}) => (
- Bigfive-web
+ Bigfive-web
Made with ❤ by zrrrzzt and maccyber
diff --git a/package.json b/package.json index e4f9d5e..c50e024 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "name": "next-bigfive-web", "version": "1.0.0", "description": "Website for bigfive personality test using next.js", - "license": "ISC", + "license": "MIT", + "private": true, "author": { "name": "Jonas Enge", "email": "jonas.enge@gmail.com", @@ -22,29 +23,40 @@ ], "repository": { "type": "git", - "url": "http://github.com/maccyber/bigfive-web.git" + "url": "https://github.com/maccyber/bigfive-web.git" }, "bugs": { - "url": "http://github.com/maccyber/bigfive-web/issues" + "url": "https://github.com/maccyber/bigfive-web/issues" }, + "homepage": "https://github.com/maccyber/bigfive-web", "devDependencies": { - "standard": "8.6.0" + "ava": "0.18.2", + "coveralls": "2.12.0", + "nsp": "2.6.3", + "nyc": "10.1.2", + "standard": "9.0.2" }, "now": { "alias": "bigfive.maccyber.io", - "engines": { - "node": "7.0.0" - } + "env": { + "NODE_ENV": "production" + }, + "type": "npm" }, "scripts": { "dev": "next", "build": "next build", - "start": "next start" + "start": "next start", + "test": "standard && nsp check && ava", + "test-offline": "standard && ava", + "coverage": "nyc ava", + "coveralls": "nyc ava && nyc report --reporter=lcov && cat coverage/lcov.info | coveralls", + "standard-fix": "standard --fix" }, "dependencies": { "axios": "0.15.3", "country-list": "1.1.0", - "next": "2.0.0-beta.27", + "next": "2.0.0-beta.39", "react": "15.4.2", "react-d3": "0.4.0", "react-dom": "15.4.2" diff --git a/test/modules/ava-test.js b/test/modules/ava-test.js new file mode 100644 index 0000000..7c6b18b --- /dev/null +++ b/test/modules/ava-test.js @@ -0,0 +1,7 @@ +'use strict' + +const test = require('ava') + +test('ava works ok', t => { + t.true(true) +}) diff --git a/test/modules/dependencies-test.js b/test/modules/dependencies-test.js new file mode 100644 index 0000000..b009a45 --- /dev/null +++ b/test/modules/dependencies-test.js @@ -0,0 +1,12 @@ +'use strict' + +const test = require('ava') +const pkg = require('../../package.json') +const dependencies = pkg.dependencies || {} + +Object.keys(dependencies).forEach((dependency) => { + test(`${dependency} loads ok`, t => { + const module = require(dependency) + t.truthy(module) + }) +}) diff --git a/test/modules/dev-dependencies-test.js b/test/modules/dev-dependencies-test.js new file mode 100644 index 0000000..bc1e961 --- /dev/null +++ b/test/modules/dev-dependencies-test.js @@ -0,0 +1,12 @@ +'use strict' + +const test = require('ava') +const pkg = require('../../package.json') +const dependencies = pkg.devDependencies || {} + +Object.keys(dependencies).forEach((dependency) => { + test(`${dependency} loads ok`, t => { + const module = require(dependency) + t.truthy(module) + }) +})