diff --git a/app/javascript/packs/legacy/application.coffee b/app/javascript/packs/legacy/application.coffee index 43194f9f..3215c548 100644 --- a/app/javascript/packs/legacy/application.coffee +++ b/app/javascript/packs/legacy/application.coffee @@ -10,6 +10,7 @@ import 'particleground/jquery.particleground.min' import 'jquery.growl' import NProgress from 'nprogress' import Cookies from 'js-cookie' +import moment from 'moment' # this file is generated by Rails import I18n from './i18n' @@ -62,6 +63,8 @@ import './util' # not required: # _tree ./moderation +window.moment = moment + NProgress.configure showSpinner: false diff --git a/app/javascript/packs/legacy/moderation.js.erb.coffee b/app/javascript/packs/legacy/moderation.js.erb.coffee deleted file mode 100644 index f42f8875..00000000 --- a/app/javascript/packs/legacy/moderation.js.erb.coffee +++ /dev/null @@ -1,5 +0,0 @@ -#= require moment -#= require tempusdominus-bootstrap-4 -#= require_tree ./moderation - -$('.datetimepicker-input').datetimepicker({}); \ No newline at end of file diff --git a/app/javascript/packs/legacy/moderation/index.coffee b/app/javascript/packs/legacy/moderation/index.coffee index c8908e46..33d58e2c 100644 --- a/app/javascript/packs/legacy/moderation/index.coffee +++ b/app/javascript/packs/legacy/moderation/index.coffee @@ -1,14 +1,9 @@ -import '../jquery' -import 'popper.js' -import 'bootstrap' -import {} from 'jquery-ujs' -import 'jquery.turbolinks/src/jquery.turbolinks' -import 'jquery.guillotine' -import 'particleground/jquery.particleground.min' -import 'jquery.growl' +import 'tempusdominus-bootstrap-4' import './ban' import './comment' import './destroy' import './privileges' -import './vote' \ No newline at end of file +import './vote' + +$('.datetimepicker-input').datetimepicker({}); \ No newline at end of file diff --git a/package.json b/package.json index 46c20448..1ecbfa81 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "popper.js": "^1.16.1", "regenerator-runtime": "^0.13.7", "sweetalert": "1.1.3", + "tempusdominus-bootstrap-4": "5.1.2", "tinycolor2": "^1.4.2", "turbolinks": "turbolinks/turbolinks-classic" }, diff --git a/yarn.lock b/yarn.lock index c21ab504..dfa7bff1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1471,7 +1471,7 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap@^4.5.3: +bootstrap@>=4.1.2, bootstrap@^4.5.3: version "4.5.3" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== @@ -4040,7 +4040,7 @@ jquery.turbolinks@^2.1.0: resolved "https://registry.yarnpkg.com/jquery.turbolinks/-/jquery.turbolinks-2.1.0.tgz#36036bb997c48d53bceb345521fbdf7da887a62c" integrity sha1-NgNruZfEjVO86zRVIfvffaiHpiw= -"jquery@>= 1.7.x", "jquery@>= 1.8.0", jquery@>=1.8.0, jquery@^3.5.1: +"jquery@>= 1.7.x", "jquery@>= 1.8.0", jquery@>=1.8.0, jquery@^3.0, jquery@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== @@ -4569,6 +4569,18 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +moment-timezone@^0.5.11: + version "0.5.32" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz#db7677cc3cc680fd30303ebd90b0da1ca0dfecc2" + integrity sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA== + dependencies: + moment ">= 2.9.0" + +"moment@>= 2.9.0", moment@^2.22.2: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -5236,7 +5248,7 @@ pnp-webpack-plugin@^1.6.4: dependencies: ts-pnp "^1.1.6" -popper.js@^1.16.1: +popper.js@^1.14.3, popper.js@^1.16.1: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== @@ -7037,6 +7049,17 @@ tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" +tempusdominus-bootstrap-4@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.1.2.tgz#3c9906ca6e5d563faa0b81b2fdc6aa79cad9c0be" + integrity sha512-ksD8qc4wOJeE19wvryXmEpRzMUSZu4wSOdG6zKSn8l4ccad16249KOX1j0CccyZpuuES/n4FLqLAUB+Dd1LTBA== + dependencies: + bootstrap ">=4.1.2" + jquery "^3.0" + moment "^2.22.2" + moment-timezone "^0.5.11" + popper.js "^1.14.3" + terser-webpack-plugin@^1.4.3: version "1.4.5" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"