From a00bf323da54eee0a54b05e37e4a5815162ee399 Mon Sep 17 00:00:00 2001 From: flifloo Date: Sat, 21 Nov 2020 10:56:44 +0100 Subject: [PATCH] Update Sass --- .gitignore | 3 + app.js | 7 - bin/www | 15 + package-lock.json | 606 +++++++------------------------ package.json | 4 +- public/stylesheets/style.css | 370 ------------------- public/stylesheets/style.css.map | 9 - public/stylesheets/style.sass | 390 -------------------- sass/style.sass | 390 ++++++++++++++++++++ 9 files changed, 540 insertions(+), 1254 deletions(-) delete mode 100644 public/stylesheets/style.css delete mode 100644 public/stylesheets/style.css.map delete mode 100644 public/stylesheets/style.sass create mode 100644 sass/style.sass diff --git a/.gitignore b/.gitignore index 488747a..e073a39 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,6 @@ config/config.json # JetBrains .idea + +# Sass output +public/stylesheets diff --git a/app.js b/app.js index 2e4ea7f..43aee02 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,6 @@ let express = require("express"); let path = require("path"); let cookieParser = require("cookie-parser"); let logger = require("morgan"); -let sassMiddleware = require("node-sass-middleware"); const session = require("express-session"); const error = require("./routes/utils/error"); let config = process.env.NODE_ENV === "test" ? {} : require("./config/config.json"); @@ -29,12 +28,6 @@ app.use(logger("dev")); app.use(express.json()); app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); -app.use(sassMiddleware({ - src: path.join(__dirname, "public"), - dest: path.join(__dirname, "public"), - indentedSyntax: true, // true = .sass and false = .scss - sourceMap: true -})); app.use(express.static(path.join(__dirname, "public"))); app.use(sessionMiddleware); app.use((req, res, next) => { diff --git a/bin/www b/bin/www index 1832864..e8cd115 100755 --- a/bin/www +++ b/bin/www @@ -7,10 +7,25 @@ const app = require("../app"); const debug = require("debug")("letu:server"); const http = require("http"); +const fs = require("fs"); +const sass = require("sass"); const models = require("../models"); const { SMTPClient } = require("emailjs"); const mailClient = new SMTPClient(process.env.NODE_ENV === "test" ? {} : require("../config/config.json").email.server); + +/** + * Render all Sass to css + */ +css = sass.renderSync({ + file: "sass/style.sass", + includePaths: ["sass/"], + outputStyle: "compressed" +}); +if (!fs.existsSync("public/stylesheets")) + fs.mkdirSync("public/stylesheets"); +fs.writeFileSync("public/stylesheets/style.css", css.css); + /** * Get port from environment and store in Express. */ diff --git a/package-lock.json b/package-lock.json index 66351aa..df99e36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,6 +65,7 @@ "version": "6.12.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -98,11 +99,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -112,7 +108,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -121,12 +116,14 @@ "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -141,11 +138,6 @@ "sprintf-js": "~1.0.2" } }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" - }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -165,6 +157,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dev": true, "requires": { "safer-buffer": "~2.1.0" } @@ -172,7 +165,8 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true }, "assertion-error": { "version": "1.1.0", @@ -180,11 +174,6 @@ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" - }, "async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", @@ -193,17 +182,20 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true }, "aws4": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", - "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==" + "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", + "dev": true }, "babel-runtime": { "version": "6.26.0", @@ -262,6 +254,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dev": true, "requires": { "tweetnacl": "^0.14.3" } @@ -277,8 +270,7 @@ "binary-extensions": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" }, "blob": { "version": "0.0.5", @@ -289,6 +281,8 @@ "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, + "optional": true, "requires": { "inherits": "~2.0.0" } @@ -328,7 +322,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -354,24 +347,11 @@ "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" }, - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - } - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true }, "center-align": { "version": "0.1.3", @@ -396,18 +376,6 @@ "type-detect": "^4.0.5" } }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, "character-parser": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz", @@ -426,7 +394,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", - "dev": true, "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -518,7 +485,8 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true }, "color-convert": { "version": "1.9.3", @@ -537,6 +505,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -581,7 +550,8 @@ "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=" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true }, "constantinople": { "version": "3.1.2", @@ -637,24 +607,8 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "requires": { - "array-find-index": "^1.0.1" - } + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true }, "d": { "version": "1.0.1", @@ -669,6 +623,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -713,12 +668,14 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "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=" + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true }, "depd": { "version": "1.1.2", @@ -756,6 +713,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -890,14 +848,6 @@ "has-binary2": "~1.0.2" } }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, "es-abstract": { "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", @@ -976,7 +926,8 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "esprima": { "version": "4.0.1", @@ -1092,22 +1043,26 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fast-safe-stringify": { "version": "2.0.7", @@ -1119,7 +1074,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -1138,15 +1092,6 @@ "unpipe": "~1.0.0" } }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, "flat": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", @@ -1167,12 +1112,14 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -1223,13 +1170,14 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, "optional": true }, "fstream": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -1247,6 +1195,7 @@ "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.0.3", "console-control-strings": "^1.0.0", @@ -1258,14 +1207,6 @@ "wide-align": "^1.1.0" } }, - "gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "requires": { - "globule": "^1.0.0" - } - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -1277,15 +1218,11 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" - }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -1307,21 +1244,10 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "dev": true, "requires": { "is-glob": "^4.0.1" } }, - "globule": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", - "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", - "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.12", - "minimatch": "~3.0.2" - } - }, "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", @@ -1341,12 +1267,14 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true }, "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "dev": true, "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" @@ -1361,14 +1289,6 @@ "function-bind": "^1.1.1" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, "has-binary2": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", @@ -1403,7 +1323,8 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true }, "he": { "version": "1.2.0", @@ -1411,11 +1332,6 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, - "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" - }, "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -1431,6 +1347,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -1454,19 +1371,6 @@ "minimatch": "^3.0.4" } }, - "in-publish": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", - "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==" - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "requires": { - "repeating": "^2.0.0" - } - }, "indexof": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", @@ -1501,16 +1405,10 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -1556,18 +1454,13 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1576,7 +1469,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -1584,8 +1476,7 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, "is-promise": { "version": "2.2.2", @@ -1612,32 +1503,26 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" - }, - "js-base64": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", - "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==" + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true }, "js-beautify": { "version": "1.11.0", @@ -1685,22 +1570,26 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true }, "jsonfile": { "version": "4.0.0", @@ -1714,6 +1603,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -1743,18 +1633,6 @@ "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -1821,15 +1699,6 @@ "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -1847,11 +1716,6 @@ "es5-ext": "~0.10.2" } }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" - }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -1872,23 +1736,6 @@ "timers-ext": "^0.1.5" } }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - } - }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -1928,7 +1775,8 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true }, "minipass": { "version": "2.9.0", @@ -1961,6 +1809,7 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, "requires": { "minimist": "^1.2.5" } @@ -2076,11 +1925,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, - "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==" - }, "needle": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", @@ -2139,6 +1983,8 @@ "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dev": true, + "optional": true, "requires": { "fstream": "^1.0.0", "glob": "^7.0.3", @@ -2157,7 +2003,9 @@ "semver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true, + "optional": true } } }, @@ -2212,63 +2060,20 @@ } } }, - "node-sass": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", - "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", - "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.15", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "2.2.5", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" - } - }, - "node-sass-middleware": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/node-sass-middleware/-/node-sass-middleware-0.11.0.tgz", - "integrity": "sha1-KrVhJDYpQRAuLNVNihwc70Ra+xU=", - "requires": { - "mkdirp": "^0.5.1", - "node-sass": "^4.3.0" - } - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "optional": true, "requires": { "abbrev": "1" } }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "npm-bundled": { "version": "1.1.1", @@ -2300,6 +2105,7 @@ "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.2", "console-control-strings": "~1.1.0", @@ -2310,12 +2116,14 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2427,14 +2235,6 @@ "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz", "integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==" }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "requires": { - "error-ex": "^1.2.0" - } - }, "parseqs": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", @@ -2456,14 +2256,6 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "requires": { - "pinkie-promise": "^2.0.0" - } - }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -2479,16 +2271,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, "pathval": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", @@ -2498,18 +2280,19 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true }, "pg": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.4.2.tgz", - "integrity": "sha512-E9FlUrrc7w3+sbRmL1CSw99vifACzB2TjhMM9J5w9D1LIg+6un0jKkpHS1EQf2CWhKhec2bhrBLVMmUBDbjPRQ==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz", + "integrity": "sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw==", "requires": { "buffer-writer": "2.0.0", "packet-reader": "1.0.0", "pg-connection-string": "^2.4.0", "pg-pool": "^3.2.2", - "pg-protocol": "^1.3.0", + "pg-protocol": "^1.4.0", "pg-types": "^2.1.0", "pgpass": "1.x" } @@ -2530,9 +2313,9 @@ "integrity": "sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA==" }, "pg-protocol": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.3.0.tgz", - "integrity": "sha512-64/bYByMrhWULUaCd+6/72c9PMWhiVFs3EVxl9Ct6a3v/U8+rKgqP2w+kKg/BIGgMJyB+Bk/eNivT32Al+Jghw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz", + "integrity": "sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA==" }, "pg-types": { "version": "2.2.0", @@ -2557,26 +2340,7 @@ "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "requires": { - "pinkie": "^2.0.0" - } + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" }, "postgres-array": { "version": "2.0.0", @@ -2604,7 +2368,8 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true }, "promise": { "version": "7.3.1", @@ -2636,7 +2401,8 @@ "psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==" + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", + "dev": true }, "pug": { "version": "2.0.0-beta11", @@ -2755,7 +2521,8 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true }, "qs": { "version": "6.5.2", @@ -2795,29 +2562,11 @@ "strip-json-comments": "~2.0.1" } }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -2832,20 +2581,10 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", - "dev": true, "requires": { "picomatch": "^2.0.4" } }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", @@ -2856,18 +2595,11 @@ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "requires": { - "is-finite": "^1.0.0" - } - }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "dev": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2929,6 +2661,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, "requires": { "glob": "^7.1.3" } @@ -2943,15 +2676,12 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "sass-graph": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", - "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "sass": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz", + "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==", "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^13.3.2" + "chokidar": ">=2.0.0 <4.0.0" } }, "sax": { @@ -2960,15 +2690,6 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" - } - }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -3090,7 +2811,8 @@ "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "dev": true }, "socket.io": { "version": "2.3.0", @@ -3229,34 +2951,6 @@ "amdefine": ">=0.0.4" } }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" - }, "split2": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", @@ -3298,6 +2992,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "dev": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -3315,18 +3010,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" }, - "stdout-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "requires": { - "readable-stream": "^2.0.1" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3387,26 +3075,11 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, "requires": { "ansi-regex": "^2.0.0" } }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "requires": { - "get-stdin": "^4.0.1" - } - }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -3505,15 +3178,12 @@ "superagent": "6.1.0" } }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, "tar": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, + "optional": true, "requires": { "block-stream": "*", "fstream": "^1.0.12", @@ -3543,7 +3213,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "requires": { "is-number": "^7.0.0" } @@ -3562,28 +3231,17 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" } }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" - }, - "true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "requires": { - "glob": "^7.1.2" - } - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -3591,7 +3249,8 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true }, "type": { "version": "1.2.0", @@ -3692,6 +3351,7 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -3711,15 +3371,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, "validator": { "version": "10.11.0", "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", @@ -3734,6 +3385,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -3749,6 +3401,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, "requires": { "isexe": "^2.0.0" } @@ -3762,6 +3415,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, "requires": { "string-width": "^1.0.2 || 2" } diff --git a/package.json b/package.json index f44bd1c..edc2ac4 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "express-session": "^1.17.1", "http-errors": "~1.6.3", "morgan": "~1.9.1", - "node-sass-middleware": "0.11.0", - "pg": "^8.4.2", + "pg": "^8.5.1", "pug": "2.0.0-beta11", + "sass": "^1.29.0", "sequelize": "^5.22.3", "sequelize-cli": "^5.5.1", "socket.io": "^2.3.0" diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css deleted file mode 100644 index 3f4e70e..0000000 --- a/public/stylesheets/style.css +++ /dev/null @@ -1,370 +0,0 @@ -body { - padding: 50px; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; - color: white; - background-color: #101010; - margin: 0; - padding: 0; } - -h1 { - text-align: center; } - -h2 { - color: #e0e0e0; - margin-top: 0; - text-align: center; } - -#signin, #signup, #forgotPsw { - padding: 4vw; } - -.notregister, .alreadyregister { - border: none; - color: #0099ff; - background-color: transparent; - font-size: 15px; - display: block; - margin-left: auto; - margin-right: auto; - margin-top: 15px; - cursor: pointer; } - -.invisible { - display: none; } - -.signinup { - margin-top: 15vh; - background-color: #2a2a2a; - border-radius: 2vw; } - .signinup form input { - color: #e0e0e0; - margin-bottom: 4vh; - font-size: 18px; } - .signinup form input[type="submit"] { - padding: 1vw; - border-radius: 2vw; - background-color: #0099ff; - color: white; - border: none; - width: 40%; - display: block; - margin: auto; - font-size: 18px; - border: 2px solid #2C3531; - cursor: pointer; - transition-duration: 0.3s; } - .signinup form input[type="submit"]:hover { - color: #0099ff; - background-color: #101010; - border: 2px solid #0099ff; } - -i { - color: #00c0ff; } - -#panel { - background-color: #2a2a2a; - height: 100vh; - border-right: 2px solid #a1a1a1; - padding: 0; - position: fixed; } - -#main { - background-color: #101010; - margin-left: 16vw; } - -#navtop { - font-size: 22px; } - #navtop .maintitle { - font-size: 50px; - text-align: center; - margin: 0; - margin-top: 2vh; } - #navtop ul { - margin: 0; - text-align: right; } - #navtop ul li.active { - background: #00c0ff; } - #navtop ul li.active a { - color: black; } - #navtop ul li { - border-top: 1px solid #101010; - background: linear-gradient(to right, #2a2a2a 50%, #00c0ff 50%) left; - background-size: 200%; - transition: .3s ease-out; } - #navtop ul li a { - padding: 1.3vw; - color: #C5C6C7; - display: block; - width: 100%; - transition-duration: 0.3s; } - #navtop ul li:hover { - background-position: right; - cursor: pointer; } - #navtop ul li:hover a { - color: black; } - -#navprofile { - font-size: 18px; - padding-top: 1vh; - padding-bottom: 1vh; - margin: 0; - text-align: center; } - #navprofile p { - margin-top: 1vh; - margin-bottom: 0; } - #navprofile a { - cursor: pointer; } - -.student { - background: radial-gradient(circle, #014f74 20%, #0f0f63 100%); } - -.teacher { - background: radial-gradient(circle, #057401 20%, #0b440a 100%); } - -.admin { - background: radial-gradient(circle, #744a01 20%, #632a0f 100%); } - -#page { - margin: 0; } - -#edtjour .edtflex { - display: flex; - flex-direction: column; } - #edtjour .edtflex div:first-child p { - margin: 22px; } - #edtjour .edtflex div:last-child { - border: none; } - #edtjour .edtflex div { - text-align: center; - font-size: 15px; - background-color: #2a2a2a; - padding: 0 10px; - border-bottom: 2px solid #a1a1a1; } - #edtjour .edtflex div p { - margin: 10px; } - #edtjour .edtflex .edthead { - border: none; - font-size: 22px; - background-color: #0099ff; } - #edtjour .edtflex .edtmidi { - height: 10vh; - background-color: #1f1f1f; } - -#filactu .actuflex { - background-color: #1f1f1f; - padding: 0; - height: 70vh; - display: flex; - flex-direction: column; } - #filactu .actuflex div:last-child { - border: none; } - #filactu .actuflex .actucontent { - overflow-y: scroll; - padding: 0; - height: 70vh; - cursor: auto; } - #filactu .actuflex .actucontent div:hover { - background-color: #686868; } - #filactu .actuflex div { - text-align: left; - cursor: pointer; - font-size: 15px; - background-color: #2a2a2a; - padding: 0 10px; - border-bottom: 2px solid #a1a1a1; } - #filactu .actuflex p { - margin: 0; - padding: 10px; } - #filactu .actuflex .actuhead { - border: none; - cursor: auto; - font-size: 22px; - background-color: #0099ff; - text-align: center; } - #filactu .actuflex .actuhead p { - padding: 22px; } - #filactu .actuflex .actuhead:hover { - background-color: #0099ff; } - -#welcome { - padding-bottom: 25px; - font-size: 35px; } - -h3 { - font-size: 22px; - text-align: center; } - -#edttable { - margin-top: 5vh; - border-collapse: collapse; - border: 1px solid white; - width: 90%; - margin-left: auto; - margin-right: auto; } - #edttable .midi td { - height: 10vh; } - #edttable th { - background-color: #0099ff; - text-align: center; - border-radius: 0; - border: 1px solid white; - font-size: 18px; } - #edttable tr td:first-child { - border-left: 1px solid white; } - #edttable tr td:last-child { - border-right: 1px solid white; } - #edttable tr:last-child td { - border-bottom: 1px solid white; } - #edttable td { - text-align: center; - font-size: 15px; - background-color: #686868; - padding: 0; - border-radius: 0; - border: 1px solid black; } - #edttable td p { - margin: 10px; } - #edttable td:nth-child(even) { - background-color: #2a2a2a; } - -#edtweek i { - cursor: pointer; } - -#edtweek div:nth-child(1) { - text-align: right; } - -#edtweek div:nth-child(3) { - text-align: left; } - -#marks table { - border: 1px solid white; - margin-top: 80px; - width: 80%; - margin-left: auto; - margin-right: auto; - table-layout: fixed; - border-collapse: collapse; } - #marks table tbody { - display: block; - height: 194px; - overflow: auto; } - #marks table thead, #marks table tbody tr { - display: table; - width: 100%; - table-layout: fixed; } - #marks table th { - border: 1px solid white; - background-color: #0099ff; - text-align: center; - font-size: 22px; } - #marks table td { - font-size: 18px; - cursor: pointer; - padding: 0; - text-align: center; - background-color: #2a2a2a; - border-radius: 0; - border: 1px solid #686868; } - -.marksdetails { - display: none; - z-index: 1; - position: fixed; - left: 40%; - top: 20%; - width: 30%; } - .marksdetails table { - border-collapse: collapse; - border: 1px solid white; } - .marksdetails th { - text-align: center; - font-size: 18px; - border: 1px solid white; - background-color: #0099ff; } - .marksdetails td { - text-align: center; - background-color: #2a2a2a; - border: none; - font-size: 18px; } - .marksdetails tr:last-child td { - border-bottom: 1px solid white; } - -div#visible { - display: block; } - -div#visible + div { - filter: blur(4px) grayscale(80%); } - -.marksgroup { - margin-top: 300px; } - .marksgroup h3 { - background-color: #0099ff; - margin: 0; - padding: 15px; - font-size: 22px; } - -#flexgroup { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-around; - background: #2a2a2a; } - #flexgroup p { - background-color: #686868; - cursor: pointer; - padding: 15px; - font-size: 18px; } - -#markstable { - width: 95%; - table-layout: fixed; - margin: auto; } - #markstable tbody { - display: block; - height: 70vh; - overflow: auto; } - #markstable thead, #markstable tbody tr { - display: table; - width: 100%; - table-layout: fixed; } - #markstable ::placeholder { - color: #000; - opacity: 1; } - #markstable th { - background-color: #0099ff; - border: 2px solid white; - text-align: center; - font-size: 22px; } - #markstable th input { - font-size: 22px; - border: none; - color: white; - text-align: center; } - #markstable tr td { - background-color: #686868; } - #markstable tr:nth-child(even) td { - background-color: #2a2a2a; } - #markstable td { - text-align: center; - font-size: 18px; - border: 1px solid #e0e0e0; } - #markstable td input { - font-size: 18px; - border: none; - color: white; - text-align: center; } - -#marksubmit { - display: block; - width: 30%; - background-color: #0099ff; - margin-top: 50px; - color: white; - border: none; - margin-left: auto; - margin-right: auto; - font-size: 22px; - padding: 15px; - cursor: pointer; - margin-bottom: 50px; } - -/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/public/stylesheets/style.css.map b/public/stylesheets/style.css.map deleted file mode 100644 index 35ea330..0000000 --- a/public/stylesheets/style.css.map +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 3, - "file": "style.css", - "sources": [ - "style.sass" - ], - "names": [], - "mappings": "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" -} \ No newline at end of file diff --git a/public/stylesheets/style.sass b/public/stylesheets/style.sass deleted file mode 100644 index 82c1477..0000000 --- a/public/stylesheets/style.sass +++ /dev/null @@ -1,390 +0,0 @@ -$primary: #00c0ff; -$secondary: #0099ff; -$dark1: #101010; -$dark2: #2a2a2a; -$dark3: #1f1f1f; -$medium: #686868; -$light: #e0e0e0; -$light2: #C5C6C7; -$light3: #a1a1a1; - -body - padding: 50px - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif - color: white; - background-color: $dark1; - margin: 0; - padding: 0; - -h1 - text-align: center; - -h2 - color: $light; - margin-top: 0; - text-align: center; - -#signin, #signup, #forgotPsw - padding: 4vw; - -.notregister, .alreadyregister - border: none; - color: $secondary; - background-color: transparent; - font-size: 15px; - display: block; - margin-left: auto; - margin-right: auto; - margin-top: 15px; - cursor: pointer; - -.invisible - display: none; - -.signinup - margin-top: 15vh; - background-color: $dark2; - border-radius: 2vw; - form - input - color: $light; - margin-bottom: 4vh; - font-size: 18px; - input[type="submit"] - padding: 1vw; - border-radius: 2vw; - background-color: $secondary; - color: white; - border: none; - width: 40%; - display: block; - margin: auto; - font-size: 18px; - border: 2px solid #2C3531; - cursor: pointer; - transition-duration: 0.3s - input[type="submit"]:hover - color: $secondary; - background-color: $dark1; - border: 2px solid $secondary; - -i - color: $primary; - -#panel - background-color: $dark2; - height: 100vh; - border-right: 2px solid $light3; - padding: 0; - position: fixed; - -#main - background-color: $dark1; - margin-left: 16vw; - -#navtop - font-size: 22px; - .maintitle - font-size: 50px; - text-align: center; - margin: 0; - margin-top: 2vh; - ul - margin: 0; - text-align: right; - li.active - background: $primary; - a - color: black; - li - border-top: 1px solid $dark1; - background: linear-gradient(to right, $dark2 50%, $primary 50%) left; - background-size: 200%; - transition: .3s ease-out; - - a - padding: 1.3vw; - color: $light2; - display: block; - width: 100%; - transition-duration: 0.3s; - li:hover - background-position: right; - cursor: pointer; - a - color: black; - -#navprofile - font-size: 18px; - padding-top: 1vh; - padding-bottom: 1vh; - margin: 0; - text-align: center; - - p - margin-top: 1vh; - margin-bottom: 0; - - a - cursor: pointer; - -.student - background: radial-gradient(circle, rgb(1, 79, 116) 20%, rgb(15, 15, 99) 100%); -.teacher - background: radial-gradient(circle, rgb(5, 116, 1) 20%, rgb(11, 68, 10) 100%); -.admin - background: radial-gradient(circle, rgb(116, 74, 1) 20%, rgb(99, 42, 15) 100%); - -#page - margin: 0; - -#edtjour - .edtflex - display: flex; - flex-direction: column; - div:first-child - p - margin: 22px; - div:last-child - border: none; - div - text-align: center; - font-size: 15px; - background-color: $dark2; - padding: 0 10px; - border-bottom: 2px solid $light3; - p - margin: 10px; - .edthead - border: none; - font-size: 22px; - background-color: $secondary; - .edtmidi - height: 10vh; - background-color: $dark3; - -#filactu - .actuflex - background-color: $dark3; - padding: 0; - height: 70vh; - display: flex; - flex-direction: column; - div:last-child - border: none; - .actucontent - overflow-y: scroll; - padding: 0; - height: 70vh; - cursor: auto; - div:hover - background-color: $medium; - div - text-align: left; - cursor: pointer; - font-size: 15px; - background-color: $dark2; - padding: 0 10px; - border-bottom: 2px solid $light3; - p - margin: 0; - padding: 10px; - .actuhead - border: none; - cursor: auto; - font-size: 22px; - background-color: $secondary; - text-align: center; - p - padding: 22px; - .actuhead:hover - background-color: $secondary; - -#welcome - padding-bottom: 25px; - font-size: 35px; - -h3 - font-size: 22px; - text-align: center; - -#edttable - margin-top: 5vh; - border-collapse: collapse; - border: 1px solid white; - width: 90%; - margin-left: auto; - margin-right: auto; - .midi - td - height: 10vh; - th - background-color: $secondary; - text-align: center; - border-radius: 0; - border: 1px solid white; - font-size: 18px; - tr - td:first-child - border-left: 1px solid white; - td:last-child - border-right: 1px solid white; - tr:last-child - td - border-bottom: 1px solid white; - td - text-align: center; - font-size: 15px; - background-color: $medium; - padding: 0; - border-radius: 0; - border: 1px solid black; - p - margin: 10px; - td:nth-child(even) - background-color: $dark2; - -#edtweek - i - cursor: pointer; - div:nth-child(1) - text-align: right; - div:nth-child(3) - text-align: left; - - -#marks - table - border: 1px solid white; - margin-top: 80px; - width: 80%; - margin-left: auto; - margin-right: auto; - table-layout: fixed; - border-collapse: collapse; - tbody - display: block; - height: 194px; - overflow: auto; - thead, tbody tr - display: table; - width: 100%; - table-layout: fixed; - th - border: 1px solid white; - background-color: $secondary; - text-align: center; - font-size: 22px; - td - font-size: 18px; - cursor: pointer; - padding: 0; - text-align: center; - background-color: $dark2; - border-radius: 0; - border: 1px solid $medium; - -.marksdetails - display: none; - z-index: 1; - position: fixed; - left: 40% - top: 20%; - width: 30%; - table - border-collapse: collapse; - border: 1px solid white; - th - text-align: center; - font-size: 18px; - border: 1px solid white; - background-color: $secondary; - td - text-align: center; - background-color: $dark2; - border: none; - font-size: 18px; - tr:last-child - td - border-bottom: 1px solid white; - -div#visible - display: block; - -div#visible + div - filter: blur(4px) grayscale(80%); - -.marksgroup - margin-top: 300px; - h3 - background-color: $secondary; - margin: 0; - padding: 15px; - font-size: 22px; - -#flexgroup - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-around; - background: $dark2; - p - background-color: $medium; - cursor: pointer; - padding: 15px; - font-size: 18px; - -#markstable - width: 95%; - table-layout: fixed; - margin: auto; - tbody - display: block; - height: 70vh; - overflow: auto; - thead, tbody tr - display: table; - width: 100%; - table-layout: fixed; - ::placeholder - color: #000; - opacity: 1; - th - background-color: $secondary; - border: 2px solid white; - text-align: center; - font-size: 22px; - input - font-size: 22px; - border: none; - color: white; - text-align: center; - tr - td - background-color: $medium; - tr:nth-child(even) - td - background-color: $dark2; - td - text-align: center; - font-size: 18px; - border: 1px solid $light; - input - font-size: 18px; - border: none; - color: white; - text-align: center; - -#marksubmit - display: block; - width: 30%; - background-color: $secondary; - margin-top: 50px; - color: white; - border: none; - margin-left: auto; - margin-right: auto; - font-size: 22px; - padding: 15px; - cursor: pointer; - margin-bottom: 50px; \ No newline at end of file diff --git a/sass/style.sass b/sass/style.sass new file mode 100644 index 0000000..4ff8617 --- /dev/null +++ b/sass/style.sass @@ -0,0 +1,390 @@ +$primary: #00c0ff +$secondary: #0099ff +$dark1: #101010 +$dark2: #2a2a2a +$dark3: #1f1f1f +$medium: #686868 +$light: #e0e0e0 +$light2: #C5C6C7 +$light3: #a1a1a1 + +body + padding: 50px + font: 14px "Lucida Grande", Helvetica, Arial, sans-serif + color: white + background-color: $dark1 + margin: 0 + padding: 0 + +h1 + text-align: center + +h2 + color: $light + margin-top: 0 + text-align: center + +#signin, #signup, #forgotPsw + padding: 4vw + +.notregister, .alreadyregister + border: none + color: $secondary + background-color: transparent + font-size: 15px + display: block + margin-left: auto + margin-right: auto + margin-top: 15px + cursor: pointer + +.invisible + display: none + +.signinup + margin-top: 15vh + background-color: $dark2 + border-radius: 2vw + form + input + color: $light + margin-bottom: 4vh + font-size: 18px + input[type="submit"] + padding: 1vw + border-radius: 2vw + background-color: $secondary + color: white + border: none + width: 40% + display: block + margin: auto + font-size: 18px + border: 2px solid #2C3531 + cursor: pointer + transition-duration: 0.3s + input[type="submit"]:hover + color: $secondary + background-color: $dark1 + border: 2px solid $secondary + +i + color: $primary + +#panel + background-color: $dark2 + height: 100vh + border-right: 2px solid $light3 + padding: 0 + position: fixed + +#main + background-color: $dark1 + margin-left: 16vw + +#navtop + font-size: 22px + .maintitle + font-size: 50px + text-align: center + margin: 0 + margin-top: 2vh + ul + margin: 0 + text-align: right + li.active + background: $primary + a + color: black + li + border-top: 1px solid $dark1 + background: linear-gradient(to right, $dark2 50%, $primary 50%) left + background-size: 200% + transition: .3s ease-out + + a + padding: 1.3vw + color: $light2 + display: block + width: 100% + transition-duration: 0.3s + li:hover + background-position: right + cursor: pointer + a + color: black + +#navprofile + font-size: 18px + padding-top: 1vh + padding-bottom: 1vh + margin: 0 + text-align: center + + p + margin-top: 1vh + margin-bottom: 0 + + a + cursor: pointer + +.student + background: radial-gradient(circle, rgb(1, 79, 116) 20%, rgb(15, 15, 99) 100%) +.teacher + background: radial-gradient(circle, rgb(5, 116, 1) 20%, rgb(11, 68, 10) 100%) +.admin + background: radial-gradient(circle, rgb(116, 74, 1) 20%, rgb(99, 42, 15) 100%) + +#page + margin: 0 + +#edtjour + .edtflex + display: flex + flex-direction: column + div:first-child + p + margin: 22px + div:last-child + border: none + div + text-align: center + font-size: 15px + background-color: $dark2 + padding: 0 10px + border-bottom: 2px solid $light3 + p + margin: 10px + .edthead + border: none + font-size: 22px + background-color: $secondary + .edtmidi + height: 10vh + background-color: $dark3 + +#filactu + .actuflex + background-color: $dark3 + padding: 0 + height: 70vh + display: flex + flex-direction: column + div:last-child + border: none + .actucontent + overflow-y: scroll + padding: 0 + height: 70vh + cursor: auto + div:hover + background-color: $medium + div + text-align: left + cursor: pointer + font-size: 15px + background-color: $dark2 + padding: 0 10px + border-bottom: 2px solid $light3 + p + margin: 0 + padding: 10px + .actuhead + border: none + cursor: auto + font-size: 22px + background-color: $secondary + text-align: center + p + padding: 22px + .actuhead:hover + background-color: $secondary + +#welcome + padding-bottom: 25px + font-size: 35px + +h3 + font-size: 22px + text-align: center + +#edttable + margin-top: 5vh + border-collapse: collapse + border: 1px solid white + width: 90% + margin-left: auto + margin-right: auto + .midi + td + height: 10vh + th + background-color: $secondary + text-align: center + border-radius: 0 + border: 1px solid white + font-size: 18px + tr + td:first-child + border-left: 1px solid white + td:last-child + border-right: 1px solid white + tr:last-child + td + border-bottom: 1px solid white + td + text-align: center + font-size: 15px + background-color: $medium + padding: 0 + border-radius: 0 + border: 1px solid black + p + margin: 10px + td:nth-child(even) + background-color: $dark2 + +#edtweek + i + cursor: pointer + div:nth-child(1) + text-align: right + div:nth-child(3) + text-align: left + + +#marks + table + border: 1px solid white + margin-top: 80px + width: 80% + margin-left: auto + margin-right: auto + table-layout: fixed + border-collapse: collapse + tbody + display: block + height: 194px + overflow: auto + thead, tbody tr + display: table + width: 100% + table-layout: fixed + th + border: 1px solid white + background-color: $secondary + text-align: center + font-size: 22px + td + font-size: 18px + cursor: pointer + padding: 0 + text-align: center + background-color: $dark2 + border-radius: 0 + border: 1px solid $medium + +.marksdetails + display: none + z-index: 1 + position: fixed + left: 40% + top: 20% + width: 30% + table + border-collapse: collapse + border: 1px solid white + th + text-align: center + font-size: 18px + border: 1px solid white + background-color: $secondary + td + text-align: center + background-color: $dark2 + border: none + font-size: 18px + tr:last-child + td + border-bottom: 1px solid white + +div#visible + display: block + +div#visible + div + filter: blur(4px) grayscale(80%) + +.marksgroup + margin-top: 300px + h3 + background-color: $secondary + margin: 0 + padding: 15px + font-size: 22px + +#flexgroup + display: flex + flex-direction: row + flex-wrap: wrap + justify-content: space-around + background: $dark2 + p + background-color: $medium + cursor: pointer + padding: 15px + font-size: 18px + +#markstable + width: 95% + table-layout: fixed + margin: auto + tbody + display: block + height: 70vh + overflow: auto + thead, tbody tr + display: table + width: 100% + table-layout: fixed + ::placeholder + color: #000 + opacity: 1 + th + background-color: $secondary + border: 2px solid white + text-align: center + font-size: 22px + input + font-size: 22px + border: none + color: white + text-align: center + tr + td + background-color: $medium + tr:nth-child(even) + td + background-color: $dark2 + td + text-align: center + font-size: 18px + border: 1px solid $light + input + font-size: 18px + border: none + color: white + text-align: center + +#marksubmit + display: block + width: 30% + background-color: $secondary + margin-top: 50px + color: white + border: none + margin-left: auto + margin-right: auto + font-size: 22px + padding: 15px + cursor: pointer + margin-bottom: 50px \ No newline at end of file