From e7a1f32939b0b0721d4491dc1923cc2b3d7484fa Mon Sep 17 00:00:00 2001 From: Alexander Volz Date: Thu, 19 Oct 2023 00:16:16 +0200 Subject: [PATCH 01/71] begin bootstrap5 migration --- src/package-lock.json | 41 +++--- src/package.json | 5 +- src/resources/assets/sass/admin.scss | 2 +- src/resources/views/accounts/email.blade.php | 4 +- src/resources/views/accounts/index.blade.php | 26 ++-- .../views/accounts/removesso.blade.php | 10 +- .../views/admin/credit/index.blade.php | 16 +-- .../views/admin/events/index.blade.php | 26 ++-- .../admin/events/participants/index.blade.php | 2 +- .../admin/events/participants/show.blade.php | 10 +- .../admin/events/seating/index.blade.php | 10 +- .../views/admin/events/seating/show.blade.php | 30 ++--- .../views/admin/events/show.blade.php | 98 +++++++------- .../views/admin/events/tickets/show.blade.php | 2 +- .../admin/events/timetables/index.blade.php | 2 +- .../admin/events/timetables/show.blade.php | 22 ++-- .../admin/events/tournaments/index.blade.php | 24 ++-- .../admin/events/tournaments/show.blade.php | 28 ++-- .../views/admin/events/venues/index.blade.php | 18 +-- .../views/admin/events/venues/show.blade.php | 20 +-- .../views/admin/gallery/index.blade.php | 4 +- .../views/admin/gallery/show.blade.php | 14 +- .../views/admin/games/index.blade.php | 30 ++--- .../views/admin/games/show.blade.php | 120 +++++++++--------- .../views/admin/help/index.blade.php | 4 +- src/resources/views/admin/help/show.blade.php | 26 ++-- src/resources/views/admin/index.blade.php | 68 +++++----- .../views/admin/mailing/index.blade.php | 16 +-- .../views/admin/mailing/show.blade.php | 6 +- .../views/admin/matchmaking/index.blade.php | 50 ++++---- .../views/admin/matchmaking/show.blade.php | 58 ++++----- .../views/admin/news/index.blade.php | 12 +- src/resources/views/admin/news/show.blade.php | 6 +- .../views/admin/orders/show.blade.php | 38 +++--- .../views/admin/polls/index.blade.php | 10 +- .../views/admin/polls/show.blade.php | 16 +-- .../views/admin/purchases/index.blade.php | 12 +- .../views/admin/purchases/show.blade.php | 22 ++-- .../views/admin/settings/api.blade.php | 18 +-- .../views/admin/settings/appearance.blade.php | 14 +- .../views/admin/settings/auth.blade.php | 8 +- .../views/admin/settings/index.blade.php | 6 +- .../views/admin/settings/org.blade.php | 22 ++-- .../views/admin/settings/payments.blade.php | 4 +- .../views/admin/settings/systems.blade.php | 4 +- .../views/admin/shop/category.blade.php | 6 +- .../views/admin/shop/index.blade.php | 20 +-- src/resources/views/admin/shop/item.blade.php | 18 +-- .../views/admin/users/index.blade.php | 2 +- .../views/admin/users/show.blade.php | 10 +- src/resources/views/auth/login.blade.php | 10 +- .../views/auth/passwords/email.blade.php | 6 +- .../views/auth/passwords/reset.blade.php | 14 +- src/resources/views/auth/register.blade.php | 16 +-- src/resources/views/events/home.blade.php | 40 +++--- src/resources/views/events/show.blade.php | 56 ++++---- .../views/events/tournaments/show.blade.php | 12 +- src/resources/views/help/index.blade.php | 8 +- src/resources/views/home.blade.php | 4 +- src/resources/views/install.blade.php | 26 ++-- .../_admin/_event/_tickets/form.blade.php | 20 +-- .../_admin/_event/dashMini.blade.php | 48 +++---- .../_admin/_settings/dashMini.blade.php | 28 ++-- .../_partials/_admin/navigation.blade.php | 10 +- .../layouts/_partials/_gifts/modal.blade.php | 4 +- .../_partials/_matchmaking/card.blade.php | 22 ++-- .../_news/comment-warnings.blade.php | 10 +- .../layouts/_partials/_news/comment.blade.php | 6 +- .../layouts/_partials/_news/long.blade.php | 2 +- .../layouts/_partials/_news/short.blade.php | 2 +- .../_partials/_polls/add-options.blade.php | 6 +- .../layouts/_partials/_polls/votes.blade.php | 4 +- .../_partials/_shop/basket-preview.blade.php | 4 +- .../_partials/_shop/navigation.blade.php | 2 +- .../_partials/_tickets/index.blade.php | 6 +- .../_partials/_tournaments/brackets.blade.php | 38 +++--- .../_tournaments/navigation.blade.php | 2 +- .../_tournaments/participants.blade.php | 6 +- .../_tournaments/standings.blade.php | 12 +- .../_partials/events-navigation.blade.php | 6 +- .../layouts/_partials/navigation.blade.php | 4 +- .../_partials/user-navigation.blade.php | 2 +- .../views/layouts/admin-default.blade.php | 6 +- src/resources/views/layouts/default.blade.php | 8 +- .../views/matchmaking/index.blade.php | 14 +- .../views/matchmaking/show.blade.php | 70 +++++----- src/resources/views/news/show.blade.php | 2 +- .../views/payments/checkout.blade.php | 8 +- .../views/payments/delivery.blade.php | 18 +-- .../views/payments/details.blade.php | 4 +- src/resources/views/shop/basket.blade.php | 8 +- src/resources/views/shop/item.blade.php | 2 +- .../views/shop/orders/show.blade.php | 16 +-- .../views/tournaments/view.blade.php | 8 +- src/webpack.mix.js | 7 +- 95 files changed, 816 insertions(+), 831 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index 035f395bd..2726f6f4e 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -6,10 +6,9 @@ "": { "dependencies": { "@fortawesome/fontawesome-free": "6.4.2", - "bootstrap": "4.6.2", + "@popperjs/core": "2.11.8", + "bootstrap": "5.3.2", "jquery": "3.7.1", - "jquery-ui-dist": "1.13.2", - "popper.js": "1.16.1", "summernote": "0.8.20" }, "devDependencies": { @@ -1858,6 +1857,15 @@ "node": ">= 8" } }, + "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/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", @@ -2804,9 +2812,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.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", "funding": [ { "type": "github", @@ -2818,8 +2826,7 @@ } ], "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { @@ -5421,14 +5428,6 @@ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, - "node_modules/jquery-ui-dist": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz", - "integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==", - "dependencies": { - "jquery": ">=1.8.0 <4.0.0" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6464,16 +6463,6 @@ "node": ">=8" } }, - "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", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", diff --git a/src/package.json b/src/package.json index ab6ba61e1..e42ea3ef9 100644 --- a/src/package.json +++ b/src/package.json @@ -19,10 +19,9 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "6.4.2", - "bootstrap": "4.6.2", + "bootstrap": "5.3.2", "jquery": "3.7.1", - "jquery-ui-dist": "1.13.2", - "popper.js": "1.16.1", + "@popperjs/core": "2.11.8", "summernote": "0.8.20" } } diff --git a/src/resources/assets/sass/admin.scss b/src/resources/assets/sass/admin.scss index 2c87948f2..a170b411d 100644 --- a/src/resources/assets/sass/admin.scss +++ b/src/resources/assets/sass/admin.scss @@ -5,7 +5,7 @@ @import "node_modules/bootstrap/scss/bootstrap"; @import "stylesheets/bootstrap_custom"; @import "stylesheets/bootstrap_custom_admin"; -@import "node_modules/summernote/src/styles/bs4/summernote-bs4"; +@import "node_modules/summernote/src/styles/bs5/summernote-bs5"; // @import "stylesheets/app/vendor/bootstrap"; @import "stylesheets/admin/sb-admin", "stylesheets/admin/modules/morris"; diff --git a/src/resources/views/accounts/email.blade.php b/src/resources/views/accounts/email.blade.php index 5f32dc43e..7dd740d9d 100644 --- a/src/resources/views/accounts/email.blade.php +++ b/src/resources/views/accounts/email.blade.php @@ -22,7 +22,7 @@
@if (Settings::isAuthAllowEmailChangeEnabled() || (!$user->email && Settings::isAuthSteamRequireEmailEnabled())) -
+
{{ Form::label('email',__('accounts.email'),array('id'=>'','class'=>'')) }} @error('email') @@ -34,7 +34,7 @@ @endif @if (Settings::isAuthRequirePhonenumberEnabled()) -
+
{{ Form::label('phonenumber',__('accounts.phonenumber'),array('id'=>'','class'=>'')) }} @error('phonenumber') diff --git a/src/resources/views/accounts/index.blade.php b/src/resources/views/accounts/index.blade.php index 376c6398e..8f7c96b82 100644 --- a/src/resources/views/accounts/index.blade.php +++ b/src/resources/views/accounts/index.blade.php @@ -42,30 +42,30 @@
-
+
{{ Form::label('firstname',__('accounts.firstname'),array('id'=>'','class'=>'')) }}
-
+
{{ Form::label('surname',__('accounts.surname'),array('id'=>'','class'=>'')) }}
-
+
{{ Form::label('Username',__('accounts.username'),array('id'=>'','class'=>'')) }} {{ Form::text('name', $user->username ,array('id'=>'name','class'=>'form-control', 'disabled' => 'disabled')) }}
@if ($user->steamid && $user->steamname) -
+
{{ Form::label('steamname',__('accounts.steamname'),array('id'=>'','class'=>'')) }} {{ Form::text('steamname', $user->steamname ,array('id'=>'steamname','class'=>'form-control', 'disabled'=>'true')) }}
@endif @if ($user->password) -
+
@error('password1') @@ -74,7 +74,7 @@ @enderror
-
+
@error('password2') @@ -103,7 +103,7 @@
-
+
{{ Form::label('email',__('accounts.email'),array('id'=>'','class'=>'')) }} @error('email') @@ -114,7 +114,7 @@
@if (Settings::isAuthRequirePhonenumberEnabled()) -
+
{{ Form::label('phonenumber',__('accounts.phonenumber'),array('id'=>'','class'=>'')) }} @error('phonenumber') @@ -376,7 +376,7 @@
-
+
{{ Form::label('token_name',__('accounts.token_name'),array('id'=>'','class'=>'')) }} {{ Form::text('token_name', null ,array('id'=>'token_name','class'=>'form-control')) }}
@@ -424,7 +424,7 @@

