From c073622eb69b787b612a803307a0164201fba3a8 Mon Sep 17 00:00:00 2001 From: fatchan Date: Sat, 30 Nov 2019 18:09:23 +1100 Subject: [PATCH] local time, change some scripts names and orders, modal, footer, and udpate deps --- gulp/res/js/hide.js | 6 +- gulp/res/js/modal.js | 2 +- gulp/res/js/time.js | 36 ++++++++++ gulpfile.js | 7 +- helpers/numfiles.js | 1 + package-lock.json | 134 +++++++++++++++++++++++--------------- package.json | 8 +-- views/includes/footer.pug | 2 +- views/mixins/modal.pug | 8 ++- 9 files changed, 139 insertions(+), 65 deletions(-) create mode 100644 gulp/res/js/time.js diff --git a/gulp/res/js/hide.js b/gulp/res/js/hide.js index dcdc065c..a5d1ba4e 100644 --- a/gulp/res/js/hide.js +++ b/gulp/res/js/hide.js @@ -20,10 +20,6 @@ const loadHiddenStorage = () => { loadHiddenStorage(); -const saveHiddenStorage = () => { - setLocalStorage('hidden', JSON.stringify([...hidden])); -} - const setHidden = (posts, hide) => { if (posts && posts.length > 0) { for (let i = 0; i < posts.length; i++) { @@ -74,7 +70,7 @@ const changeOption = function(e) { } this.value = ''; setHidden(posts, hiding); - saveHiddenStorage(); + setLocalStorage('hidden', JSON.stringify([...hidden])); } for (let menu of document.getElementsByClassName('postmenu')) { diff --git a/gulp/res/js/modal.js b/gulp/res/js/modal.js index 4773d698..37b3dd1a 100644 --- a/gulp/res/js/modal.js +++ b/gulp/res/js/modal.js @@ -95,7 +95,7 @@ pug_html = pug_html + "\u003Coption" + (pug_attr("value", theme, true, false)) + } }).call(this); -pug_html = pug_html + "\u003C\u002Fselect\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003ELive posts\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"live-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003ENotifications\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"notification-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003EScroll to new posts\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"scroll-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003EDefault volume\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"volume-setting\" type=\"range\" min=\"0\" max=\"100\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003C\u002Fdiv\u003E"; +pug_html = pug_html + "\u003C\u002Fselect\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003EDefault volume\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"volume-setting\" type=\"range\" min=\"0\" max=\"100\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003ELive posts\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"live-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003ENotifications\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"notification-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003EScroll to new posts\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"scroll-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003Cdiv class=\"row\"\u003E\u003Cdiv class=\"label\"\u003ELocal time\u003C\u002Fdiv\u003E\u003Clabel class=\"postform-style ph-5\"\u003E\u003Cinput id=\"time-setting\" type=\"checkbox\"\u002F\u003E\u003C\u002Flabel\u003E\u003C\u002Fdiv\u003E\u003C\u002Fdiv\u003E"; } pug_html = pug_html + "\u003C\u002Fdiv\u003E\u003C\u002Fdiv\u003E"; }; diff --git a/gulp/res/js/time.js b/gulp/res/js/time.js new file mode 100644 index 00000000..9c021be9 --- /dev/null +++ b/gulp/res/js/time.js @@ -0,0 +1,36 @@ +!localStorage.getItem('localtime') ? setLocalStorage('localtime', true) : void 0; + +let localTime = localStorage.getItem('localtime') == 'true'; + +const makeDateLocal = (date) => { + date.innerText = new Date(date.dateTime).toLocaleString(0, {hour12:false}); +} + +if (localTime) { + const dates = document.getElementsByClassName('post-date'); + for (let i = 0; i < dates.length; i++) { + makeDateLocal(dates[i]); + } +} + +window.addEventListener('settingsReady', function(event) { + + const timeSetting = document.getElementById('time-setting'); + const toggleLocalTime = () => { + localTime = !localTime; + setLocalStorage('localtime', localTime); + console.log('toggling local time', localTime); + } + timeSetting.checked = localTime; + timeSetting.addEventListener('change', toggleLocalTime, false); + +}); + +window.addEventListener('addPost', function(e) { + + const date = e.detail.post.querySelector('.post-date'); + if (localTime) { + makeDateLocal(date); + } + +}); diff --git a/gulpfile.js b/gulpfile.js index ae304d6c..ccd38b92 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -180,11 +180,16 @@ function scripts() { `${paths.scripts.src}/live.js`, `${paths.scripts.src}/*.js`, `!${paths.scripts.src}/hide.js`, + `!${paths.scripts.src}/time.js`, ]) .pipe(concat('all.js')) .pipe(uglify()) .pipe(gulp.dest(paths.scripts.dest)); - return gulp.src(`${paths.scripts.src}/*.js`) + return gulp.src([ + `${paths.scripts.src}/hide.js`, + `${paths.scripts.src}/time.js`, + ]) + .pipe(concat('render.js')) .pipe(uglify()) .pipe(gulp.dest(paths.scripts.dest)); } diff --git a/helpers/numfiles.js b/helpers/numfiles.js index c469d9e6..77f496fc 100644 --- a/helpers/numfiles.js +++ b/helpers/numfiles.js @@ -10,4 +10,5 @@ module.exports = (req, res, next) => { req.files.file = [req.files.file]; } } + next(); } diff --git a/package-lock.json b/package-lock.json index 181340aa..3930c1a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,18 +102,17 @@ } }, "@pm2/io": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@pm2/io/-/io-4.3.2.tgz", - "integrity": "sha512-9od/PAjEb+ZADh013tVXIgUtL9JmB80xZ5HLK9RgQF1e3gI8KNKHJM4XDppVpOKUOmLRyHibn476C/PynGqNjQ==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@pm2/io/-/io-4.3.3.tgz", + "integrity": "sha512-ENGsdSVpnwbYMGdeB0/Xy2eZYo7oltzApoCsMD4ssqWNXDg9C4uQZy5J09iPsb0IHFwSDjU5oylXdwKDSoqODw==", "requires": { "@opencensus/core": "^0.0.9", "@opencensus/propagation-b3": "^0.0.8", "@pm2/agent-node": "^1.1.10", "async": "~2.6.1", "debug": "3.1.0", - "event-loop-inspector": "~1.2.0", "eventemitter2": "~5.0.1", - "require-in-the-middle": "^4.0.0", + "require-in-the-middle": "^5.0.0", "semver": "5.5.0", "shimmer": "~1.2.0", "signal-exit": "3.0.2", @@ -877,12 +876,19 @@ "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==" }, "bcrypt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.6.tgz", - "integrity": "sha512-taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.7.tgz", + "integrity": "sha512-K5UglF9VQvBMHl/1elNyyFvAfOY9Bj+rpKrCSR9sFwcW8FywAYJSRwTURNej5TaAK2TEJkcJ6r6lh1YPmspx5Q==", "requires": { - "nan": "2.13.2", - "node-pre-gyp": "0.12.0" + "nan": "2.14.0", + "node-pre-gyp": "0.13.0" + }, + "dependencies": { + "nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" + } } }, "bcrypt-pbkdf": { @@ -1003,9 +1009,9 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "bull": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/bull/-/bull-3.12.0.tgz", - "integrity": "sha512-Gv/x7SHx0mugaqeDmUnh/ub4GqEcF0cBBZ2rmUUXvwLC4FVzrcOie9VkqNJjYLcvia4xTzr43WP3aMWJXtlYMA==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/bull/-/bull-3.12.1.tgz", + "integrity": "sha512-X3bSP7gTqPXLYVSyUtQuTOqZuU0GwVbV304Et84Z8bxYP60R1VD3FUOLsESVRA9LIUEOWVH3hE8MFqlszmO0Gw==", "requires": { "cron-parser": "^2.13.0", "debuglog": "^1.0.0", @@ -1978,6 +1984,21 @@ "has-binary2": "~1.0.2" } }, + "enquirer": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.2.tgz", + "integrity": "sha512-PLhTMPUXlnaIv9D3Cq3/Zr1xb7soeDDgunobyCmYLUG19n24dvC8i+ZZgm2DekGpDnx7JvFSHV7lxfM58PMtbA==", + "requires": { + "ansi-colors": "^3.2.1" + }, + "dependencies": { + "ansi-colors": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" + } + } + }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", @@ -2001,20 +2022,27 @@ } }, "es-abstract": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", - "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.2.tgz", + "integrity": "sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA==", "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.0", + "has-symbols": "^1.0.1", "is-callable": "^1.1.4", "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", + "object-inspect": "^1.7.0", "object-keys": "^1.1.1", "string.prototype.trimleft": "^2.1.0", "string.prototype.trimright": "^2.1.0" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + } } }, "es-to-primitive": { @@ -2127,11 +2155,6 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, - "event-loop-inspector": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/event-loop-inspector/-/event-loop-inspector-1.2.2.tgz", - "integrity": "sha512-v7OqIPmO0jqpmSH4Uc6IrY/H6lOidYzrXHE8vPHLDDOfV1Pw+yu+KEIE/AWnoFheWYlunZbxzKpZBAezVlrU9g==" - }, "eventemitter2": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz", @@ -4068,11 +4091,18 @@ } }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" + } } }, "is-typedarray": { @@ -4653,9 +4683,9 @@ } }, "mongodb": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.3.tgz", - "integrity": "sha512-MdRnoOjstmnrKJsK8PY0PjP6fyF/SBS4R8coxmhsfEU7tQ46/J6j+aSHF2n4c2/H8B+Hc/Klbfp8vggZfI0mmA==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.3.5.tgz", + "integrity": "sha512-6NAv5gTFdwRyVfCz+O+KDszvjpyxmZw+VlmqmqKR2GmpkeKrKFRv/ZslgTtZba2dc9JYixIf99T5Gih7TIWv7Q==", "requires": { "bson": "^1.1.1", "require_optional": "^1.0.1", @@ -4681,7 +4711,8 @@ "nan": { "version": "2.13.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" + "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", + "optional": true }, "nanomatch": { "version": "1.2.13", @@ -4754,9 +4785,9 @@ "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "node-pre-gyp": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", - "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz", + "integrity": "sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ==", "requires": { "detect-libc": "^1.0.2", "mkdirp": "^0.5.1", @@ -4909,9 +4940,9 @@ } }, "object-inspect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" }, "object-keys": { "version": "1.1.1", @@ -5316,9 +5347,9 @@ } }, "pm2": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.1.2.tgz", - "integrity": "sha512-HkNP3K79PmqxkxfgNX/t5rsfWLNMc89KVKDm2Xoju0MU3TbGZSc2rWLZffgEitITsMcPpkKtZmAJBcxMXvURFA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pm2/-/pm2-4.2.0.tgz", + "integrity": "sha512-toj4yv5zd1Nf5K7GFoL/bPEZvEJFgXSoHsmgp4axjCf+TEhsrBRjgMPsSSLtVcDeDNApOtZmJAY5TuH5sA1eOA==", "requires": { "@pm2/agent": "^0.5.26", "@pm2/io": "^4.3.2", @@ -5332,6 +5363,7 @@ "cron": "1.7.1", "date-fns": "1.30.1", "debug": "4.1.1", + "enquirer": "^2.3.2", "eventemitter2": "5.0.1", "fclone": "1.0.11", "lodash": "4.17.14", @@ -5349,7 +5381,7 @@ "shelljs": "0.8.3", "source-map-support": "0.5.12", "sprintf-js": "1.1.2", - "systeminformation": "^4.14.11", + "systeminformation": "^4.14.16", "vizion": "~2.0.2", "yamljs": "0.3.0" }, @@ -6115,9 +6147,9 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-in-the-middle": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-4.0.1.tgz", - "integrity": "sha512-EfkM2zANyGkrfIExsECMeNn/uzjvHrE9h36yLXSavmrDiH4tgDNvltAmEKnt4PNLbqKPHZz+uszW2wTKrLUX0w==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.0.2.tgz", + "integrity": "sha512-l2r6F9i6t5xp4OE9cw/daB/ooQKHZOOW1AYPADhEvk/Tj/THJDS8gePp76Zyuht6Cj57a0KL+eHK5Dyv7wZnKA==", "requires": { "debug": "^4.1.1", "module-details-from-path": "^1.0.3", @@ -6138,9 +6170,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz", + "integrity": "sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==", "requires": { "path-parse": "^1.0.6" } @@ -6893,9 +6925,9 @@ } }, "systeminformation": { - "version": "4.14.17", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.17.tgz", - "integrity": "sha512-CQbT5vnkqNb3JNl41xr8sYA8AX7GoaWP55/jnmFNQY0XQmUuoFshSNUkCkxiDdEC1qu2Vg9s0jR6LLmVSmNJUw==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.16.0.tgz", + "integrity": "sha512-1FjxPJSw7ad0zug+1YIQATj6Cn+wM5OBASEpjohEeOD2EGPIf0Cnhthd1L2O1YX+wKgOMuPldGfxYdo8yNHEIg==", "optional": true }, "tar": { diff --git a/package.json b/package.json index 0f001313..da40071b 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "main": "server.js", "dependencies": { "@tohru/gm": "github:fatchan/gm", - "bcrypt": "^3.0.6", - "bull": "^3.12.0", + "bcrypt": "^3.0.7", + "bull": "^3.12.1", "cache-pug-templates": "^2.0.1", "connect-redis": "^4.0.3", "cookie-parser": "^1.4.4", @@ -27,10 +27,10 @@ "gulp-uglify-es": "^1.0.4", "highlight.js": "^9.16.2", "ioredis": "^4.14.1", - "mongodb": "^3.3.3", + "mongodb": "^3.3.5", "node-fetch": "^2.6.0", "path": "^0.12.7", - "pm2": "^4.1.2", + "pm2": "^4.2.0", "pug": "^2.0.4", "redlock": "^4.1.0", "sanitize-html": "^1.20.1", diff --git a/views/includes/footer.pug b/views/includes/footer.pug index 9e7c5eea..bd18fa06 100644 --- a/views/includes/footer.pug +++ b/views/includes/footer.pug @@ -6,4 +6,4 @@ small.footer#bottom | - a(href='https://github.com/fatchan/jschan/') source code | - -script(src='/js/hide.js') +script(src='/js/render.js') diff --git a/views/mixins/modal.pug b/views/mixins/modal.pug index 0cf7f3ea..4c5bb216 100644 --- a/views/mixins/modal.pug +++ b/views/mixins/modal.pug @@ -31,6 +31,10 @@ mixin modal(data) option(value='default') default each theme in data.settings.codeThemes option(value=theme) #{theme} + .row + .label Default volume + label.postform-style.ph-5 + input#volume-setting(type='range' min='0' max='100') .row .label Live posts label.postform-style.ph-5 @@ -44,6 +48,6 @@ mixin modal(data) label.postform-style.ph-5 input#scroll-setting(type='checkbox') .row - .label Default volume + .label Local time label.postform-style.ph-5 - input#volume-setting(type='range' min='0' max='100') + input#time-setting(type='checkbox')