diff --git a/package.json b/package.json index 253b1a66ea71246207fe748550651abd9d29f53f..de39240663e96a8c7daa5cc374564ecb88e62071 100644 --- a/package.json +++ b/package.json @@ -80,19 +80,14 @@ "yargs": "^16.2.0" }, "dependencies": { - "@fullcalendar/core": "^5.5.1", - "@fullcalendar/daygrid": "^5.5.0", - "@fullcalendar/interaction": "^5.5.0", - "@fullcalendar/list": "^5.5.0", - "@fullcalendar/timegrid": "^5.5.1", "@popperjs/core": "^2.6.0", "@tabler/icons": "^1.39.1", "apexcharts": "^3.24.0", "autosize": "^4.0.2", "bootstrap": "twbs/bootstrap#c93d754d35eadf6cb81a8fccef9ce091ea4f28c9", + "choices.js": "^9.0.1", "countup.js": "^2.0.7", "flatpickr": "^4.6.9", - "fullcalendar": "^5.5.1", "imask": "^6.0.5", "litepicker": "^2.0.3", "nouislider": "^14.6.3" diff --git a/src/pages/_data/libs.json b/src/pages/_data/libs.json index e191cc0668886bfa2a5d6b297e09a907e60a183a..e82d0e5569f8748cd27ffb5b850fbac5853deed3 100644 --- a/src/pages/_data/libs.json +++ b/src/pages/_data/libs.json @@ -13,10 +13,11 @@ "masonry": "https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js", "mapbox": "https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.js", "google-maps": "https://maps.googleapis.com/maps/api/js?key=GOOGLE_MAPS_KEY", - "litepicker": "litepicker/dist/litepicker.js" + "litepicker": "litepicker/dist/litepicker.js", + "choices": "choices.js/public/assets/scripts/choices.js" }, "css": { - "selectize": "selectize/dist/css/selectize.css", + "choices": "choices.js/public/assets/styles/choices.css", "nouislider": "nouislider/distribute/nouislider.min.css", "mapbox": "https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.css" } diff --git a/src/pages/_includes/forms/form-elements-6.html b/src/pages/_includes/forms/form-elements-6.html index 5bb955a59c04486b4ac076a5e5a78446f096b71b..ceedfcc71d132889828d33bd8289f5a30bf98887 100644 --- a/src/pages/_includes/forms/form-elements-6.html +++ b/src/pages/_includes/forms/form-elements-6.html @@ -33,30 +33,30 @@
- {% include ui/form/selectize.html key="tags" %} + {% include ui/select.html id="tags" key="tags" %}
- {% include ui/form/selectize.html key="tags-advanced" %} + {% include ui/select.html id="tags-advanced" key="tags-advanced" %}
- {% include ui/form/selectize.html key="users" %} + {% include ui/select.html id="users" key="users" %}
- {% include ui/form/selectize.html key="people" %} + {% include ui/select.html id="people" key="people" %}
- {% include ui/form/selectize.html key="countries" %} + {% include ui/select.html id="countries" key="countries" %}
- {% include ui/form/selectize.html key="countries" state="valid" select-id="states" %} + {% include ui/select.html id="countries" key="countries" state="valid" %}
\ No newline at end of file diff --git a/src/pages/_includes/parts/form/input-range.html b/src/pages/_includes/parts/form/input-range.html index fd6df9c395a590d58423fd2798e2b8d289b76826..c4962306e1447b53fd9a121ff8a475f8b59829a9 100644 --- a/src/pages/_includes/parts/form/input-range.html +++ b/src/pages/_includes/parts/form/input-range.html @@ -1,8 +1,8 @@
- {% include ui/form/range.html value=40 %} - {% include ui/form/range.html value="20" id="simple" connect=true %} - {% include ui/form/range.html value="60,90" id="connect" %} - {% include ui/form/range.html value="40" id="color" class="text-green" connect=true %} + {% include ui/range.html value=40 %} + {% include ui/range.html value="20" id="simple" connect=true %} + {% include ui/range.html value="60,90" id="connect" %} + {% include ui/range.html value="40" id="color" class="text-green" connect=true %}
diff --git a/src/pages/_includes/ui/form/selectize.html b/src/pages/_includes/ui/form/selectize.html deleted file mode 100644 index 8131b2cff22152c40f0471cb3137808afc71e47b..0000000000000000000000000000000000000000 --- a/src/pages/_includes/ui/form/selectize.html +++ /dev/null @@ -1,67 +0,0 @@ -{% assign key = include.key | default: 'people' %} -{% assign id = include.select-id | default: key %} -{% assign data = site.data.selects[key] %} -{% assign options = data.options %} - - - -{% capture_global scripts %} -{% comment %} - -{% endcomment %} -{% endcapture_global %} diff --git a/src/pages/_includes/ui/fullcalendar.html b/src/pages/_includes/ui/fullcalendar.html deleted file mode 100644 index 8cf7f9fbd3f372c0928ca75ae169e534973f1781..0000000000000000000000000000000000000000 --- a/src/pages/_includes/ui/fullcalendar.html +++ /dev/null @@ -1,86 +0,0 @@ -{% assign calendar-id = include.calendar-id | default: 'main' %} - -
- -{% capture_global scripts %} - -{% endcapture_global %} diff --git a/src/pages/_includes/ui/form/range.html b/src/pages/_includes/ui/range.html similarity index 100% rename from src/pages/_includes/ui/form/range.html rename to src/pages/_includes/ui/range.html diff --git a/src/pages/_includes/ui/select.html b/src/pages/_includes/ui/select.html new file mode 100644 index 0000000000000000000000000000000000000000..26b427803260b2cf9feb73e7185c174c4a340310 --- /dev/null +++ b/src/pages/_includes/ui/select.html @@ -0,0 +1,42 @@ +{% assign id = include.id %} + +{% if id %} + +{% assign key = include.key | default: 'people' %} +{% assign data = site.data.selects[key] %} +{% assign options = data.options %} + + + + +{% capture script %} + +{% endcapture %} + + +{% if include.show-scripts %} +{{ script }} +{% else %} +{% capture_global scripts %} +{{ script }} +{% endcapture_global %} +{% endif %} + +{% endif %} \ No newline at end of file diff --git a/src/scss/tabler-vendors.scss b/src/scss/tabler-vendors.scss index 1563385ab2961d168012e8e74002d90c4275cbba..7453be9f2407ad6f1adba0620badf5da81963bd9 100644 --- a/src/scss/tabler-vendors.scss +++ b/src/scss/tabler-vendors.scss @@ -1,6 +1,5 @@ @import "config"; @import "vendor/apexcharts"; -@import "vendor/fullcalendar"; @import "vendor/nouislider"; @import "vendor/litepicker"; \ No newline at end of file diff --git a/src/scss/vendor/_choices.scss b/src/scss/vendor/_choices.scss new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/scss/vendor/_fullcalendar.scss b/src/scss/vendor/_fullcalendar.scss deleted file mode 100644 index 3495ad7ea8daba1565b5cb0f039dde885496caa5..0000000000000000000000000000000000000000 --- a/src/scss/vendor/_fullcalendar.scss +++ /dev/null @@ -1,63 +0,0 @@ - -.fc-unthemed { - .fc-content, - .fc-divider, - .fc-list-heading td, - .fc-list-view, - .fc-popover, - .fc-row, - tbody, - td, - th, - thead { - border-color: $border-color; - } - - .fc-toolbar { - h2 { - font-size: $h2-font-size; - margin: 0; - } - } - - .fc-button { - //@include button-variant($white, $border-color, $text-muted); - //@include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-border-radius); - //@include transition($btn-transition); - } - - .fc-widget-header { - border: 0; - } - - .fc-day-header { - padding-bottom: .25rem; - font-weight: $font-weight-bold; - } - - &.card-calendar { - .fc-day-grid-container { - border-bottom: 0; - border-left: 0; - - td:last-child { - //border-right: 0; - } - - td:first-child { - //border-left: 0; - } - } - } - - .fc-time { - font-weight: $font-weight-bold; - } - - .fc-event { - border-color: rgba(0, 0, 0, .05); - color: $primary; - background-color: theme-color-lighter($primary); - padding: 0 .25rem; - } -}