@lang('accounts.danger_zone')

- +
@@ -438,11 +438,11 @@
- +
{{ Form::open(array('url'=>'/account/delete/', 'id'=>'confirmDeleteFormModal')) }}
-
+

@lang('accounts.remove_account_line1')

@lang('accounts.remove_account_all') @lang('accounts.remove_account_line2')

@lang('accounts.remove_account_all') @lang('accounts.remove_account_line3')

@@ -454,7 +454,7 @@
- +
{{ Form::close() }}
diff --git a/src/resources/views/accounts/removesso.blade.php b/src/resources/views/accounts/removesso.blade.php index 3e5004154..512b520e6 100644 --- a/src/resources/views/accounts/removesso.blade.php +++ b/src/resources/views/accounts/removesso.blade.php @@ -57,7 +57,7 @@
@if ($user->email) -
+
{{ Form::label('email',__('accounts.email'),array('id'=>'','class'=>'')) }} @if(Settings::isAuthAllowEmailChangeEnabled()) @@ -73,7 +73,7 @@ @enderror
@else -
+
{{ Form::label('email',__('accounts.email'),array('id'=>'','class'=>'')) }} @error('email') @@ -95,9 +95,9 @@
-
+
-
+
@error('password1') @@ -106,7 +106,7 @@ @enderror
-
+
@error('password2') diff --git a/src/resources/views/admin/credit/index.blade.php b/src/resources/views/admin/credit/index.blade.php index 126afbd98..f5832c43a 100644 --- a/src/resources/views/admin/credit/index.blade.php +++ b/src/resources/views/admin/credit/index.blade.php @@ -118,11 +118,11 @@
{{ Form::open(array('url'=>'/admin/credit/edit')) }} -
+
{{ Form::label('user','User',array('id'=>'','class'=>'')) }} {{ Form::text('user', '',array('id'=>'user','class'=>'form-control typeahead')) }}
-
+
{{ Form::label('amount','Amount',array('id'=>'','class'=>'')) }} {{ Form::number('amount', '',array('id'=>'amount','class'=>'form-control')) }}
@@ -140,21 +140,21 @@
-
+
{{ Form::label('tournament_participation','Participation') }} {{ Form::number('tournament_participation', $creditAwardTournamentParticipation, array('id'=>'tournament_participation','class'=>'form-control'))}}
-
+
{{ Form::label('tournament_second','Second Place') }} {{ Form::number('tournament_second', $creditAwardTournamentSecond, array('id'=>'tournament_second','class'=>'form-control'))}}
-
+
{{ Form::label('tournament_first','First Place') }} {{ Form::number('tournament_first', $creditAwardTournamentFirst, array('id'=>'tournament_first','class'=>'form-control'))}}
-
+
{{ Form::label('tournament_third','Third Place') }} {{ Form::number('tournament_third', $creditAwardTournamentThird, array('id'=>'tournament_third','class'=>'form-control'))}}
@@ -162,11 +162,11 @@

