From 503f94199f7fc730da4a1a1165c2863956d10000 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 00:22:36 +0100 Subject: Setup react-redux env --- package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 8ae0621..95337bb 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "babel-loader": "^7.1.2", + "babel-preset-react": "^6.24.1", "bluebird": "^3.4.6", "body-parser": "^1.16.0", "browser-request": "^0.3.3", @@ -19,6 +20,7 @@ "debug": "^2.6.0", "diacritics": "^1.2.3", "encoding": "^0.1.12", + "eslint": "^4.13.0", "express": "^4.13.4", "flexibility": "^2.0.1", "fuzzy": "^0.1.1", @@ -27,6 +29,10 @@ "left-pad": "^1.1.1", "lodash": "^4.15.0", "morgan": "~1.7.0", + "react": "^16.2.0", + "react-dom": "^16.2.0", + "react-redux": "^5.0.6", + "redux": "^3.7.2", "request": "^2.74.0", "smoothscroll-polyfill": "^0.3.4", "spdy": "^3.4.4", @@ -38,6 +44,10 @@ "babelify": "^7.3.0", "bower": "^1.7.9", "browserify": "^14.0.0", + "eslint-config-airbnb": "^16.1.0", + "eslint-plugin-import": "^2.8.0", + "eslint-plugin-jsx-a11y": "^6.0.2", + "eslint-plugin-react": "^7.5.1", "gulp": "^3.9.1", "watchify": "^3.7.0", "webpack": "^3.5.6" -- cgit v1.1 From 0141d1f9f4c7ca1755e0a5da908e9d27cf7aa0e1 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 00:41:32 +0100 Subject: Add presentation search component --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 95337bb..5b09abd 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "left-pad": "^1.1.1", "lodash": "^4.15.0", "morgan": "~1.7.0", + "prop-types": "^15.6.0", "react": "^16.2.0", "react-dom": "^16.2.0", "react-redux": "^5.0.6", -- cgit v1.1 From 4ce420528dd747021f7fa51483710388f5733724 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 01:01:36 +0100 Subject: Add Search container --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 5b09abd..21f900a 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "dependencies": { "babel-loader": "^7.1.2", "babel-preset-react": "^6.24.1", + "babel-preset-stage-2": "^6.24.1", "bluebird": "^3.4.6", "body-parser": "^1.16.0", "browser-request": "^0.3.3", -- cgit v1.1 From edaa91d05e753e3609c00068f565b88c4ef77e62 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 11:37:32 +0100 Subject: Compile scss to css --- package.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 21f900a..70ae1ff 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,13 @@ "cheerio": "^0.22.0", "compression": "^1.6.2", "cookie-parser": "~1.4.3", + "css-loader": "^0.28.7", "debug": "^2.6.0", "diacritics": "^1.2.3", "encoding": "^0.1.12", "eslint": "^4.13.0", "express": "^4.13.4", + "extract-text-webpack-plugin": "^3.0.2", "flexibility": "^2.0.1", "fuzzy": "^0.1.1", "iconv-lite": "^0.4.17", @@ -30,12 +32,14 @@ "left-pad": "^1.1.1", "lodash": "^4.15.0", "morgan": "~1.7.0", + "node-sass": "^4.7.2", "prop-types": "^15.6.0", "react": "^16.2.0", "react-dom": "^16.2.0", "react-redux": "^5.0.6", "redux": "^3.7.2", "request": "^2.74.0", + "sass-loader": "^6.0.6", "smoothscroll-polyfill": "^0.3.4", "spdy": "^3.4.4", "then-yield": "0.0.1", -- cgit v1.1 From 9f6a36d1f1a16c1a777a23fcc8c986c45ee0a116 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 10 Dec 2017 13:25:46 +0100 Subject: Add some basic styling --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 70ae1ff..364cfd6 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "body-parser": "^1.16.0", "browser-request": "^0.3.3", "cheerio": "^0.22.0", + "classnames": "^2.2.5", "compression": "^1.6.2", "cookie-parser": "~1.4.3", "css-loader": "^0.28.7", @@ -36,6 +37,7 @@ "prop-types": "^15.6.0", "react": "^16.2.0", "react-dom": "^16.2.0", + "react-icons": "^2.2.7", "react-redux": "^5.0.6", "redux": "^3.7.2", "request": "^2.74.0", -- cgit v1.1 From 58f69c010e55ded87dd5976a61a543183e26cba9 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 13 Dec 2017 12:15:40 +0100 Subject: Add react-router to the mix --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 364cfd6..63e0def 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "react-dom": "^16.2.0", "react-icons": "^2.2.7", "react-redux": "^5.0.6", + "react-router-dom": "^4.2.2", "redux": "^3.7.2", "request": "^2.74.0", "sass-loader": "^6.0.6", -- cgit v1.1 From a77272bfbebed7239c0c49049e211f4a6e597617 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 14 Dec 2017 12:32:13 +0100 Subject: Add tests for search.js --- package.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 63e0def..f17e27e 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,11 @@ "setup": "npm install && bower install", "dev": "webpack -wd" }, + "jest": { + "transform": { + "^.+\\.jsx?$": "babel-jest" + } + }, "dependencies": { "babel-loader": "^7.1.2", "babel-preset-react": "^6.24.1", @@ -49,15 +54,19 @@ "webshot": "^0.18.0" }, "devDependencies": { + "babel-core": "^6.26.0", + "babel-jest": "^21.2.0", "babel-preset-es2015": "^6.24.1", "babelify": "^7.3.0", "bower": "^1.7.9", "browserify": "^14.0.0", + "deep-freeze": "^0.0.1", "eslint-config-airbnb": "^16.1.0", "eslint-plugin-import": "^2.8.0", "eslint-plugin-jsx-a11y": "^6.0.2", "eslint-plugin-react": "^7.5.1", "gulp": "^3.9.1", + "jest": "^21.2.1", "watchify": "^3.7.0", "webpack": "^3.5.6" }, -- cgit v1.1 From af101f2a11534ff929fdefa3e2bc3ab7ca3ee39e Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 14 Dec 2017 16:23:59 +0100 Subject: Improve package.json scripts --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f17e27e..7a48b7c 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,10 @@ "scripts": { "start": "node ./src/server/bin/www", "setup": "npm install && bower install", - "dev": "webpack -wd" + "build": "webpack -p", + "build:dev": "webpack --watch", + "test": "jest", + "test:dev": "jest --watch" }, "jest": { "transform": { -- cgit v1.1 From 43c72f445c7906ab707493b3e857acf83d5bcd1f Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 14 Dec 2017 16:36:23 +0100 Subject: Add redux-logger --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 7a48b7c..d828a9e 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "react-redux": "^5.0.6", "react-router-dom": "^4.2.2", "redux": "^3.7.2", + "redux-logger": "^3.0.6", "request": "^2.74.0", "sass-loader": "^6.0.6", "smoothscroll-polyfill": "^0.3.4", -- cgit v1.1 From 8e9d5e98793f7594a8a1a1b5956163eca6795164 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 14 Dec 2017 16:38:11 +0100 Subject: Add redux-thunk --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index d828a9e..fdc7374 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "react-router-dom": "^4.2.2", "redux": "^3.7.2", "redux-logger": "^3.0.6", + "redux-thunk": "^2.2.0", "request": "^2.74.0", "sass-loader": "^6.0.6", "smoothscroll-polyfill": "^0.3.4", -- cgit v1.1 From f0c8cf0e79f003514fd65a70def5820205955a77 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Thu, 21 Dec 2017 12:06:41 +0100 Subject: Move to typescript --- package.json | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index fdc7374..f8dd7a4 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,26 @@ }, "jest": { "transform": { - "^.+\\.jsx?$": "babel-jest" - } + "^.+\\.tsx?$": "ts-jest" + }, + "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$", + "moduleFileExtensions": [ + "ts", + "tsx", + "js", + "jsx", + "json", + "node" + ] }, "dependencies": { + "@types/classnames": "^2.2.3", + "@types/react": "^16.0.30", + "@types/react-dom": "^16.0.3", + "@types/react-icons": "^2.2.4", + "@types/react-redux": "^5.0.14", + "@types/react-router-dom": "^4.2.3", + "@types/redux-logger": "^3.0.5", "babel-loader": "^7.1.2", "babel-preset-react": "^6.24.1", "babel-preset-stage-2": "^6.24.1", @@ -59,6 +75,8 @@ "webshot": "^0.18.0" }, "devDependencies": { + "@types/jest": "^21.1.9", + "awesome-typescript-loader": "^3.4.1", "babel-core": "^6.26.0", "babel-jest": "^21.2.0", "babel-preset-es2015": "^6.24.1", @@ -72,6 +90,9 @@ "eslint-plugin-react": "^7.5.1", "gulp": "^3.9.1", "jest": "^21.2.1", + "source-map-loader": "^0.2.3", + "ts-jest": "^22.0.0", + "typescript": "^2.6.2", "watchify": "^3.7.0", "webpack": "^3.5.6" }, -- cgit v1.1 From 77dccd31b32ee0a9a53b2186bae231069c5ab152 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sat, 6 Jan 2018 12:11:19 +0100 Subject: Revert "Move to typescript" This reverts commit f0c8cf0e79f003514fd65a70def5820205955a77. --- package.json | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index f8dd7a4..fdc7374 100644 --- a/package.json +++ b/package.json @@ -13,26 +13,10 @@ }, "jest": { "transform": { - "^.+\\.tsx?$": "ts-jest" - }, - "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$", - "moduleFileExtensions": [ - "ts", - "tsx", - "js", - "jsx", - "json", - "node" - ] + "^.+\\.jsx?$": "babel-jest" + } }, "dependencies": { - "@types/classnames": "^2.2.3", - "@types/react": "^16.0.30", - "@types/react-dom": "^16.0.3", - "@types/react-icons": "^2.2.4", - "@types/react-redux": "^5.0.14", - "@types/react-router-dom": "^4.2.3", - "@types/redux-logger": "^3.0.5", "babel-loader": "^7.1.2", "babel-preset-react": "^6.24.1", "babel-preset-stage-2": "^6.24.1", @@ -75,8 +59,6 @@ "webshot": "^0.18.0" }, "devDependencies": { - "@types/jest": "^21.1.9", - "awesome-typescript-loader": "^3.4.1", "babel-core": "^6.26.0", "babel-jest": "^21.2.0", "babel-preset-es2015": "^6.24.1", @@ -90,9 +72,6 @@ "eslint-plugin-react": "^7.5.1", "gulp": "^3.9.1", "jest": "^21.2.1", - "source-map-loader": "^0.2.3", - "ts-jest": "^22.0.0", - "typescript": "^2.6.2", "watchify": "^3.7.0", "webpack": "^3.5.6" }, -- cgit v1.1 From c0aa588bc8f85b13b5a55ccd6cdf11bf99048a1c Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sat, 6 Jan 2018 15:42:04 +0100 Subject: Add user page --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fdc7374..0363675 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "debug": "^2.6.0", "diacritics": "^1.2.3", "encoding": "^0.1.12", - "eslint": "^4.13.0", + "eslint": "^4.14.0", "express": "^4.13.4", "extract-text-webpack-plugin": "^3.0.2", "flexibility": "^2.0.1", -- cgit v1.1 From 1b3f4ea79f947558573fbce5a2e2d0c2c5dd6a8d Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Wed, 17 Jan 2018 16:26:04 +0100 Subject: Add view code --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 0363675..83d624b 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "css-loader": "^0.28.7", "debug": "^2.6.0", "diacritics": "^1.2.3", + "dompurify": "^1.0.3", "encoding": "^0.1.12", "eslint": "^4.14.0", "express": "^4.13.4", -- cgit v1.1 From 19534b4770b4f4097b02f5fa021a24822b12d907 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Fri, 26 Jan 2018 20:30:34 +0100 Subject: Add week selector --- package.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 83d624b..ae4310a 100644 --- a/package.json +++ b/package.json @@ -41,12 +41,15 @@ "jade": "~1.11.0", "left-pad": "^1.1.1", "lodash": "^4.15.0", + "moment": "^2.20.1", "morgan": "~1.7.0", "node-sass": "^4.7.2", "prop-types": "^15.6.0", + "query-string": "^5.0.1", "react": "^16.2.0", "react-dom": "^16.2.0", "react-icons": "^2.2.7", + "react-moment-proptypes": "^1.5.0", "react-redux": "^5.0.6", "react-router-dom": "^4.2.2", "redux": "^3.7.2", -- cgit v1.1 From 3b98d4c4f13424c89a10580065075998d37ae857 Mon Sep 17 00:00:00 2001 From: Noah Loomans Date: Sun, 28 Jan 2018 16:06:56 +0100 Subject: Improve week logic --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ae4310a..f98c220 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "react": "^16.2.0", "react-dom": "^16.2.0", "react-icons": "^2.2.7", - "react-moment-proptypes": "^1.5.0", "react-redux": "^5.0.6", "react-router-dom": "^4.2.2", "redux": "^3.7.2", -- cgit v1.1