From 0e7c117a1b844074231a77cbab0dd9194e654f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Roso=C5=82owski?= <87621210+rr-adam@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:00:18 +0200 Subject: [PATCH] Upgrade to bootstrap 5 --- home/package-lock.json | 38 +- home/package.json | 3 +- home/src/components/FooterComponent.vue | 11 +- home/src/components/HeaderComponent.vue | 488 ++++++++++-------------- home/src/components/SlideCarousel.vue | 334 +++++++++------- home/src/main.js | 4 +- home/src/styles/global.scss | 17 + 7 files changed, 451 insertions(+), 444 deletions(-) diff --git a/home/package-lock.json b/home/package-lock.json index bbca4815..9cf1b092 100644 --- a/home/package-lock.json +++ b/home/package-lock.json @@ -9,8 +9,7 @@ "version": "1.0.0", "dependencies": { "@gtm-support/vue-gtm": "^2.2.0", - "bootstrap": "^4.6.2", - "jquery": "^3.7.1", + "bootstrap": "^5.3.3", "vite-plugin-static-copy": "^1.0.1", "vue": "^3.4.15", "vue-router": "^4.2.5" @@ -553,6 +552,16 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.9.6", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz", @@ -948,9 +957,9 @@ "dev": true }, "node_modules/bootstrap": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", - "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "funding": [ { "type": "github", @@ -962,8 +971,7 @@ } ], "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { @@ -1734,11 +1742,6 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -2044,17 +2047,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.34", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.34.tgz", diff --git a/home/package.json b/home/package.json index c8352f15..68684e59 100644 --- a/home/package.json +++ b/home/package.json @@ -12,8 +12,7 @@ }, "dependencies": { "@gtm-support/vue-gtm": "^2.2.0", - "bootstrap": "^4.6.2", - "jquery": "^3.7.1", + "bootstrap": "^5.3.3", "vite-plugin-static-copy": "^1.0.1", "vue": "^3.4.15", "vue-router": "^4.2.5" diff --git a/home/src/components/FooterComponent.vue b/home/src/components/FooterComponent.vue index 9f9a95d6..f1444283 100644 --- a/home/src/components/FooterComponent.vue +++ b/home/src/components/FooterComponent.vue @@ -25,15 +25,16 @@ href="https://www.youtube.com/user/EDMCouncil" class="social-icons" target="_blank" - v-on:click="outboundClick('youtube')" + @click="outboundClick('youtube')" aria-label="youtube" - >youtube icon + > + youtube icon + twitter icon @@ -42,7 +43,7 @@ href="https://www.linkedin.com/company/edm-council/" class="social-icons" target="_blank" - v-on:click="outboundClick('linkedin')" + @click="outboundClick('linkedin')" aria-label="linkedin" > linkedin icon diff --git a/home/src/components/HeaderComponent.vue b/home/src/components/HeaderComponent.vue index ab271557..1be93eaa 100644 --- a/home/src/components/HeaderComponent.vue +++ b/home/src/components/HeaderComponent.vue @@ -1,9 +1,9 @@ diff --git a/home/src/components/SlideCarousel.vue b/home/src/components/SlideCarousel.vue index 6189a3e4..2ea034d6 100644 --- a/home/src/components/SlideCarousel.vue +++ b/home/src/components/SlideCarousel.vue @@ -1,109 +1,39 @@