Registration

-
+
{{ Form::label('registration_event','Event') }} {{ Form::number('registration_event', $creditAwardRegistrationEvent, array('id'=>'registration_event','class'=>'form-control'))}}
-
+
{{ Form::label('registration_site','Site') }} {{ Form::number('registration_site', $creditAwardRegistrationSite, array('id'=>'registration_site','class'=>'form-control'))}}
diff --git a/src/resources/views/admin/events/index.blade.php b/src/resources/views/admin/events/index.blade.php index 33b18dc0b..cd3cac215 100644 --- a/src/resources/views/admin/events/index.blade.php +++ b/src/resources/views/admin/events/index.blade.php @@ -72,52 +72,52 @@
{{ Form::open(array('url'=>'/admin/events/')) }} -
+
{{ Form::label('event_name','Event Name',array('id'=>'','class'=>'')) }} {{ Form::text('event_name', '',array('id'=>'event_name','class'=>'form-control')) }}
-
+
{{ Form::label('start_date','Start Date',array('id'=>'','class'=>'')) }} {{ Form::text('start_date', '',array('id'=>'start_date','class'=>'form-control')) }}
-
+
{{ Form::label('start_time','Start Time',array('id'=>'','class'=>'')) }} {{ Form::text('start_time', '16:00',array('id'=>'start_time','class'=>'form-control')) }}
-
+
{{ Form::label('end_date','End Date',array('id'=>'','class'=>'')) }} {{ Form::text('end_date', '',array('id'=>'end_date','class'=>'form-control')) }}
-
+
{{ Form::label('end_time','End Time',array('id'=>'','class'=>'')) }} {{ Form::text('end_time', '18:00',array('id'=>'end_time','class'=>'form-control')) }}
-
+
{{ Form::label('desc_short','Short Description',array('id'=>'','class'=>'')) }} {{ Form::textarea('desc_short', '',array('id'=>'desc_short','class'=>'form-control wysiwyg-editor-small', 'rows'=>'2')) }}
-
+
{{ Form::label('desc_long','Long Description',array('id'=>'','class'=>'')) }} {{ Form::textarea('desc_long', '',array('id'=>'desc_long','class'=>'form-control wysiwyg-editor-small', 'rows'=>'2')) }}
-
+
{{ Form::label('essential_info','Essential Info',array('id'=>'','class'=>'')) }} {{ Form::textarea('essential_info', '',array('id'=>'essential_info','class'=>'form-control wysiwyg-editor-small', 'rows'=>'2')) }}
-
+
{{ Form::label('event_live_info','Event Live Info',array('id'=>'','class'=>'')) }} {{ Form::textarea('event_live_info', '',array('id'=>'event_live_info','class'=>'form-control wysiwyg-editor-small', 'rows'=>'2')) }}
-
+
{{ Form::label('capacity','Capacity',array('id'=>'','class'=>'')) }} {{ Form::text('capacity', '',array('id'=>'capacity','class'=>'form-control')) }}
-
+
{{ Form::label('venue','Venue',array('id'=>'','class'=>'')) }} {{ Form::select('venue', Helpers::getVenues(), null, array('id'=>'venue','class'=>'form-control')) }}
@@ -137,7 +137,7 @@ {{ Form::checkbox('private_participants', null, false, array('id'=>'private_participants')) }} Private participants (show participants only to participants)
-
+
@if ($eventTags) -
+

