From 586fcb6066367336c670eee02166c79a7464e184 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Tue, 25 Feb 2020 17:43:02 -0500 Subject: [PATCH] Replace simplemde with easymde as it's actually maintained, and include fontawesome 5 as it's supported by easymde and makes the project fully MIT again --- app/Dashboard.php | 4 +- gulpfile.js | 7 +- package-lock.json | 421 +++++++----------- package.json | 3 +- public/img/dashboard/icons/arrows-alt.svg | 1 - public/img/dashboard/icons/bold.svg | 1 - public/img/dashboard/icons/checkmark.svg | 1 - public/img/dashboard/icons/code.svg | 1 - public/img/dashboard/icons/columns.svg | 1 - public/img/dashboard/icons/eraser.svg | 1 - public/img/dashboard/icons/eye.svg | 1 - public/img/dashboard/icons/header.svg | 1 - public/img/dashboard/icons/italic.svg | 1 - public/img/dashboard/icons/link.svg | 1 - public/img/dashboard/icons/list-ol.svg | 1 - public/img/dashboard/icons/list-ul.svg | 1 - public/img/dashboard/icons/minus.svg | 1 - public/img/dashboard/icons/picture-o.svg | 1 - .../img/dashboard/icons/question-circle.svg | 1 - public/img/dashboard/icons/quote-left.svg | 1 - public/img/dashboard/icons/repeat.svg | 1 - public/img/dashboard/icons/star.svg | 1 - public/img/dashboard/icons/strikethrough.svg | 1 - public/img/dashboard/icons/table.svg | 1 - public/img/dashboard/icons/trash-alt.svg | 1 - public/img/dashboard/icons/undo.svg | 1 - public/img/dashboard/icons/upload.svg | 1 - resources/js/dashboard.js | 14 +- resources/sass/dashboard.scss | 101 +---- traditional-bootstrap/gulpfile.js | 7 +- traditional-bootstrap/package.json | 3 +- 31 files changed, 184 insertions(+), 399 deletions(-) delete mode 100644 public/img/dashboard/icons/arrows-alt.svg delete mode 100644 public/img/dashboard/icons/bold.svg delete mode 100644 public/img/dashboard/icons/checkmark.svg delete mode 100644 public/img/dashboard/icons/code.svg delete mode 100644 public/img/dashboard/icons/columns.svg delete mode 100644 public/img/dashboard/icons/eraser.svg delete mode 100644 public/img/dashboard/icons/eye.svg delete mode 100644 public/img/dashboard/icons/header.svg delete mode 100644 public/img/dashboard/icons/italic.svg delete mode 100644 public/img/dashboard/icons/link.svg delete mode 100644 public/img/dashboard/icons/list-ol.svg delete mode 100644 public/img/dashboard/icons/list-ul.svg delete mode 100644 public/img/dashboard/icons/minus.svg delete mode 100644 public/img/dashboard/icons/picture-o.svg delete mode 100644 public/img/dashboard/icons/question-circle.svg delete mode 100644 public/img/dashboard/icons/quote-left.svg delete mode 100644 public/img/dashboard/icons/repeat.svg delete mode 100644 public/img/dashboard/icons/star.svg delete mode 100644 public/img/dashboard/icons/strikethrough.svg delete mode 100644 public/img/dashboard/icons/table.svg delete mode 100644 public/img/dashboard/icons/trash-alt.svg delete mode 100644 public/img/dashboard/icons/undo.svg delete mode 100644 public/img/dashboard/icons/upload.svg diff --git a/app/Dashboard.php b/app/Dashboard.php index 35d1799..09a070d 100644 --- a/app/Dashboard.php +++ b/app/Dashboard.php @@ -50,13 +50,13 @@ class Dashboard */ public static $library_credits = [ [ 'name' => 'Bootstrap', 'url' => 'https://getbootstrap.com' ], + [ 'name' => 'EasyMDE Markdown Editor', 'url' => 'https://easymde.tk' ], + [ 'name' => 'flatpickr', 'url' => 'https://flatpickr.js.org' ], [ 'name' => 'Font Awesome', 'url' => 'https://fontawesome.com', 'license' => 'https://fontawesome.com/license' ], [ 'name' => 'GreenSock', 'url' => 'https://greensock.com/gsap' ], [ 'name' => 'jQuery', 'url' => 'https://jquery.org' ], [ 'name' => 'List.js', 'url' => 'http://listjs.com' ], - [ 'name' => 'flatpickr', 'url' => 'https://flatpickr.js.org' ], [ 'name' => 'Popper.js', 'url' => 'https://popper.js.org' ], - [ 'name' => 'SimpleMDE Markdown Editor', 'url' => 'https://simplemde.com' ], [ 'name' => 'Sortable', 'url' => 'https://github.com/RubaXa/Sortable' ], [ 'name' => 'SpinKit', 'url' => 'http://tobiasahlin.com/spinkit/' ], [ 'name' => 'Vue.js', 'url' => 'https://vuejs.org' ], diff --git a/gulpfile.js b/gulpfile.js index 31b5965..09e6e69 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,19 +63,20 @@ const jsDashboardLibs = [ "node_modules/flatpickr/dist/flatpickr.js", "node_modules/sortablejs/Sortable.js", "node_modules/list.js/dist/list.js", - "node_modules/simplemde/dist/simplemde.min.js" + "node_modules/easymde/dist/easymde.min.js" ]; // CSS libraries for the dashboard const cssDashboardLibs = [ "node_modules/flatpickr/dist/flatpickr.css", - "node_modules/simplemde/dist/simplemde.min.css", + "node_modules/easymde/dist/easymde.min.css", "node_modules/spinkit/css/spinners/11-folding-cube.css" ]; // Paths to folders containing fonts that should be copied to public/fonts/ const fontPaths = [ - "resources/fonts/**" + "resources/fonts/**", + "node_modules/@fortawesome/fontawesome-free/webfonts/**" ]; // Handle errors diff --git a/package-lock.json b/package-lock.json index 638f761..0c00de2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,43 +18,6 @@ "browserslist": "^4.8.5", "invariant": "^2.2.4", "semver": "^5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz", - "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==", - "requires": { - "caniuse-lite": "^1.0.30001027", - "electron-to-chromium": "^1.3.349", - "node-releases": "^1.1.49" - } - }, - "caniuse-lite": { - "version": "1.0.30001030", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", - "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" - }, - "electron-to-chromium": { - "version": "1.3.360", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz", - "integrity": "sha512-RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==" - }, - "node-releases": { - "version": "1.1.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - } } }, "@babel/core": { @@ -127,43 +90,6 @@ "invariant": "^2.2.4", "levenary": "^1.1.1", "semver": "^5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz", - "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==", - "requires": { - "caniuse-lite": "^1.0.30001027", - "electron-to-chromium": "^1.3.349", - "node-releases": "^1.1.49" - } - }, - "caniuse-lite": { - "version": "1.0.30001030", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", - "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" - }, - "electron-to-chromium": { - "version": "1.3.360", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz", - "integrity": "sha512-RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==" - }, - "node-releases": { - "version": "1.1.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - } } }, "@babel/helper-create-regexp-features-plugin": { @@ -821,43 +747,6 @@ "invariant": "^2.2.2", "levenary": "^1.1.1", "semver": "^5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "4.8.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz", - "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==", - "requires": { - "caniuse-lite": "^1.0.30001027", - "electron-to-chromium": "^1.3.349", - "node-releases": "^1.1.49" - } - }, - "caniuse-lite": { - "version": "1.0.30001030", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", - "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" - }, - "electron-to-chromium": { - "version": "1.3.360", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz", - "integrity": "sha512-RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==" - }, - "node-releases": { - "version": "1.1.50", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", - "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - } } }, "@babel/template": { @@ -896,6 +785,11 @@ "to-fast-properties": "^2.0.0" } }, + "@fortawesome/fontawesome-free": { + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz", + "integrity": "sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw==" + }, "@sindresorhus/is": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", @@ -961,9 +855,9 @@ } }, "acorn-walk": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz", - "integrity": "sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg==" + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz", + "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==" }, "after": { "version": "0.8.2", @@ -972,11 +866,11 @@ "dev": true }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" @@ -1312,13 +1206,6 @@ "num2fraction": "^1.2.2", "postcss": "^7.0.26", "postcss-value-parser": "^4.0.2" - }, - "dependencies": { - "caniuse-lite": { - "version": "1.0.30001030", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", - "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" - } } }, "aws-sign2": { @@ -1327,9 +1214,9 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz", - "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==" + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, "axios": { "version": "0.19.0", @@ -1824,13 +1711,13 @@ } }, "browserslist": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", - "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", + "version": "4.8.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz", + "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==", "requires": { - "caniuse-lite": "^1.0.30001017", - "electron-to-chromium": "^1.3.322", - "node-releases": "^1.1.44" + "caniuse-lite": "^1.0.30001027", + "electron-to-chromium": "^1.3.349", + "node-releases": "^1.1.49" } }, "bs-recipes": { @@ -1989,9 +1876,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001019", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz", - "integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==" + "version": "1.0.30001030", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz", + "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==" }, "caseless": { "version": "0.12.0", @@ -2138,9 +2025,9 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "codemirror": { - "version": "5.50.2", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.50.2.tgz", - "integrity": "sha512-PPjUsC1oXSM86lunKrw609P1oM0Wu8z9rqzjbeyBYCcx44VL41aUpccdOf1PfAZtTONlmN3sT3p2etLNYa1OGg==" + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.0.tgz", + "integrity": "sha512-K2UB6zjscrfME03HeRe/IuOmCeqNpw7PLKGHThYpLbZEuKf+ZoujJPhxZN4hHJS1O7QyzEsV7JJZGxuQWVaFCg==" }, "codemirror-spell-checker": { "version": "1.1.2", @@ -2512,20 +2399,15 @@ } } }, - "css-unit-converter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz", - "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=" - }, "css-what": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz", "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==" }, "cssesc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { "version": "4.1.10", @@ -2846,11 +2728,11 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "requires": { - "is-obj": "^1.0.0" + "is-obj": "^2.0.0" } }, "duplexer2": { @@ -2895,6 +2777,16 @@ "lodash": "^4.17.10" } }, + "easymde": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/easymde/-/easymde-2.9.0.tgz", + "integrity": "sha512-Gii/wv7ZmDTgBmD9QBKbU9uiyzspWYNUH/+hH+jlQmBiNM73ShGWX6DtrL/ARzD5sYqPY6yX/6U9M3RayAgDdA==", + "requires": { + "codemirror": "^5.50.2", + "codemirror-spell-checker": "1.1.2", + "marked": "^0.8.0" + } + }, "eazy-logger": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz", @@ -2920,9 +2812,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.328", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.328.tgz", - "integrity": "sha512-x4XefnFxDxFwaQ01d/pppJP9meWhOIJ/gtI6/4jqkpsadq79uL7NYSaX64naLmJqvzUBjSrO3IM2+1b/W9KdPg==" + "version": "1.3.360", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz", + "integrity": "sha512-RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==" }, "elliptic": { "version": "6.5.2", @@ -3061,9 +2953,9 @@ } }, "es-abstract": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", - "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", + "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", @@ -3359,9 +3251,9 @@ } }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" }, "fast-json-stable-stringify": { "version": "2.1.0", @@ -4242,12 +4134,12 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globule": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz", - "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==", + "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.10", + "lodash": "~4.17.12", "minimatch": "~3.0.2" } }, @@ -4759,9 +4651,9 @@ } }, "hosted-git-info": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" + "version": "2.8.6", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.6.tgz", + "integrity": "sha512-Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==" }, "hsl-regex": { "version": "1.0.0", @@ -5098,12 +4990,9 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -5154,9 +5043,9 @@ } }, "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, "is-object": { "version": "1.0.1", @@ -5287,9 +5176,9 @@ "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, "js-base64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", - "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==" + "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==" }, "js-tokens": { "version": "4.0.0", @@ -5405,9 +5294,9 @@ } }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "labeled-stream-splicer": { "version": "2.0.2", @@ -5607,9 +5496,9 @@ } }, "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==" + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" }, "make-error-cause": { "version": "1.2.2", @@ -5923,9 +5812,9 @@ } }, "node-releases": { - "version": "1.1.44", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz", - "integrity": "sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw==", + "version": "1.1.50", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz", + "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==", "requires": { "semver": "^6.3.0" }, @@ -5938,9 +5827,9 @@ } }, "node-sass": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz", - "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz", + "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==", "requires": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", @@ -6296,9 +6185,9 @@ } }, "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==" + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "parents": { "version": "1.0.1", @@ -6501,9 +6390,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.26", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz", - "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==", + "version": "7.0.27", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", + "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -6526,20 +6415,24 @@ } }, "postcss-calc": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz", - "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz", + "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==", "requires": { - "css-unit-converter": "^1.1.1", - "postcss": "^7.0.5", - "postcss-selector-parser": "^5.0.0-rc.4", - "postcss-value-parser": "^3.3.1" + "postcss": "^7.0.27", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" }, "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" + "postcss-selector-parser": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", + "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "requires": { + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" + } } } }, @@ -6651,11 +6544,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -6728,11 +6621,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -6944,6 +6837,13 @@ "cssesc": "^2.0.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" + }, + "dependencies": { + "cssesc": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", + "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" + } } }, "postcss-svgo": { @@ -7315,9 +7215,9 @@ } }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -7326,7 +7226,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -7336,7 +7236,7 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } @@ -7358,9 +7258,9 @@ "dev": true }, "resolve": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz", - "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", "requires": { "path-parse": "^1.0.6" } @@ -7836,16 +7736,6 @@ } } }, - "simplemde": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/simplemde/-/simplemde-1.11.2.tgz", - "integrity": "sha1-ojo12XjSxA7wfewAjJLwcNjggOM=", - "requires": { - "codemirror": "*", - "codemirror-spell-checker": "*", - "marked": "*" - } - }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -8336,9 +8226,9 @@ }, "dependencies": { "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -8502,11 +8392,11 @@ }, "dependencies": { "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } @@ -8738,12 +8628,19 @@ "dev": true }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + } } }, "trim-newlines": { @@ -8799,9 +8696,9 @@ "dev": true }, "uglify-js": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.4.tgz", - "integrity": "sha512-tinYWE8X1QfCHxS1lBS8yiDekyhSXOO6R66yNOCdUJeojxxw+PX2BHAz/BWyW7PQ7pkiWVxJfIEbiDxyLWvUGg==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz", + "integrity": "sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==", "requires": { "commander": "~2.20.3", "source-map": "~0.6.1" @@ -9050,12 +8947,14 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", + "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" } }, "utils-merge": { @@ -9065,9 +8964,9 @@ "dev": true }, "uuid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, "v8flags": { "version": "3.1.3", @@ -9092,9 +8991,9 @@ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=" }, "vendors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz", - "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", + "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==" }, "verror": { "version": "1.10.0", diff --git a/package.json b/package.json index 2f74aea..1f9274d 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,12 @@ "dependencies": { "@babel/core": "^7.8.4", "@babel/preset-env": "^7.8.4", + "@fortawesome/fontawesome-free": "^5.12.1", "autoprefixer": "^9.7.4", "babelify": "^10.0.0", "bootstrap": "4.3.1", "browserify": "^16.5.0", + "easymde": "^2.9.0", "fancy-log": "^1.3.3", "flatpickr": "^4.6.3", "gsap": "^3.2.0", @@ -32,7 +34,6 @@ "list.js": "^1.5.0", "minimist": "^1.2.0", "popper.js": "^1.16.1", - "simplemde": "^1.11.2", "sortablejs": "^1.10.2", "spinkit": "^1.2.5", "vinyl-buffer": "^1.0.1", diff --git a/public/img/dashboard/icons/arrows-alt.svg b/public/img/dashboard/icons/arrows-alt.svg deleted file mode 100644 index d885a5a..0000000 --- a/public/img/dashboard/icons/arrows-alt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/bold.svg b/public/img/dashboard/icons/bold.svg deleted file mode 100644 index 045e7fb..0000000 --- a/public/img/dashboard/icons/bold.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/checkmark.svg b/public/img/dashboard/icons/checkmark.svg deleted file mode 100644 index 313dac3..0000000 --- a/public/img/dashboard/icons/checkmark.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/code.svg b/public/img/dashboard/icons/code.svg deleted file mode 100644 index ea8da70..0000000 --- a/public/img/dashboard/icons/code.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/columns.svg b/public/img/dashboard/icons/columns.svg deleted file mode 100644 index 84ec2a0..0000000 --- a/public/img/dashboard/icons/columns.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/eraser.svg b/public/img/dashboard/icons/eraser.svg deleted file mode 100644 index 1ba581e..0000000 --- a/public/img/dashboard/icons/eraser.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/eye.svg b/public/img/dashboard/icons/eye.svg deleted file mode 100644 index 6a0a503..0000000 --- a/public/img/dashboard/icons/eye.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/header.svg b/public/img/dashboard/icons/header.svg deleted file mode 100644 index a482da1..0000000 --- a/public/img/dashboard/icons/header.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/italic.svg b/public/img/dashboard/icons/italic.svg deleted file mode 100644 index d63a32b..0000000 --- a/public/img/dashboard/icons/italic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/link.svg b/public/img/dashboard/icons/link.svg deleted file mode 100644 index 57caa9f..0000000 --- a/public/img/dashboard/icons/link.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/list-ol.svg b/public/img/dashboard/icons/list-ol.svg deleted file mode 100644 index 693439b..0000000 --- a/public/img/dashboard/icons/list-ol.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/list-ul.svg b/public/img/dashboard/icons/list-ul.svg deleted file mode 100644 index a585166..0000000 --- a/public/img/dashboard/icons/list-ul.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/minus.svg b/public/img/dashboard/icons/minus.svg deleted file mode 100644 index b82cfd8..0000000 --- a/public/img/dashboard/icons/minus.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/picture-o.svg b/public/img/dashboard/icons/picture-o.svg deleted file mode 100644 index 4f7dd8d..0000000 --- a/public/img/dashboard/icons/picture-o.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/question-circle.svg b/public/img/dashboard/icons/question-circle.svg deleted file mode 100644 index 9a30b85..0000000 --- a/public/img/dashboard/icons/question-circle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/quote-left.svg b/public/img/dashboard/icons/quote-left.svg deleted file mode 100644 index d73aa5e..0000000 --- a/public/img/dashboard/icons/quote-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/repeat.svg b/public/img/dashboard/icons/repeat.svg deleted file mode 100644 index c536b37..0000000 --- a/public/img/dashboard/icons/repeat.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/star.svg b/public/img/dashboard/icons/star.svg deleted file mode 100644 index 7cfd13b..0000000 --- a/public/img/dashboard/icons/star.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/strikethrough.svg b/public/img/dashboard/icons/strikethrough.svg deleted file mode 100644 index 07f78c1..0000000 --- a/public/img/dashboard/icons/strikethrough.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/table.svg b/public/img/dashboard/icons/table.svg deleted file mode 100644 index 5690c5c..0000000 --- a/public/img/dashboard/icons/table.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/trash-alt.svg b/public/img/dashboard/icons/trash-alt.svg deleted file mode 100644 index a921fe8..0000000 --- a/public/img/dashboard/icons/trash-alt.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/undo.svg b/public/img/dashboard/icons/undo.svg deleted file mode 100644 index 44b3904..0000000 --- a/public/img/dashboard/icons/undo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/dashboard/icons/upload.svg b/public/img/dashboard/icons/upload.svg deleted file mode 100644 index 1c880b5..0000000 --- a/public/img/dashboard/icons/upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/js/dashboard.js b/resources/js/dashboard.js index 1c9bcd7..7924408 100644 --- a/resources/js/dashboard.js +++ b/resources/js/dashboard.js @@ -319,7 +319,7 @@ function editItemInit() { operation = id === "new" ? "create" : "update"; let allowTimes = [], - simplemde = [], + easymde = [], formData = {}, submitting = false, hours, @@ -370,7 +370,7 @@ function editItemInit() { $mkdEditors.each(function() { const $this = $(this), column = $this.attr("id"), - value = simplemde[column].value(); + value = easymde[column].value(); addFormData(column, value); }); @@ -566,7 +566,7 @@ function editItemInit() { const $this = $(this), column = $this.attr("id"); - simplemde[column] = new SimpleMDE({ + easymde[column] = new EasyMDE({ element: this, toolbar: [ "bold", @@ -589,11 +589,11 @@ function editItemInit() { setTimeout(function() { // load the initial value into the editor - simplemde[column].value($this.attr("value")); - simplemde[column].codemirror.refresh(); + easymde[column].value($this.attr("value")); + easymde[column].codemirror.refresh(); - // watch for changes to simplemde editor contents - simplemde[column].codemirror.on("change", contentChanged); + // watch for changes to easymde editor contents + easymde[column].codemirror.on("change", contentChanged); }, 500); }); diff --git a/resources/sass/dashboard.scss b/resources/sass/dashboard.scss index 9c7294c..4b96684 100644 --- a/resources/sass/dashboard.scss +++ b/resources/sass/dashboard.scss @@ -1,4 +1,7 @@ // Libraries +$fa-font-path: "/fonts"; +@import "@fortawesome/fontawesome-free/scss/fontawesome.scss"; +@import "@fortawesome/fontawesome-free/scss/solid.scss"; @import "bootstrap/scss/bootstrap.scss"; // Core @@ -1049,101 +1052,3 @@ form { } } } - -.fa { - position: relative; - vertical-align: bottom; - - &:after { - content: ""; - position: absolute; - top: 0px; - left: 0px; - display: block; - width: 100%; - height: 100%; - background-position: center center; - background-size: 10px auto; - background-repeat: no-repeat; - } - - &.fa-arrows-alt:after { - background-image: url("/img/dashboard/icons/arrows-alt.svg"); - } - - &.fa-bold:after { - background-image: url("/img/dashboard/icons/bold.svg"); - } - - &.fa-code:after { - background-image: url("/img/dashboard/icons/code.svg"); - } - - &.fa-columns:after { - background-image: url("/img/dashboard/icons/columns.svg"); - } - - &.fa-eraser:after { - background-image: url("/img/dashboard/icons/eraser.svg"); - } - - &.fa-eye:after { - background-image: url("/img/dashboard/icons/eye.svg"); - } - - &.fa-header:after { - background-image: url("/img/dashboard/icons/header.svg"); - } - - &.fa-italic:after { - background-image: url("/img/dashboard/icons/italic.svg"); - } - - &.fa-link:after { - background-image: url("/img/dashboard/icons/link.svg"); - } - - &.fa-list-ol:after { - background-image: url("/img/dashboard/icons/list-ol.svg"); - } - - &.fa-list-ul:after { - background-image: url("/img/dashboard/icons/list-ul.svg"); - } - - &.fa-minus:after { - background-image: url("/img/dashboard/icons/minus.svg"); - } - - &.fa-picture-o:after { - background-image: url("/img/dashboard/icons/picture-o.svg"); - } - - &.fa-question-circle:after { - background-image: url("/img/dashboard/icons/question-circle.svg"); - } - - &.fa-quote-left:after { - background-image: url("/img/dashboard/icons/quote-left.svg"); - } - - &.fa-repeat:after { - background-image: url("/img/dashboard/icons/repeat.svg"); - } - - &.fa-star:after { - background-image: url("/img/dashboard/icons/star.svg"); - } - - &.fa-strikethrough:after { - background-image: url("/img/dashboard/icons/strikethrough.svg"); - } - - &.fa-table:after { - background-image: url("/img/dashboard/icons/table.svg"); - } - - &.fa-undo:after { - background-image: url("/img/dashboard/icons/undo.svg"); - } -} diff --git a/traditional-bootstrap/gulpfile.js b/traditional-bootstrap/gulpfile.js index 18cbeec..ed77958 100644 --- a/traditional-bootstrap/gulpfile.js +++ b/traditional-bootstrap/gulpfile.js @@ -61,19 +61,20 @@ const jsDashboardLibs = [ "node_modules/flatpickr/dist/flatpickr.js", "node_modules/sortablejs/Sortable.js", "node_modules/list.js/dist/list.js", - "node_modules/simplemde/dist/simplemde.min.js" + "node_modules/easymde/dist/easymde.min.js" ]; // CSS libraries for the dashboard const cssDashboardLibs = [ "node_modules/flatpickr/dist/flatpickr.css", - "node_modules/simplemde/dist/simplemde.min.css", + "node_modules/easymde/dist/easymde.min.css", "node_modules/spinkit/css/spinners/11-folding-cube.css" ]; // Paths to folders containing fonts that should be copied to public/fonts/ const fontPaths = [ - "resources/fonts/**" + "resources/fonts/**", + "node_modules/@fortawesome/fontawesome-free/webfonts/**" ]; // Handle errors diff --git a/traditional-bootstrap/package.json b/traditional-bootstrap/package.json index b002cbd..ed8ab80 100644 --- a/traditional-bootstrap/package.json +++ b/traditional-bootstrap/package.json @@ -10,9 +10,11 @@ "dependencies": { "@babel/core": "^7.8.4", "@babel/preset-env": "^7.8.4", + "@fortawesome/fontawesome-free": "^5.12.1", "autoprefixer": "^9.7.4", "babelify": "^10.0.0", "bootstrap": "4.3.1", + "easymde": "^2.9.0", "fancy-log": "^1.3.3", "flatpickr": "^4.6.3", "gsap": "^3.2.0", @@ -30,7 +32,6 @@ "list.js": "^1.5.0", "minimist": "^1.2.0", "popper.js": "^1.16.1", - "simplemde": "^1.11.2", "sortablejs": "^1.10.2", "spinkit": "^1.2.5", "what-input": "^5.2.6"