diff --git a/nova-components/ClientIdAndSecretModal/resources/js/components/ClientIdAndSecretModal.vue b/nova-components/ClientIdAndSecretModal/resources/js/components/ClientIdAndSecretModal.vue index 85528b262..8b6b47e41 100644 --- a/nova-components/ClientIdAndSecretModal/resources/js/components/ClientIdAndSecretModal.vue +++ b/nova-components/ClientIdAndSecretModal/resources/js/components/ClientIdAndSecretModal.vue @@ -53,12 +53,12 @@ -
+
Close diff --git a/nova-components/PersonalAccessTokenModal/resources/js/components/PersonalAccessTokenModal.vue b/nova-components/PersonalAccessTokenModal/resources/js/components/PersonalAccessTokenModal.vue index a7b7422f3..2665a4002 100644 --- a/nova-components/PersonalAccessTokenModal/resources/js/components/PersonalAccessTokenModal.vue +++ b/nova-components/PersonalAccessTokenModal/resources/js/components/PersonalAccessTokenModal.vue @@ -18,12 +18,12 @@ /> -
+
Close diff --git a/package-lock.json b/package-lock.json index 143a6f9f1..659abcc15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,17 +5,16 @@ "packages": { "": { "dependencies": { + "@popperjs/core": "2.11.8", "@sentry/vue": "8.42.0", "axios": "1.7.9", "caniuse-lite": "1.0.30001688", "chartist": "0.11.4", "chartist-plugin-legend": "0.6.2", "chartist-plugin-pointlabels": "0.0.6", - "jquery": "3.7.1", "moment": "2.30.1", - "popper.js": "1.16.1", "sweetalert2": "11.14.5", - "vue": "2.7.16", + "vue": "^2.7.16", "vue-flatpickr-component": "8.1.8", "vue-moment": "4.1.0", "vue-select": "3.20.3", @@ -25,7 +24,7 @@ "devDependencies": { "@sentry/webpack-plugin": "1.21.0", "alex": "11.0.1", - "bootstrap": "4.6.2", + "bootstrap": "5.3.3", "cross-env": "5.2.1", "laravel-mix": "6.0.49", "lodash": "4.17.21", @@ -2064,6 +2063,15 @@ "node": ">=12" } }, + "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==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@sentry-internal/browser-utils": { "version": "8.42.0", "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.42.0.tgz", @@ -3640,24 +3648,16 @@ "license": "ISC" }, "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.0.0.tgz", + "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/twbs" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - } - ], - "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.9.2" } }, "node_modules/boxen": { @@ -8074,12 +8074,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "license": "MIT" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -10990,17 +10984,6 @@ "node": ">=4" } }, - "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", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.49", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz", diff --git a/package.json b/package.json index 01e8a054f..fccbb4248 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "devDependencies": { "@sentry/webpack-plugin": "1.21.0", "alex": "11.0.1", - "bootstrap": "4.6.2", + "bootstrap": "5.3.3", "cross-env": "5.2.1", "laravel-mix": "6.0.49", "lodash": "4.17.21", @@ -26,17 +26,16 @@ "vue-loader": "15.11.1" }, "dependencies": { + "@popperjs/core": "2.11.8", "@sentry/vue": "8.42.0", "axios": "1.7.9", "caniuse-lite": "1.0.30001688", "chartist": "0.11.4", "chartist-plugin-legend": "0.6.2", "chartist-plugin-pointlabels": "0.0.6", - "jquery": "3.7.1", "moment": "2.30.1", - "popper.js": "1.16.1", "sweetalert2": "11.14.5", - "vue": "2.7.16", + "vue": "^2.7.16", "vue-flatpickr-component": "8.1.8", "vue-moment": "4.1.0", "vue-select": "3.20.3", diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 5e21176b9..56791c86f 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -9,8 +9,7 @@ window._ = require('lodash'); */ try { - window.$ = window.jQuery = require('jquery'); - window.Popper = require('popper.js').default; + window.Popper = require('@popperjs/core').default; require('bootstrap'); } catch (e) { } diff --git a/resources/js/components/ResumeUploadForm.vue b/resources/js/components/ResumeUploadForm.vue index e61618804..56ddf0aa0 100644 --- a/resources/js/components/ResumeUploadForm.vue +++ b/resources/js/components/ResumeUploadForm.vue @@ -8,20 +8,13 @@ to ensure they're always accurate.

Your resume must be a one page PDF. The maximum file size is 1MB.

-
- -
-
-
- + + - -
-
-
-
+
diff --git a/resources/js/components/UserEditForm.vue b/resources/js/components/UserEditForm.vue index f2e3f1a60..16e8355b9 100644 --- a/resources/js/components/UserEditForm.vue +++ b/resources/js/components/UserEditForm.vue @@ -5,7 +5,7 @@

GT Directory Info

Information obtained via GT Single Sign-On. Update at Passport.

-
+
@@ -17,7 +17,7 @@
-
+
@@ -26,7 +26,7 @@

Additional Information

-
+
-
+
-
+
-
+

Graduation Information

-
+
Emergency Contact

Emergency contact information is required for all trips off campus.

-
+
-
+
Air Travel Information

Legal name, legal gender, and date of birth are required for booking air travel for you to attend competitions and will not be used for any other purpose. This information must exactly match your government-issued identification to comply with TSA Secure Flight requirements. Please see Delta Air Lines guidance on gender identifiers if needed.

-
+
-
+
-
+
-
+
- @@ -171,14 +171,14 @@
-
+
-
+
@@ -187,7 +187,7 @@

Linked Accounts

-
+
@@ -199,7 +199,7 @@
-
+
@@ -211,7 +211,7 @@
-
+
@@ -228,7 +228,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
{{feedback}}
diff --git a/resources/js/components/dues/Demographics.vue b/resources/js/components/dues/Demographics.vue index 9f02d19fc..6e2c25891 100644 --- a/resources/js/components/dues/Demographics.vue +++ b/resources/js/components/dues/Demographics.vue @@ -5,7 +5,7 @@

Demographics

RoboJackets collects demographics data from members in order to supply aggregate statistics to Georgia Tech and corporate sponsors. Identifiable data is never provided.

-
+
@@ -13,7 +13,7 @@
-
+
@@ -23,11 +23,11 @@
- +
- - + +
diff --git a/resources/js/components/dues/DuesAdditionalInfo.vue b/resources/js/components/dues/DuesAdditionalInfo.vue index ef69f1478..a747580a0 100644 --- a/resources/js/components/dues/DuesAdditionalInfo.vue +++ b/resources/js/components/dues/DuesAdditionalInfo.vue @@ -5,7 +5,7 @@

Additional Information

Providing RoboJackets with this optional information enables the RoboJackets leadership to better serve you.

-
+
-
+
Emergency Contact Information

You may optionally provide information on who to contact in the event of an emergency. This information is required should you go on any RoboJackets trips.

-
+
-
+
- +
- - + +
diff --git a/resources/js/components/dues/DuesRequiredInfo.vue b/resources/js/components/dues/DuesRequiredInfo.vue index a337fc4c8..a5ea16d84 100644 --- a/resources/js/components/dues/DuesRequiredInfo.vue +++ b/resources/js/components/dues/DuesRequiredInfo.vue @@ -5,21 +5,21 @@

GT Directory Info

Information obtained via GT Single Sign-On. Update at Passport.

-
+
-
+
-
+
@@ -28,7 +28,7 @@

Membership Information

-
+
- - + +
diff --git a/resources/js/components/dues/DuesSequence.vue b/resources/js/components/dues/DuesSequence.vue index b758e1b56..2f2cbd0c1 100644 --- a/resources/js/components/dues/DuesSequence.vue +++ b/resources/js/components/dues/DuesSequence.vue @@ -29,10 +29,10 @@
- +
- +
diff --git a/resources/js/components/fields/CustomRadioButtons.vue b/resources/js/components/fields/CustomRadioButtons.vue index 8f3f9e69d..38d84fadc 100644 --- a/resources/js/components/fields/CustomRadioButtons.vue +++ b/resources/js/components/fields/CustomRadioButtons.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/components/fields/TermInput.vue b/resources/js/components/fields/TermInput.vue index a60d45334..8acdb1b19 100644 --- a/resources/js/components/fields/TermInput.vue +++ b/resources/js/components/fields/TermInput.vue @@ -1,6 +1,6 @@