These are used and edited on the Eventula Hub site

diff --git a/src/resources/views/admin/events/participants/index.blade.php b/src/resources/views/admin/events/participants/index.blade.php index 9e0fbd04a..99230ed16 100644 --- a/src/resources/views/admin/events/participants/index.blade.php +++ b/src/resources/views/admin/events/participants/index.blade.php @@ -31,7 +31,7 @@ All Participants {{ Form::open(array('url'=>'/admin/events/' . $event->slug . '/participants/signoutall' , 'onsubmit' => 'return ConfirmSignOutAll()')) }} {{ Form::hidden('_method', 'GET') }} - + {{ Form::close() }} Freebies
diff --git a/src/resources/views/admin/events/participants/show.blade.php b/src/resources/views/admin/events/participants/show.blade.php index 6ab827359..b13540748 100644 --- a/src/resources/views/admin/events/participants/show.blade.php +++ b/src/resources/views/admin/events/participants/show.blade.php @@ -106,7 +106,7 @@ @endif @if ((!$participant->signed_in) && ((!$participant->ticket) || ($participant->purchase->status == "Success") )) {{ Form::open(array('url'=>'/admin/events/' . $event->slug . '/participants/' . $participant->id . '/transfer')) }} -
+
{{ Form::label('event_id','Transfer to event',array('id'=>'','class'=>'')) }} {{ Form::select( @@ -120,23 +120,23 @@ ) }}
-
+
{{ Form::close() }}
{{ Form::open(array('url'=>'/admin/events/' . $event->slug . '/participants/' . $participant->id . '/signin')) }} -
+
{{ Form::close() }}
-
+
@endif @if ((!$participant->signed_in) && ($participant->ticket) && ($participant->purchase->status != "Success")) -
+
complete payment to transfer or sign in the user
@endif diff --git a/src/resources/views/admin/events/seating/index.blade.php b/src/resources/views/admin/events/seating/index.blade.php index 90eff99d0..dd5c7c78b 100644 --- a/src/resources/views/admin/events/seating/index.blade.php +++ b/src/resources/views/admin/events/seating/index.blade.php @@ -80,26 +80,26 @@
{{ Form::open(array('url'=>'/admin/events/' . $event->slug . '/seating', 'files' => 'true')) }} -
+
{{ Form::label('name','Name',array('id'=>'','class'=>'')) }} {{ Form::text('name', NULL ,array('id'=>'name','class'=>'form-control')) }}
-
+
{{ Form::label('name_short','Short Name',array('id'=>'','class'=>'')) }} {{ Form::text('name_short', NULL,array('id'=>'name_short','class'=>'form-control')) }} For display on Attendance Lists
-
+
{{ Form::label('columns','Columns',array('id'=>'','class'=>'')) }} {{ Form::text('columns', NULL ,array('id'=>'columns','class'=>'form-control')) }}
-
+
{{ Form::label('rows','Rows',array('id'=>'','class'=>'')) }} {{ Form::text('rows', NULL ,array('id'=>'rows','class'=>'form-control')) }}
-
+
{{ Form::label('image','Seating Plan Image',array('id'=>'','class'=>'')) }} {{ Form::file('image',array('id'=>'image','class'=>'form-control')) }}
diff --git a/src/resources/views/admin/events/seating/show.blade.php b/src/resources/views/admin/events/seating/show.blade.php index e4b763de1..02f5d1dc7 100644 --- a/src/resources/views/admin/events/seating/show.blade.php +++ b/src/resources/views/admin/events/seating/show.blade.php @@ -62,16 +62,16 @@ ?> @endforeach @if($status == 'ACTIVE' && isset($seat->eventParticipant)) - @else - @endif @else - @endif @@ -128,7 +128,7 @@ @endif - + @endif @@ -150,11 +150,11 @@
{{ Form::open(array('url'=>'/admin/events/' . $event->slug . '/seating/' . $seatingPlan->slug, 'files' => 'true')) }}
-
+
{{ Form::label('name','Name',array('id'=>'','class'=>'')) }} {{ Form::text('name', $seatingPlan->name ,array('id'=>'name','class'=>'form-control')) }}
-
+
{{ Form::label('name_short','Short Name',array('id'=>'','class'=>'')) }} {{ Form::text('name_short', $seatingPlan->name_short ,array('id'=>'name_short','class'=>'form-control')) }} For display on Attendance Lists @@ -162,7 +162,7 @@
-
+
{{ Form::label('event_status','Status',array('id'=>'','class'=>'')) }} {{ Form::select( @@ -182,20 +182,20 @@
-
+
{{ Form::label('columns','Columns',array('id'=>'','class'=>'')) }} {{ Form::text('columns', $seatingPlan->columns ,array('id'=>'columns','class'=>'form-control')) }}
-
+
{{ Form::label('rows','Rows',array('id'=>'','class'=>'')) }} {{ Form::text('rows', $seatingPlan->rows ,array('id'=>'rows','class'=>'form-control')) }}
-
+
{{ Form::label('image','Seating Plan Image',array('id'=>'','class'=>'')) }} {{ Form::file('image',array('id'=>'image','class'=>'form-control')) }}
-
+