diff --git a/app/_config/templates-requirements.yml b/app/_config/templates-requirements.yml index 3fc7763..43e98b8 100644 --- a/app/_config/templates-requirements.yml +++ b/app/_config/templates-requirements.yml @@ -13,7 +13,7 @@ A2nt\CMSNiceties\Templates\DeferredRequirements: jquery_version: '3.4.1' SilverStripe\FontAwesome\FontAwesomeField: - version: '5.15.4' + version: '6.4.2' SilverStripe\View\Requirements: disable_flush_combined: true diff --git a/app/client/src/js/app.js b/app/client/src/js/app.js index 14e82f8..d7feb1a 100644 --- a/app/client/src/js/app.js +++ b/app/client/src/js/app.js @@ -13,7 +13,8 @@ import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/main' import '@a2nt/meta-lightbox-js/src/js/app' import 'bootstrap/js/src/collapse' import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/dropdown' -import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/carousel' +//import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/carousel' +import "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/glide"; // import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/datepicker'; // import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ui/instagram.feed'; @@ -32,6 +33,9 @@ import '@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/ajax/lazy-images' */ import './layout' +/* + * Import fonts and images + */ function importAll (r) { return r.keys().map(r) } diff --git a/composer.json b/composer.json index 9c16c71..8ffaf14 100755 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ ], "license": "BSD-3-Clause", "require": { - "php": ">=7.4.0", + "php": ">=8", "ext-json": "*", "silverstripe/recipe-cms": "^4", "silverstripe/recipe-plugin": "*", @@ -54,7 +54,6 @@ }, "require-dev": { "phpunit/phpunit": "*", - "lekoala/silverstripe-debugbar": "dev-master", "sunnysideup/easy-coding-standards": "dev-master", "silverleague/ideannotator": "dev-master" }, diff --git a/package.json b/package.json index 0ec0445..5249eda 100755 --- a/package.json +++ b/package.json @@ -35,10 +35,11 @@ ], "dependencies": { "@a2nt/meta-lightbox-js": "^4.2.4", - "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^5.0.2", + "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^5.0.4", "@angular/common": "^16.1.8", "@angular/core": "^16.1.8", "@apollo/client": "^3.7.17", + "@glidejs/glide": "^3.6.0", "@popperjs/core": "^2.11.8", "@turf/clone": "^6.5.0", "@turf/clusters-dbscan": "^6.5.0",