diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index dea5ac04a9..328a10b87b 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -24,6 +24,23 @@ //= require angular-rails-templates //= require lodash.underscore.js +// datetimepicker (fil, nb) +//= require flatpickr/dist/flatpickr.min +//= require flatpickr/dist/l10n/ar +//= require flatpickr/dist/l10n/cat +//= require flatpickr/dist/l10n/cy +//= require flatpickr/dist/l10n/de +//= require flatpickr/dist/l10n/es +//= require flatpickr/dist/l10n/fr +//= require flatpickr/dist/l10n/it +//= require flatpickr/dist/l10n/nl +//= require flatpickr/dist/l10n/pl +//= require flatpickr/dist/l10n/pt +//= require flatpickr/dist/l10n/ru +//= require flatpickr/dist/l10n/sv +//= require flatpickr/dist/l10n/tr +//= require shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min + // spree //= require admin/spree/spree //= require admin/spree/spree-select2 diff --git a/app/assets/stylesheets/admin/all.scss b/app/assets/stylesheets/admin/all.scss index 9784acf9c1..c5138f8b06 100644 --- a/app/assets/stylesheets/admin/all.scss +++ b/app/assets/stylesheets/admin/all.scss @@ -12,6 +12,9 @@ *= require shared/textAngular *= require shared/ng-tags-input.min *= require select2 + *= require flatpickr/dist/flatpickr + *= require flatpickr/dist/themes/material_blue + *= require shortcut-buttons-flatpickr/dist/themes/light *= require_self */ diff --git a/package.json b/package.json index a2728cf9b5..f9bbe28259 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ }, "license": "AGPL-3.0", "dependencies": { - "moment": "^2.29.1" + "flatpickr": "^4.6.9", + "moment": "^2.29.1", + "shortcut-buttons-flatpickr": "^0.3.1" } } diff --git a/yarn.lock b/yarn.lock index 299b19faf1..409d35b699 100644 --- a/yarn.lock +++ b/yarn.lock @@ -624,6 +624,11 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +flatpickr@^4.6.9: + version "4.6.9" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499" + integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw== + follow-redirects@^1.0.0: version "1.13.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"