From 93c1ecb91972655d754196e462c5d6b6fc4fe6cf Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Mon, 26 Feb 2018 13:08:06 -0800 Subject: [PATCH] Add alias for ui and remove SASS support --- website/config/webpack.config.dev.js | 4 +- website/config/webpack.config.prod.js | 9 +- website/package-lock.json | 539 +----------------- website/package.json | 2 - website/src/App.js | 2 +- website/src/Auth/ForgotPassword.js | 2 +- website/src/Auth/Login.js | 2 +- website/src/Auth/ResetPassword.js | 2 +- website/src/Dialog/ChangeEmailDialog.js | 2 +- website/src/Dialog/ChangePasswordDialog.js | 2 +- website/src/Dialog/MessageDialog.js | 2 +- website/src/Dialog/WaitDialog.js | 2 +- website/src/Dialog/YesNoMessageDialog.js | 2 +- website/src/Profile/ProfileForm.js | 2 +- website/src/Users/UserForm.js | 2 +- website/src/Users/UserList.js | 2 +- website/src/Users/Users.js | 2 +- website/src/Users/ValidatedEmailIcon.js | 2 +- .../src/Validated/ValidatedActionsButton.js | 2 +- website/src/Validated/ValidatedButton.js | 2 +- website/src/Validated/ValidatedCheckbox.js | 2 +- website/src/Validated/ValidatedDropdown.js | 2 +- website/src/Validated/ValidatedInput.js | 2 +- website/src/ui/Modal.js | 2 +- 24 files changed, 26 insertions(+), 568 deletions(-) diff --git a/website/config/webpack.config.dev.js b/website/config/webpack.config.dev.js index 2b3cbef..17915e8 100644 --- a/website/config/webpack.config.dev.js +++ b/website/config/webpack.config.dev.js @@ -93,6 +93,7 @@ module.exports = { 'icons': path.join(srcPath, '/assets/icons/'), 'data': path.join(srcPath, '/assets/data/'), 'fonts': path.join(srcPath, '/assets/fonts/'), + 'ui': path.join(srcPath, '/ui/'), 'src': srcPath, }, plugins: [ @@ -163,7 +164,7 @@ module.exports = { // In production, we use a plugin to extract that CSS to a file, but // in development "style" loader enables hot editing of CSS. { - test: /\.(sass|scss)$/, + test: /\.css$/, use: [ require.resolve('style-loader'), { @@ -172,7 +173,6 @@ module.exports = { importLoaders: 1, }, }, - { loader: require.resolve('sass-loader'), }, { loader: require.resolve('postcss-loader'), options: { diff --git a/website/config/webpack.config.prod.js b/website/config/webpack.config.prod.js index 656f4c0..3e19adc 100644 --- a/website/config/webpack.config.prod.js +++ b/website/config/webpack.config.prod.js @@ -99,6 +99,7 @@ module.exports = { 'icons': path.join(srcPath, '/assets/icons/'), 'data': path.join(srcPath, '/assets/data/'), 'fonts': path.join(srcPath, '/assets/fonts/'), + 'ui': path.join(srcPath, '/ui/'), 'src': srcPath, }, plugins: [ @@ -172,7 +173,7 @@ module.exports = { // use the "style" loader inside the async code so CSS from them won't be // in the main CSS file. { - test: /\.(sass|scss)$/, + test: /\.css$/, loader: ExtractTextPlugin.extract( Object.assign( { @@ -191,12 +192,6 @@ module.exports = { sourceMap: shouldUseSourceMap, }, }, - { - loader: require.resolve('sass-loader'), - options: { - sourceMap: shouldUseSourceMap, - } - }, { loader: require.resolve('postcss-loader'), options: { diff --git a/website/package-lock.json b/website/package-lock.json index e4b5e2f..3a208ef 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -10,12 +10,6 @@ "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", "dev": true }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, "accepts": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz", @@ -188,22 +182,6 @@ "default-require-extensions": "1.0.0" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", - "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", - "dev": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" - } - }, "argparse": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", @@ -370,12 +348,6 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true - }, "async-limiter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", @@ -1647,15 +1619,6 @@ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=" }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", @@ -2300,29 +2263,6 @@ "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", "dev": true }, - "clone-deep": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz", - "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=", - "dev": true, - "requires": { - "for-own": "1.0.0", - "is-plain-object": "2.0.4", - "kind-of": "3.2.2", - "shallow-clone": "0.1.2" - }, - "dependencies": { - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - } - } - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -2523,12 +2463,6 @@ "date-now": "0.1.4" } }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -3088,12 +3022,6 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -5341,49 +5269,12 @@ } } }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", - "dev": true, - "requires": { - "globule": "1.2.0" - } - }, "generate-function": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", @@ -5503,17 +5394,6 @@ "pinkie-promise": "2.0.1" } }, - "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", - "dev": true, - "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "minimatch": "3.0.4" - } - }, "got": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", @@ -5701,12 +5581,6 @@ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", "dev": true }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -6138,12 +6012,6 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, - "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true - }, "indent-string": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", @@ -7362,24 +7230,12 @@ "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true - }, "lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", "dev": true }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, "lodash.cond": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz", @@ -7416,24 +7272,12 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, "lodash.startswith": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz", "integrity": "sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=", "dev": true }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, "lodash.template": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", @@ -7741,24 +7585,6 @@ } } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "0.1.8", - "is-extendable": "0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -7799,7 +7625,8 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.7", @@ -7885,35 +7712,6 @@ "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=", "dev": true }, - "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", - "dev": true, - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.4", - "request": "2.83.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" - }, - "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - } - } - }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -7963,197 +7761,12 @@ "which": "1.3.0" } }, - "node-sass": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz", - "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==", - "dev": true, - "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.8.0", - "node-gyp": "3.6.2", - "npmlog": "4.1.2", - "request": "2.79.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" - }, - "dependencies": { - "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true - }, - "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true - }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "4.1.1", - "which": "1.3.0" - } - }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.10.1" - } - }, - "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", - "dev": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" - } - }, - "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "commander": "2.11.0", - "is-my-json-valid": "2.16.1", - "pinkie-promise": "2.0.1" - } - }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" - } - }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", - "dev": true - }, - "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", - "dev": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.11.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", - "oauth-sign": "0.8.2", - "qs": "6.3.2", - "stringstream": "0.0.5", - "tough-cookie": "2.3.3", - "tunnel-agent": "0.4.3", - "uuid": "3.1.0" - } - }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true - } - } - }, "node-status-codes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=", "dev": true }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1.1.1" - } - }, "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", @@ -8193,18 +7806,6 @@ "sort-keys": "1.1.2" } }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, "nth-check": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", @@ -11175,39 +10776,6 @@ } } }, - "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, - "requires": { - "glob": "7.1.2", - "lodash": "4.17.4", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" - } - }, - "sass-loader": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz", - "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==", - "dev": true, - "requires": { - "async": "2.6.0", - "clone-deep": "0.3.0", - "loader-utils": "1.1.0", - "lodash.tail": "4.1.1", - "pify": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -11256,27 +10824,6 @@ } } }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "requires": { - "js-base64": "2.3.2", - "source-map": "0.4.4" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -11423,35 +10970,6 @@ "safe-buffer": "5.1.1" } }, - "shallow-clone": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz", - "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=", - "dev": true, - "requires": { - "is-extendable": "0.1.1", - "kind-of": "2.0.1", - "lazy-cache": "0.2.7", - "mixin-object": "2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", - "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - }, - "lazy-cache": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz", - "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=", - "dev": true - } - } - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -11963,15 +11481,6 @@ "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", "dev": true }, - "stdout-stream": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", - "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", - "dev": true, - "requires": { - "readable-stream": "2.3.3" - } - }, "stream-browserify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", @@ -12231,17 +11740,6 @@ "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", "dev": true }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, "test-exclude": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz", @@ -12474,30 +11972,6 @@ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, - "true-case-path": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", - "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", - "dev": true, - "requires": { - "glob": "6.0.4" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - } - } - }, "tryit": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", @@ -13769,15 +13243,6 @@ "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, - "wide-align": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, "widest-line": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", diff --git a/website/package.json b/website/package.json index a79f174..d64d870 100644 --- a/website/package.json +++ b/website/package.json @@ -40,14 +40,12 @@ "fs-extra": "3.0.1", "html-webpack-plugin": "2.28.0", "jest": "20.0.3", - "node-sass": "^4.7.2", "object-assign": "4.1.1", "postcss-flexbugs-fixes": "3.0.0", "postcss-loader": "2.0.5", "promise": "7.1.1", "raf": "^3.4.0", "react-dev-utils": "^5.0.0", - "sass-loader": "^6.0.6", "style-loader": "^0.17.0", "sw-precache-webpack-plugin": "0.9.1", "url-loader": "0.5.8", diff --git a/website/src/App.js b/website/src/App.js index 213e3b2..85582d0 100644 --- a/website/src/App.js +++ b/website/src/App.js @@ -3,7 +3,7 @@ import { Login, Logout, ResetPassword, ForgotPassword, ConfirmEmail, ProtectedRo import { Home } from './Home' import { Profile } from './Profile' import { Users } from './Users' -import { Column, Row, Image, Text, Icon, Box } from './ui' +import { Column, Row, Image, Text, Icon, Box } from 'ui' import { BrowserRouter as Router, Route, Switch } from 'react-router-dom' import logoImage from 'images/logo.png' import { versionInfo } from './version' diff --git a/website/src/Auth/ForgotPassword.js b/website/src/Auth/ForgotPassword.js index 58bd1f1..f6c04fa 100644 --- a/website/src/Auth/ForgotPassword.js +++ b/website/src/Auth/ForgotPassword.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import { regExpPattern } from 'regexp-pattern' -import { Text, Column } from '../ui' +import { Text, Column } from 'ui' import { MessageDialog, WaitDialog } from '../Dialog' import { Validator, ValidatedInput, ValidatedButton } from '../Validated' import { api } from '../helpers' diff --git a/website/src/Auth/Login.js b/website/src/Auth/Login.js index 5607a83..e8621ab 100644 --- a/website/src/Auth/Login.js +++ b/website/src/Auth/Login.js @@ -4,7 +4,7 @@ import { regExpPattern } from 'regexp-pattern' import { api } from '../helpers' import { Validator, ValidatedInput, ValidatedCheckbox, ValidatedButton } from '../Validated' import { WaitDialog, MessageDialog } from '../Dialog' -import { Image, Link, Text, Column } from '../ui' +import { Image, Link, Text, Column } from 'ui' import headerLogo from 'images/deighton.png' export class Login extends React.Component { diff --git a/website/src/Auth/ResetPassword.js b/website/src/Auth/ResetPassword.js index c96807a..67e2b89 100644 --- a/website/src/Auth/ResetPassword.js +++ b/website/src/Auth/ResetPassword.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Text, Column } from '../ui' +import { Text, Column } from 'ui' import { Validator, ValidatedInput, ValidatedButton } from '../Validated' import { MessageDialog, WaitDialog } from '../Dialog' import { api } from '../helpers' diff --git a/website/src/Dialog/ChangeEmailDialog.js b/website/src/Dialog/ChangeEmailDialog.js index 8d431ce..e6c13bf 100644 --- a/website/src/Dialog/ChangeEmailDialog.js +++ b/website/src/Dialog/ChangeEmailDialog.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import { autoBind } from 'auto-bind2' -import { Modal, Button, Icon, Column, Text } from '../ui' +import { Modal, Button, Icon, Column, Text } from 'ui' import { ValidatedInput, ValidatedButton, Validator } from '../Validated' import { regExpPattern } from 'regexp-pattern' diff --git a/website/src/Dialog/ChangePasswordDialog.js b/website/src/Dialog/ChangePasswordDialog.js index a6a0bc4..0aae5f9 100644 --- a/website/src/Dialog/ChangePasswordDialog.js +++ b/website/src/Dialog/ChangePasswordDialog.js @@ -1,7 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import { autoBind } from 'auto-bind2' -import { Modal, Button, Icon, Column, Row, Text } from '../ui' +import { Modal, Button, Icon, Column, Row, Text } from 'ui' import { ValidatedInput, ValidatedActionsButton, Validator } from '../Validated' export class ChangePasswordDialog extends React.Component { diff --git a/website/src/Dialog/MessageDialog.js b/website/src/Dialog/MessageDialog.js index e516f9d..d9aa17b 100644 --- a/website/src/Dialog/MessageDialog.js +++ b/website/src/Dialog/MessageDialog.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Modal, Button, Icon, Column, Text } from '../ui' +import { Modal, Button, Icon, Column, Text } from 'ui' export class MessageDialog extends React.Component { static propTypes = { diff --git a/website/src/Dialog/WaitDialog.js b/website/src/Dialog/WaitDialog.js index c26a2c8..027611e 100644 --- a/website/src/Dialog/WaitDialog.js +++ b/website/src/Dialog/WaitDialog.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Dimmer, Loader, Text } from '../ui' +import { Dimmer, Loader, Text } from 'ui' export class WaitDialog extends React.Component { static propTypes = { diff --git a/website/src/Dialog/YesNoMessageDialog.js b/website/src/Dialog/YesNoMessageDialog.js index 8c35234..e1cf7ad 100644 --- a/website/src/Dialog/YesNoMessageDialog.js +++ b/website/src/Dialog/YesNoMessageDialog.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Modal, Button, Column, Text, Icon } from '../ui' +import { Modal, Button, Column, Text, Icon } from 'ui' export class YesNoMessageDialog extends React.Component { static propTypes = { diff --git a/website/src/Profile/ProfileForm.js b/website/src/Profile/ProfileForm.js index eb4d582..4488a83 100644 --- a/website/src/Profile/ProfileForm.js +++ b/website/src/Profile/ProfileForm.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Column, Button } from '../ui' +import { Column, Button } from 'ui' import { regExpPattern } from 'regexp-pattern' import { Validator, ValidatedInput, ValidatedButton } from '../Validated' diff --git a/website/src/Users/UserForm.js b/website/src/Users/UserForm.js index a61a6c9..7cefaf7 100644 --- a/website/src/Users/UserForm.js +++ b/website/src/Users/UserForm.js @@ -5,7 +5,7 @@ import { regExpPattern } from 'regexp-pattern' import { ValidatedEmailIcon } from './ValidatedEmailIcon' import { Constants, api } from '../helpers' import { Validator, ValidatedInput, ValidatedButton, ValidatedCheckbox } from '../Validated' -import { Column } from '../ui' +import { Column } from 'ui' export class UserForm extends React.Component { static propTypes = { diff --git a/website/src/Users/UserList.js b/website/src/Users/UserList.js index a53c7fd..78d9e74 100644 --- a/website/src/Users/UserList.js +++ b/website/src/Users/UserList.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Dropdown, List, Icon, Button, Image } from '../ui' +import { Dropdown, List, Icon, Button, Image } from 'ui' import { Constants, api } from '../helpers' import './UserList.scss' diff --git a/website/src/Users/Users.js b/website/src/Users/Users.js index 2c67d3c..fe28110 100644 --- a/website/src/Users/Users.js +++ b/website/src/Users/Users.js @@ -4,7 +4,7 @@ import { UserList } from './UserList' import { UserForm } from './UserForm' import { UserFormPlaceholder } from './UserFormPlaceholder' import { api } from '../helpers' -import { Row } from '../ui' +import { Row } from 'ui' import { YesNoMessageDialog, MessageDialog, ChangeEmailDialog, WaitDialog } from '../Dialog' export class Users extends React.Component { diff --git a/website/src/Users/ValidatedEmailIcon.js b/website/src/Users/ValidatedEmailIcon.js index 8ad8be6..8dbd629 100644 --- a/website/src/Users/ValidatedEmailIcon.js +++ b/website/src/Users/ValidatedEmailIcon.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Label, Button, Icon } from '../ui' +import { Label, Button, Icon } from 'ui' import './ValidatedEmailIcon.scss' // This is a validated component with a value that cannot change itself and is specialized diff --git a/website/src/Validated/ValidatedActionsButton.js b/website/src/Validated/ValidatedActionsButton.js index b7803c5..5918108 100644 --- a/website/src/Validated/ValidatedActionsButton.js +++ b/website/src/Validated/ValidatedActionsButton.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Button } from '../ui' +import { Button } from 'ui' export class ValidatedActionsButton extends React.Component { static propTypes = { diff --git a/website/src/Validated/ValidatedButton.js b/website/src/Validated/ValidatedButton.js index 7ac147f..40279ce 100644 --- a/website/src/Validated/ValidatedButton.js +++ b/website/src/Validated/ValidatedButton.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Button } from '../ui' +import { Button } from 'ui' export class ValidatedButton extends React.Component { static propTypes = { diff --git a/website/src/Validated/ValidatedCheckbox.js b/website/src/Validated/ValidatedCheckbox.js index 6a2149f..b7ba707 100644 --- a/website/src/Validated/ValidatedCheckbox.js +++ b/website/src/Validated/ValidatedCheckbox.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Checkbox, Label } from '../ui' +import { Checkbox, Label } from 'ui' // This is an example of a validated component with a value that can change itself, that cannot ever be invalid. diff --git a/website/src/Validated/ValidatedDropdown.js b/website/src/Validated/ValidatedDropdown.js index a812ad9..5968daf 100644 --- a/website/src/Validated/ValidatedDropdown.js +++ b/website/src/Validated/ValidatedDropdown.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Dropdown, Text } from '../ui' +import { Dropdown, Text } from 'ui' export class ValidatedDropdown extends React.Component { static propTypes = { diff --git a/website/src/Validated/ValidatedInput.js b/website/src/Validated/ValidatedInput.js index 9a8b8b7..0e5895e 100644 --- a/website/src/Validated/ValidatedInput.js +++ b/website/src/Validated/ValidatedInput.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { Input, Label, Text } from '../ui' +import { Input, Label, Text } from 'ui' // This is an example of a validated component with a value that changes itself diff --git a/website/src/ui/Modal.js b/website/src/ui/Modal.js index e28ceba..edfef94 100644 --- a/website/src/ui/Modal.js +++ b/website/src/ui/Modal.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import style from './Modal.style' import Radium from 'radium' -import { Dimmer } from '../ui' +import { Dimmer } from 'ui' class Modal extends Component { static propTypes = {