From d35871743b9667cf90d9dfa5401f1384f605c85d Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Sun, 10 Dec 2023 14:49:43 +0100 Subject: [PATCH 1/8] Removed old twitter package --- composer.json | 1 - composer.lock | 52 +-------------------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/composer.json b/composer.json index 435b7b12d..ee0dd32d9 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,6 @@ "sentry/sentry-laravel": "^2.11", "socialiteproviders/facebook": "^4.1", "socialiteproviders/twitch": "^5.3", - "socialiteproviders/twitter": "^4.1", "spatie/cpu-load-health-check": "^1.0", "spatie/laravel-activitylog": "^4.4", "spatie/laravel-health": "^1.19", diff --git a/composer.lock b/composer.lock index 901e76d7a..3f8e1f7ec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a5e27a5ea17a6e0363a1406628d3ac52", + "content-hash": "c7447b69519f6e7482d53df8c9c4b9dd", "packages": [ { "name": "akaunting/laravel-language", @@ -9388,56 +9388,6 @@ }, "time": "2020-12-01T23:10:59+00:00" }, - { - "name": "socialiteproviders/twitter", - "version": "4.1.2", - "source": { - "type": "git", - "url": "https://github.com/SocialiteProviders/Twitter.git", - "reference": "54ddc36c1475bbdc111a89edee1468e3c9cf1229" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Twitter/zipball/54ddc36c1475bbdc111a89edee1468e3c9cf1229", - "reference": "54ddc36c1475bbdc111a89edee1468e3c9cf1229", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0", - "socialiteproviders/manager": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "SocialiteProviders\\Twitter\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Faust", - "email": "hello@brianfaust.de" - } - ], - "description": "Twitter OAuth1 Provider for Laravel Socialite", - "keywords": [ - "laravel", - "oauth", - "provider", - "socialite", - "twitter" - ], - "support": { - "docs": "https://socialiteproviders.com/twitter", - "issues": "https://github.com/socialiteproviders/providers/issues", - "source": "https://github.com/socialiteproviders/providers" - }, - "time": "2023-05-25T23:12:53+00:00" - }, { "name": "spatie/cpu-load-health-check", "version": "1.0.4", From a369a96665ad30a3c5558bb1f052e11d95ad95ac Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Sun, 10 Dec 2023 14:57:48 +0100 Subject: [PATCH 2/8] Bump Jetstream --- composer.json | 2 +- composer.lock | 16 +- .../views/api/api-token-manager.blade.php | 64 ++++---- .../views/auth/confirm-password.blade.php | 16 +- .../views/auth/forgot-password.blade.php | 16 +- resources/views/auth/login.blade.php | 22 +-- resources/views/auth/register.blade.php | 38 ++--- resources/views/auth/reset-password.blade.php | 24 +-- .../views/auth/two-factor-challenge.blade.php | 20 +-- resources/views/auth/verify-email.blade.php | 10 +- .../components/action-message.blade.php | 0 .../components/action-section.blade.php | 4 +- .../components/application-logo.blade.php | 0 .../components/application-mark.blade.php | 0 .../authentication-card-logo.blade.php | 0 .../components/authentication-card.blade.php | 0 .../components/banner.blade.php | 0 .../components/button.blade.php | 0 .../components/checkbox.blade.php | 0 .../components/confirmation-modal.blade.php | 4 +- .../components/confirms-password.blade.php | 16 +- .../components/danger-button.blade.php | 0 .../components/dialog-modal.blade.php | 4 +- .../components/dropdown-link.blade.php | 0 .../components/dropdown.blade.php | 0 .../components/form-section.blade.php | 4 +- .../views/components/home/nav-menu.blade.php | 8 +- .../components/input-error.blade.php | 0 .../jetstream => }/components/input.blade.php | 0 .../jetstream => }/components/label.blade.php | 0 .../components/nav-link.blade.php | 0 .../components/responsive-nav-link.blade.php | 0 .../components/secondary-button.blade.php | 0 .../components/section-border.blade.php | 0 .../components/section-title.blade.php | 0 .../components/switchable-team.blade.php | 0 .../components/validation-errors.blade.php | 0 .../components/welcome.blade.php | 2 +- resources/views/contact.blade.php | 2 +- resources/views/layouts/app.blade.php | 2 +- resources/views/layouts/guest.blade.php | 2 +- resources/views/legal.blade.php | 2 +- .../livewire/blog/comment-modal.blade.php | 10 +- .../views/livewire/login/game-jolt.blade.php | 20 +-- .../views/livewire/login/xenforo.blade.php | 20 +-- .../views/livewire/notifications.blade.php | 4 +- .../connect-gamejolt-account.blade.php | 28 ++-- .../views/livewire/profile/consent.blade.php | 4 +- .../profile/discord-account.blade.php | 8 +- .../profile/facebook-account.blade.php | 8 +- .../livewire/profile/preference.blade.php | 4 +- .../livewire/profile/twitch-account.blade.php | 8 +- .../profile/twitter-account.blade.php | 8 +- .../profile/xenforo-account.blade.php | 30 ++-- .../livewire/resource/rating-create.blade.php | 14 +- .../resource/resource-delete.blade.php | 10 +- .../livewire/resource/resource-form.blade.php | 28 ++-- .../livewire/resource/update-create.blade.php | 24 +-- .../livewire/resource/update-show.blade.php | 4 +- .../livewire/review/review-form.blade.php | 18 +-- .../server/server-create-form.blade.php | 30 ++-- .../server/server-edit-form.blade.php | 30 ++-- resources/views/navigation-menu.blade.php | 152 +++++++++--------- resources/views/policy.blade.php | 2 +- .../views/profile/delete-user-form.blade.php | 24 +-- resources/views/profile/edit.blade.php | 24 +-- ...gout-other-browser-sessions-form.blade.php | 28 ++-- .../two-factor-authentication-form.blade.php | 36 ++--- .../profile/update-password-form.blade.php | 30 ++-- .../update-profile-information-form.blade.php | 62 +++---- resources/views/skin/create.blade.php | 22 +-- resources/views/skin/edit.blade.php | 12 +- resources/views/terms.blade.php | 2 +- .../jetstream/components/modal.blade.php | 68 -------- .../views/vendor/language/flags.blade.php | 8 +- 75 files changed, 496 insertions(+), 562 deletions(-) rename resources/views/{vendor/jetstream => }/components/action-message.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/action-section.blade.php (87%) rename resources/views/{vendor/jetstream => }/components/application-logo.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/application-mark.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/authentication-card-logo.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/authentication-card.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/banner.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/button.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/checkbox.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/confirmation-modal.blade.php (93%) rename resources/views/{vendor/jetstream => }/components/confirms-password.blade.php (68%) rename resources/views/{vendor/jetstream => }/components/danger-button.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/dialog-modal.blade.php (82%) rename resources/views/{vendor/jetstream => }/components/dropdown-link.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/dropdown.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/form-section.blade.php (94%) rename resources/views/{vendor/jetstream => }/components/input-error.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/input.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/label.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/nav-link.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/responsive-nav-link.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/secondary-button.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/section-border.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/section-title.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/switchable-team.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/validation-errors.blade.php (100%) rename resources/views/{vendor/jetstream => }/components/welcome.blade.php (98%) delete mode 100644 resources/views/vendor/jetstream/components/modal.blade.php diff --git a/composer.json b/composer.json index ee0dd32d9..9f5c21649 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "kkomelin/laravel-translatable-string-exporter": "^1.16", "knuckleswtf/scribe": "^4.21.2", "laravel/framework": "^9.19", - "laravel/jetstream": "^2.6", + "laravel/jetstream": "^3.0", "laravel/nova": "4.23.0", "laravel/sanctum": "^2.14", "laravel/socialite": "^5.5", diff --git a/composer.lock b/composer.lock index 3f8e1f7ec..05bae5bca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c7447b69519f6e7482d53df8c9c4b9dd", + "content-hash": "c50580d9ef7896f417d154434d38759e", "packages": [ { "name": "akaunting/laravel-language", @@ -4534,16 +4534,16 @@ }, { "name": "laravel/jetstream", - "version": "v2.16.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/laravel/jetstream.git", - "reference": "1b95df05aac85caffdbba9aeb6d22a49fc598dff" + "reference": "2af8f166436bf73c946f7187055d2df317d3e981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/jetstream/zipball/1b95df05aac85caffdbba9aeb6d22a49fc598dff", - "reference": "1b95df05aac85caffdbba9aeb6d22a49fc598dff", + "url": "https://api.github.com/repos/laravel/jetstream/zipball/2af8f166436bf73c946f7187055d2df317d3e981", + "reference": "2af8f166436bf73c946f7187055d2df317d3e981", "shasum": "" }, "require": { @@ -4560,14 +4560,16 @@ "require-dev": { "inertiajs/inertia-laravel": "^0.6.5", "laravel/sanctum": "^3.0", + "livewire/livewire": "^2.12", "mockery/mockery": "^1.0", "orchestra/testbench": "^7.0|^8.0", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" }, "laravel": { "providers": [ @@ -4600,7 +4602,7 @@ "issues": "https://github.com/laravel/jetstream/issues", "source": "https://github.com/laravel/jetstream" }, - "time": "2023-02-14T19:28:38+00:00" + "time": "2023-03-01T19:31:53+00:00" }, { "name": "laravel/nova", diff --git a/resources/views/api/api-token-manager.blade.php b/resources/views/api/api-token-manager.blade.php index 4e2dba035..61b6a1826 100644 --- a/resources/views/api/api-token-manager.blade.php +++ b/resources/views/api/api-token-manager.blade.php @@ -1,6 +1,6 @@
- + {{ __('Create API Token') }} @@ -12,20 +12,20 @@
- - - + + +
@if (Laravel\Jetstream\Jetstream::hasPermissions())
- +
@foreach (Laravel\Jetstream\Jetstream::$permissions as $permission) @endforeach @@ -35,22 +35,22 @@ - + {{ __('Created.') }} - + - + {{ __('Create') }} - + - + @if ($this->user->tokens->isNotEmpty()) - +
- + {{ __('Manage API Tokens') }} @@ -89,12 +89,12 @@ @endforeach
- +
@endif - + {{ __('API Token') }} @@ -104,7 +104,7 @@ {{ __("Please copy your new API token. For your security, it won't be shown again.") }}
- - + {{ __('Close') }} - + - + - + {{ __('API Token Permissions') }} @@ -128,7 +128,7 @@ class="w-full px-4 py-2 mt-4 font-mono text-sm text-slate-500 bg-slate-100 round
@foreach (Laravel\Jetstream\Jetstream::$permissions as $permission) @endforeach @@ -136,18 +136,18 @@ class="w-full px-4 py-2 mt-4 font-mono text-sm text-slate-500 bg-slate-100 round - + {{ __('Cancel') }} - + - + {{ __('Save') }} - + - + - + {{ __('Delete API Token') }} @@ -157,13 +157,13 @@ class="w-full px-4 py-2 mt-4 font-mono text-sm text-slate-500 bg-slate-100 round - + {{ __('Cancel') }} - + - + {{ __('Delete') }} - + - +
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index a9635290d..90e231c92 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -1,8 +1,8 @@ - + - + @@ -10,21 +10,21 @@ {{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
- +
@csrf
- - + +
- + {{ __('Confirm') }} - +
- + diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 0e7cabdc4..1df847e75 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -1,8 +1,8 @@ - + - + @@ -16,21 +16,21 @@ @endif - +
@csrf
- - + +
- + {{ __('Email Password Reset Link') }} - +
- + diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0c37352d2..3962f4958 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,8 +1,8 @@ - + - + @@ -42,7 +42,7 @@ - + @if (session('status'))
@@ -54,18 +54,18 @@ @csrf
- - + +
- - + +
@@ -79,11 +79,11 @@
@endif
- + {{ __('Log in') }} - +
@@ -148,7 +148,7 @@

{{ __('These login methods requires you to have a P3D account with a association to the social account') }}

@endif - + - +
@csrf
- - + +
- - + +
@@ -49,11 +49,11 @@ {{ __('Use an authentication code') }} - + {{ __('Log in') }} - +
- + diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 2b5f96245..a3ebbe772 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -1,8 +1,8 @@ - + - + @@ -21,9 +21,9 @@ @csrf
- + {{ __('Resend Verification Email') }} - +
@@ -35,5 +35,5 @@ - + diff --git a/resources/views/vendor/jetstream/components/action-message.blade.php b/resources/views/components/action-message.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/action-message.blade.php rename to resources/views/components/action-message.blade.php diff --git a/resources/views/vendor/jetstream/components/action-section.blade.php b/resources/views/components/action-section.blade.php similarity index 87% rename from resources/views/vendor/jetstream/components/action-section.blade.php rename to resources/views/components/action-section.blade.php index 94aab4742..0ae7ff3d1 100644 --- a/resources/views/vendor/jetstream/components/action-section.blade.php +++ b/resources/views/components/action-section.blade.php @@ -1,8 +1,8 @@
- + {{ $title }} {{ $description }} - +
diff --git a/resources/views/vendor/jetstream/components/application-logo.blade.php b/resources/views/components/application-logo.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/application-logo.blade.php rename to resources/views/components/application-logo.blade.php diff --git a/resources/views/vendor/jetstream/components/application-mark.blade.php b/resources/views/components/application-mark.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/application-mark.blade.php rename to resources/views/components/application-mark.blade.php diff --git a/resources/views/vendor/jetstream/components/authentication-card-logo.blade.php b/resources/views/components/authentication-card-logo.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/authentication-card-logo.blade.php rename to resources/views/components/authentication-card-logo.blade.php diff --git a/resources/views/vendor/jetstream/components/authentication-card.blade.php b/resources/views/components/authentication-card.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/authentication-card.blade.php rename to resources/views/components/authentication-card.blade.php diff --git a/resources/views/vendor/jetstream/components/banner.blade.php b/resources/views/components/banner.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/banner.blade.php rename to resources/views/components/banner.blade.php diff --git a/resources/views/vendor/jetstream/components/button.blade.php b/resources/views/components/button.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/button.blade.php rename to resources/views/components/button.blade.php diff --git a/resources/views/vendor/jetstream/components/checkbox.blade.php b/resources/views/components/checkbox.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/checkbox.blade.php rename to resources/views/components/checkbox.blade.php diff --git a/resources/views/vendor/jetstream/components/confirmation-modal.blade.php b/resources/views/components/confirmation-modal.blade.php similarity index 93% rename from resources/views/vendor/jetstream/components/confirmation-modal.blade.php rename to resources/views/components/confirmation-modal.blade.php index f14b497f7..ce39a1fb8 100644 --- a/resources/views/vendor/jetstream/components/confirmation-modal.blade.php +++ b/resources/views/components/confirmation-modal.blade.php @@ -1,6 +1,6 @@ @props(['id' => null, 'maxWidth' => null]) - +
@@ -24,4 +24,4 @@
{{ $footer }}
- + diff --git a/resources/views/vendor/jetstream/components/confirms-password.blade.php b/resources/views/components/confirms-password.blade.php similarity index 68% rename from resources/views/vendor/jetstream/components/confirms-password.blade.php rename to resources/views/components/confirms-password.blade.php index 50884e6c1..ca59830bd 100644 --- a/resources/views/vendor/jetstream/components/confirms-password.blade.php +++ b/resources/views/components/confirms-password.blade.php @@ -15,7 +15,7 @@ @once - + {{ $title }} @@ -24,23 +24,23 @@ {{ $content }}
- - +
- + {{ __('Cancel') }} - + - + {{ $button }} - + - + @endonce diff --git a/resources/views/vendor/jetstream/components/danger-button.blade.php b/resources/views/components/danger-button.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/danger-button.blade.php rename to resources/views/components/danger-button.blade.php diff --git a/resources/views/vendor/jetstream/components/dialog-modal.blade.php b/resources/views/components/dialog-modal.blade.php similarity index 82% rename from resources/views/vendor/jetstream/components/dialog-modal.blade.php rename to resources/views/components/dialog-modal.blade.php index fbfe139a8..ef5f83a54 100644 --- a/resources/views/vendor/jetstream/components/dialog-modal.blade.php +++ b/resources/views/components/dialog-modal.blade.php @@ -1,6 +1,6 @@ @props(['id' => null, 'maxWidth' => null]) - +
{{ $title }} @@ -14,4 +14,4 @@
{{ $footer }}
- + diff --git a/resources/views/vendor/jetstream/components/dropdown-link.blade.php b/resources/views/components/dropdown-link.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/dropdown-link.blade.php rename to resources/views/components/dropdown-link.blade.php diff --git a/resources/views/vendor/jetstream/components/dropdown.blade.php b/resources/views/components/dropdown.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/dropdown.blade.php rename to resources/views/components/dropdown.blade.php diff --git a/resources/views/vendor/jetstream/components/form-section.blade.php b/resources/views/components/form-section.blade.php similarity index 94% rename from resources/views/vendor/jetstream/components/form-section.blade.php rename to resources/views/components/form-section.blade.php index 92d7d8960..fb234af4c 100644 --- a/resources/views/vendor/jetstream/components/form-section.blade.php +++ b/resources/views/components/form-section.blade.php @@ -1,10 +1,10 @@ @props(['submit'])
merge(['class' => 'md:grid md:grid-cols-3 md:gap-6']) }}> - + {{ $title }} {{ $description }} - +
diff --git a/resources/views/components/home/nav-menu.blade.php b/resources/views/components/home/nav-menu.blade.php index a6418610a..f417647f0 100644 --- a/resources/views/components/home/nav-menu.blade.php +++ b/resources/views/components/home/nav-menu.blade.php @@ -76,7 +76,7 @@ @endguest
  • - +
    @include('vendor.language.flag') @@ -85,7 +85,7 @@ @include('vendor.language.flags') - +
    • @@ -157,7 +157,7 @@ --}} - +
    @include('vendor.language.flag') @@ -166,7 +166,7 @@ @include('vendor.language.flags') - +
    diff --git a/resources/views/vendor/jetstream/components/input-error.blade.php b/resources/views/components/input-error.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/input-error.blade.php rename to resources/views/components/input-error.blade.php diff --git a/resources/views/vendor/jetstream/components/input.blade.php b/resources/views/components/input.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/input.blade.php rename to resources/views/components/input.blade.php diff --git a/resources/views/vendor/jetstream/components/label.blade.php b/resources/views/components/label.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/label.blade.php rename to resources/views/components/label.blade.php diff --git a/resources/views/vendor/jetstream/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/nav-link.blade.php rename to resources/views/components/nav-link.blade.php diff --git a/resources/views/vendor/jetstream/components/responsive-nav-link.blade.php b/resources/views/components/responsive-nav-link.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/responsive-nav-link.blade.php rename to resources/views/components/responsive-nav-link.blade.php diff --git a/resources/views/vendor/jetstream/components/secondary-button.blade.php b/resources/views/components/secondary-button.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/secondary-button.blade.php rename to resources/views/components/secondary-button.blade.php diff --git a/resources/views/vendor/jetstream/components/section-border.blade.php b/resources/views/components/section-border.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/section-border.blade.php rename to resources/views/components/section-border.blade.php diff --git a/resources/views/vendor/jetstream/components/section-title.blade.php b/resources/views/components/section-title.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/section-title.blade.php rename to resources/views/components/section-title.blade.php diff --git a/resources/views/vendor/jetstream/components/switchable-team.blade.php b/resources/views/components/switchable-team.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/switchable-team.blade.php rename to resources/views/components/switchable-team.blade.php diff --git a/resources/views/vendor/jetstream/components/validation-errors.blade.php b/resources/views/components/validation-errors.blade.php similarity index 100% rename from resources/views/vendor/jetstream/components/validation-errors.blade.php rename to resources/views/components/validation-errors.blade.php diff --git a/resources/views/vendor/jetstream/components/welcome.blade.php b/resources/views/components/welcome.blade.php similarity index 98% rename from resources/views/vendor/jetstream/components/welcome.blade.php rename to resources/views/components/welcome.blade.php index 2d0bd3002..63e8562fd 100644 --- a/resources/views/vendor/jetstream/components/welcome.blade.php +++ b/resources/views/components/welcome.blade.php @@ -1,6 +1,6 @@
    - +
    diff --git a/resources/views/contact.blade.php b/resources/views/contact.blade.php index c50038f7a..b85294259 100644 --- a/resources/views/contact.blade.php +++ b/resources/views/contact.blade.php @@ -3,7 +3,7 @@
    diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f4f9399ef..d625be5ef 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -41,7 +41,7 @@ function $buo_f(){ @endif - + @if(Auth::user() && ! Auth::user()->hasGivenConsent(config('app.required_consent'))) diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index f37870f3b..11fd34291 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -57,7 +57,7 @@ function $buo_f(){
    @endif - + {{ $slot }} diff --git a/resources/views/legal.blade.php b/resources/views/legal.blade.php index 7ee1927ab..e946c7a11 100644 --- a/resources/views/legal.blade.php +++ b/resources/views/legal.blade.php @@ -3,7 +3,7 @@
    diff --git a/resources/views/livewire/blog/comment-modal.blade.php b/resources/views/livewire/blog/comment-modal.blade.php index 448153834..93e490452 100644 --- a/resources/views/livewire/blog/comment-modal.blade.php +++ b/resources/views/livewire/blog/comment-modal.blade.php @@ -6,15 +6,15 @@ @lang('Min characters'): 2 · @lang('Max characters'): 255 - + - + {{ __('Save') }} - - + + {{ __('Cancel') }} - + diff --git a/resources/views/livewire/login/game-jolt.blade.php b/resources/views/livewire/login/game-jolt.blade.php index 9c7e81669..6286b6680 100644 --- a/resources/views/livewire/login/game-jolt.blade.php +++ b/resources/views/livewire/login/game-jolt.blade.php @@ -1,4 +1,4 @@ - + @@ -15,15 +15,15 @@
    - - - + + +
    - - - + + +
    @@ -33,8 +33,8 @@ {{ $message }} @enderror - + {{ __('Log in') }} - + -     + diff --git a/resources/views/livewire/login/xenforo.blade.php b/resources/views/livewire/login/xenforo.blade.php index 5571e18c4..c65017b84 100644 --- a/resources/views/livewire/login/xenforo.blade.php +++ b/resources/views/livewire/login/xenforo.blade.php @@ -1,4 +1,4 @@ - + @@ -11,15 +11,15 @@
    - - - + + +
    - - - + + +
    @@ -29,8 +29,8 @@ {{ $message }} @enderror - + {{ __('Log in') }} - + -     + diff --git a/resources/views/livewire/notifications.blade.php b/resources/views/livewire/notifications.blade.php index e76774c77..38ce4c883 100644 --- a/resources/views/livewire/notifications.blade.php +++ b/resources/views/livewire/notifications.blade.php @@ -1,5 +1,5 @@
    - +
    @endforelse - +
    diff --git a/resources/views/livewire/profile/connect-gamejolt-account.blade.php b/resources/views/livewire/profile/connect-gamejolt-account.blade.php index 92054adb1..39b10d327 100644 --- a/resources/views/livewire/profile/connect-gamejolt-account.blade.php +++ b/resources/views/livewire/profile/connect-gamejolt-account.blade.php @@ -1,4 +1,4 @@ - + @@ -18,15 +18,15 @@ @if (!isset($verified_at))
    - - - + + +
    - - - + + +
    @else
    @@ -39,9 +39,9 @@ - + {{ __('Verified and saved.') }} - + @error('error') {{ $message }} @@ -52,13 +52,13 @@ @enderror @if (!isset($verified_at)) - + {{ __('Save') }} - + @else - + {{ __('Remove Association') }} - + @endif - + diff --git a/resources/views/livewire/profile/consent.blade.php b/resources/views/livewire/profile/consent.blade.php index 1f8d9b61f..968327d56 100644 --- a/resources/views/livewire/profile/consent.blade.php +++ b/resources/views/livewire/profile/consent.blade.php @@ -1,4 +1,4 @@ - + {{ __('Consents') }} @@ -36,4 +36,4 @@ class=" @endforeach - + diff --git a/resources/views/livewire/profile/discord-account.blade.php b/resources/views/livewire/profile/discord-account.blade.php index 70f5daaf4..faab39b00 100644 --- a/resources/views/livewire/profile/discord-account.blade.php +++ b/resources/views/livewire/profile/discord-account.blade.php @@ -1,4 +1,4 @@ - + @@ -44,11 +44,11 @@
    - + {{ __('Remove Association') }} - +
    @endif     -     + diff --git a/resources/views/livewire/profile/facebook-account.blade.php b/resources/views/livewire/profile/facebook-account.blade.php index e3fcaccad..0fdaa399c 100644 --- a/resources/views/livewire/profile/facebook-account.blade.php +++ b/resources/views/livewire/profile/facebook-account.blade.php @@ -1,4 +1,4 @@ - + @@ -36,11 +36,11 @@
    - + {{ __('Remove Association') }} - +
    @endif - + diff --git a/resources/views/livewire/profile/preference.blade.php b/resources/views/livewire/profile/preference.blade.php index f669ff45c..32a762a80 100644 --- a/resources/views/livewire/profile/preference.blade.php +++ b/resources/views/livewire/profile/preference.blade.php @@ -1,4 +1,4 @@ - + {{ __('Preferences') }} @@ -25,4 +25,4 @@ class="{{ ($value) ? 'bg-green-800 dark:bg-green-600' : 'bg-slate-200 dark:bg-sl @endforeach - + diff --git a/resources/views/livewire/profile/twitch-account.blade.php b/resources/views/livewire/profile/twitch-account.blade.php index 91ae4124d..37615415e 100644 --- a/resources/views/livewire/profile/twitch-account.blade.php +++ b/resources/views/livewire/profile/twitch-account.blade.php @@ -1,4 +1,4 @@ - + @@ -30,11 +30,11 @@
    - + {{ __('Remove Association') }} - +
    @endif - + diff --git a/resources/views/livewire/profile/twitter-account.blade.php b/resources/views/livewire/profile/twitter-account.blade.php index b8806aa6a..777f075bf 100644 --- a/resources/views/livewire/profile/twitter-account.blade.php +++ b/resources/views/livewire/profile/twitter-account.blade.php @@ -1,4 +1,4 @@ - + @@ -35,11 +35,11 @@
    - + {{ __('Remove Association') }} - +
    @endif - + diff --git a/resources/views/livewire/profile/xenforo-account.blade.php b/resources/views/livewire/profile/xenforo-account.blade.php index 25e14794b..ce6dc03a4 100644 --- a/resources/views/livewire/profile/xenforo-account.blade.php +++ b/resources/views/livewire/profile/xenforo-account.blade.php @@ -1,4 +1,4 @@ - + Forum Account @@ -11,20 +11,20 @@ @if (!isset($verified_at))
    - - - + + +
    - - - + + +
    @@ -40,9 +40,9 @@ - + {{ __('Verified and saved.') }} - + @error('error') {{ $message }} @@ -53,13 +53,13 @@ @enderror @if (!isset($verified_at)) - + {{ __('Save') }} - + @else - + {{ __('Remove Association') }} - + @endif -     + diff --git a/resources/views/livewire/resource/rating-create.blade.php b/resources/views/livewire/resource/rating-create.blade.php index 40dc7680e..01dc0ce74 100644 --- a/resources/views/livewire/resource/rating-create.blade.php +++ b/resources/views/livewire/resource/rating-create.blade.php @@ -40,21 +40,21 @@
    - +
    - + @lang('Min characters'): 10 · @lang('Max characters'): 255 - + - + {{ __('Save') }} - - + + {{ __('Cancel') }} - + diff --git a/resources/views/livewire/resource/resource-delete.blade.php b/resources/views/livewire/resource/resource-delete.blade.php index 0564a52d2..60a8a07c8 100644 --- a/resources/views/livewire/resource/resource-delete.blade.php +++ b/resources/views/livewire/resource/resource-delete.blade.php @@ -8,11 +8,11 @@ - + {{ __('Yes') }} - - + + {{ __('No, do not delete') }} - + - \ No newline at end of file + diff --git a/resources/views/livewire/resource/resource-form.blade.php b/resources/views/livewire/resource/resource-form.blade.php index c2460164e..a8fd6417c 100644 --- a/resources/views/livewire/resource/resource-form.blade.php +++ b/resources/views/livewire/resource/resource-form.blade.php @@ -4,15 +4,15 @@ - - - + + + - - - + + + - +
    @@ -20,9 +20,9 @@
    - + - +
    @@ -32,7 +32,7 @@
    - +
    - + - + {{ __('Save') }} - - + + {{ __('Cancel') }} - +     diff --git a/resources/views/livewire/resource/update-show.blade.php b/resources/views/livewire/resource/update-show.blade.php index 71935e352..13318d972 100644 --- a/resources/views/livewire/resource/update-show.blade.php +++ b/resources/views/livewire/resource/update-show.blade.php @@ -19,8 +19,8 @@ @lang('Download') - + @lang('Close') - + diff --git a/resources/views/livewire/review/review-form.blade.php b/resources/views/livewire/review/review-form.blade.php index 4dfe93cb8..2ce89ba79 100644 --- a/resources/views/livewire/review/review-form.blade.php +++ b/resources/views/livewire/review/review-form.blade.php @@ -40,10 +40,10 @@
    - +
    - +
    - +
    - + {{ __('Save') }} - + - + diff --git a/resources/views/livewire/server/server-edit-form.blade.php b/resources/views/livewire/server/server-edit-form.blade.php index 194141357..10c2abc9f 100644 --- a/resources/views/livewire/server/server-edit-form.blade.php +++ b/resources/views/livewire/server/server-edit-form.blade.php @@ -1,5 +1,5 @@
    - + {{ __('Edit') . ': ' . $server->name }} @@ -11,35 +11,35 @@
    - - - + + +
    - - - + + +
    - - - + + +
    - + - +
    - + {{ __('Save') }} - + -     +
    diff --git a/resources/views/navigation-menu.blade.php b/resources/views/navigation-menu.blade.php index 85b52ce1e..80e9d3620 100644 --- a/resources/views/navigation-menu.blade.php +++ b/resources/views/navigation-menu.blade.php @@ -12,18 +12,18 @@ - +
    - + @@ -155,13 +155,13 @@ {{----}} - +
    @endrole @guest
    - + @@ -174,14 +174,14 @@ - +
    @endguest
    @auth - + @if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
    @@ -253,60 +253,60 @@ @canany(['tag.create','tag.update','tag.destroy']) - + {{ __('Tags') }} - + @endcanany @canany(['analytics']) - + {{ __('Analytics') }} - + @endcanany @@ -349,23 +349,23 @@ @endauth
    - + @include('vendor.language.flag') @include('vendor.language.flags') - +
    @guest - + {{ __('Login') }} - + @endguest @@ -385,30 +385,30 @@
    - + {{ __('Show Profile') }} - + - + {{ __('Edit Profile') }} - + @if (Laravel\Jetstream\Jetstream::hasApiFeatures()) - + {{ __('API Tokens') }} - + @endif
    @csrf - {{ __('Log Out') }} - +
    diff --git a/resources/views/policy.blade.php b/resources/views/policy.blade.php index e5dad8401..e9d938b56 100644 --- a/resources/views/policy.blade.php +++ b/resources/views/policy.blade.php @@ -3,7 +3,7 @@
    diff --git a/resources/views/profile/delete-user-form.blade.php b/resources/views/profile/delete-user-form.blade.php index 1734caeb2..830720ef1 100644 --- a/resources/views/profile/delete-user-form.blade.php +++ b/resources/views/profile/delete-user-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Delete Account') }} @@ -13,13 +13,13 @@
    - + {{ __('Delete Account') }} - +
    - + {{ __('Delete Account') }} @@ -28,25 +28,25 @@ {{ __('Are you sure you want to delete your account? Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.') }}
    - - +
    - + {{ __('Cancel') }} - + - + {{ __('Delete Account') }} - + -     + - + diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 6f8ee5ce5..61a966c57 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -9,51 +9,51 @@
    @if (Laravel\Fortify\Features::canUpdateProfileInformation()) @livewire('profile.update-profile-information-form') - + @endif @if(config("services.gamejolt.game_id") && config("services.gamejolt.private_key")) @livewire('profile.connect-gamejolt-account') - + @endif @if(config("services.discord.client_id") && config("services.discord.client_secret")) @livewire('profile.discord-account') - + @endif @if(config("services.xenforo.api_key") && config("services.xenforo.api_url")) @livewire('profile.xenforo-account') - + @endif {{--@if(config("services.twitter.client_id") && config("services.twitter.client_secret")) @livewire('profile.twitter-account') - + @endif--}} @if(config("services.facebook.client_id") && config("services.facebook.client_secret")) @livewire('profile.facebook-account') - + @endif @if(config("services.twitch.client_id") && config("services.twitch.client_secret")) @livewire('profile.twitch-account') - + @endif @livewire('profile.preference') - + @livewire('profile.consent') - + @if (Laravel\Fortify\Features::enabled(Laravel\Fortify\Features::updatePasswords()))
    @livewire('profile.update-password-form')
    - + @endif @if (Laravel\Fortify\Features::canManageTwoFactorAuthentication()) @@ -61,7 +61,7 @@ @livewire('profile.two-factor-authentication-form')
    - + @endif
    @@ -69,7 +69,7 @@
    @if (Laravel\Jetstream\Jetstream::hasAccountDeletionFeatures()) - +
    @livewire('profile.delete-user-form') diff --git a/resources/views/profile/logout-other-browser-sessions-form.blade.php b/resources/views/profile/logout-other-browser-sessions-form.blade.php index 0d713c0af..c3d4c9802 100644 --- a/resources/views/profile/logout-other-browser-sessions-form.blade.php +++ b/resources/views/profile/logout-other-browser-sessions-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Browser Sessions') }} @@ -52,17 +52,17 @@ @endif
    - + {{ __('Log Out Other Browser Sessions') }} - + - + {{ __('Done.') }} - +
    - + {{ __('Log Out Other Browser Sessions') }} @@ -71,27 +71,27 @@ {{ __('Please enter your password to confirm you would like to log out of your other browser sessions across all of your devices.') }}
    - - +
    - + {{ __('Cancel') }} - + - {{ __('Log Out Other Browser Sessions') }} - + -     + -     + diff --git a/resources/views/profile/two-factor-authentication-form.blade.php b/resources/views/profile/two-factor-authentication-form.blade.php index 5d276f0a5..c28f54086 100644 --- a/resources/views/profile/two-factor-authentication-form.blade.php +++ b/resources/views/profile/two-factor-authentication-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Two Factor Authentication') }} @@ -52,32 +52,32 @@
    @if (! $this->enabled) - - + + {{ __('Enable') }} - - + + @else @if ($showingRecoveryCodes) - - + + {{ __('Regenerate Recovery Codes') }} - - + + @else - - + + {{ __('Show Recovery Codes') }} - - + + @endif - - + + {{ __('Disable') }} - - + + @endif
    -     + diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php index 0f47b545d..17afe4370 100644 --- a/resources/views/profile/update-password-form.blade.php +++ b/resources/views/profile/update-password-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Update Password') }} @@ -9,31 +9,31 @@
    - - - + + +
    - - - + + +
    - - - + + +
    - + {{ __('Saved.') }} - + - + {{ __('Save') }} - + -     + diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php index a5f8215b6..183057d34 100644 --- a/resources/views/profile/update-profile-information-form.blade.php +++ b/resources/views/profile/update-profile-information-form.blade.php @@ -1,4 +1,4 @@ - + {{ __('Profile Information') }} @@ -29,7 +29,7 @@ reader.readAsDataURL($refs.photo.files[0]); " /> - +
    @@ -43,75 +43,75 @@
    - + {{ __('Select A New Photo') }} - + @if ($this->user->profile_photo_path) - + {{ __('Remove Photo') }} - + @endif - +
    @endif
    - - - + + +
    - - - + + +
    - - - + + +
    - - - + + +
    - + - +
    - - - + + +
    - + - +
    - + {{ __('Saved.') }} - + - + {{ __('Save') }} - + - + diff --git a/resources/views/skin/create.blade.php b/resources/views/skin/create.blade.php index ef3c5423a..72e9c31a0 100644 --- a/resources/views/skin/create.blade.php +++ b/resources/views/skin/create.blade.php @@ -20,35 +20,35 @@
    @csrf
    - - - + + +
    - + - +
    - +
    - +
    - + @lang('Upload') - +
    diff --git a/resources/views/skin/edit.blade.php b/resources/views/skin/edit.blade.php index d7904d3a5..75f231350 100644 --- a/resources/views/skin/edit.blade.php +++ b/resources/views/skin/edit.blade.php @@ -21,21 +21,21 @@
    @csrf
    - - - + + +
    public) {{'checked'}} @endif> - +
    - + @lang('Save') - +
    diff --git a/resources/views/terms.blade.php b/resources/views/terms.blade.php index d5c988317..f06e7e0d5 100644 --- a/resources/views/terms.blade.php +++ b/resources/views/terms.blade.php @@ -3,7 +3,7 @@
    diff --git a/resources/views/vendor/jetstream/components/modal.blade.php b/resources/views/vendor/jetstream/components/modal.blade.php deleted file mode 100644 index 6148a3e58..000000000 --- a/resources/views/vendor/jetstream/components/modal.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@props(['id', 'maxWidth']) - -@php -$id = $id ?? md5($attributes->wire('model')); - -$maxWidth = [ - 'sm' => 'sm:max-w-sm', - 'md' => 'sm:max-w-md', - 'lg' => 'sm:max-w-lg', - 'xl' => 'sm:max-w-xl', - '2xl' => 'sm:max-w-2xl', -][$maxWidth ?? '2xl']; -@endphp - - diff --git a/resources/views/vendor/language/flags.blade.php b/resources/views/vendor/language/flags.blade.php index ade410935..d14054dfe 100644 --- a/resources/views/vendor/language/flags.blade.php +++ b/resources/views/vendor/language/flags.blade.php @@ -3,11 +3,11 @@ $languages = config('app.env') === 'production' ? config('language.done') : config('language.allowed'); @endphp @foreach ($languages as $code) - + {{ language()->getName($code) }} {{ language()->getName($code) }} - + @endforeach - + {{ __('Contribute your language') }}! - + From 12d385be084c06f7727b66d7d325f3d92451b7dc Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Sun, 10 Dec 2023 21:22:18 +0100 Subject: [PATCH 3/8] Temp fix for restcord --- composer.json | 6 +++++- composer.lock | 56 +++++++++++++++++++++++---------------------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index 9f5c21649..bc12db3b2 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,10 @@ "laravel-favicon": { "type": "git", "url": "https://github.com/dsbilling/laravel-favicon.git" + }, + "restcord": { + "type": "git", + "url": "https://github.com/Bora-Bora-Community/restcord.git" } }, "require": { @@ -65,7 +69,7 @@ "origami/consent": "^2.2", "overtrue/laravel-like": "^5.0", "power-components/livewire-powergrid": "^2.2", - "restcord/restcord": "dev-develop", + "restcord/restcord": "dev-patch-1", "sentry/sentry-laravel": "^2.11", "socialiteproviders/facebook": "^4.1", "socialiteproviders/twitch": "^5.3", diff --git a/composer.lock b/composer.lock index 05bae5bca..a83fca553 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c50580d9ef7896f417d154434d38759e", + "content-hash": "462bd866709327b812bafe9f25983a7e", "packages": [ { "name": "akaunting/laravel-language", @@ -490,13 +490,13 @@ "source": { "type": "git", "url": "https://github.com/dsbilling/laravel-favicon.git", - "reference": "b7380ee645c9393540337719822e81c965a65ef1" + "reference": "dd471a7891b604751caf904773f9cc40134797d4" }, "require": { - "illuminate/http": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*", - "illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*", + "illuminate/http": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0", + "illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0", "intervention/image": "^2.4", - "php": "^7.1|^8.0" + "php": "^7.1|^8.0|^8.1|^8.2" }, "require-dev": { "orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0", @@ -548,7 +548,7 @@ "beyondcode", "laravel-favicon" ], - "time": "2022-07-02T09:22:11+00:00" + "time": "2023-12-10T14:30:11+00:00" }, { "name": "blade-ui-kit/blade-ui-kit", @@ -3989,21 +3989,21 @@ }, { "name": "kilobyteno/laravel-plausible", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/kilobyteno/laravel-plausible.git", - "reference": "13777d24f23011828b0c23e97de0e6c0fa5cb3d8" + "reference": "5e1e4021e0c7085d3be97c6439388349341565ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kilobyteno/laravel-plausible/zipball/13777d24f23011828b0c23e97de0e6c0fa5cb3d8", - "reference": "13777d24f23011828b0c23e97de0e6c0fa5cb3d8", + "url": "https://api.github.com/repos/kilobyteno/laravel-plausible/zipball/5e1e4021e0c7085d3be97c6439388349341565ce", + "reference": "5e1e4021e0c7085d3be97c6439388349341565ce", "shasum": "" }, "require": { - "illuminate/contracts": "^8.0|^9.0", - "php": "^8.0|^8.1", + "illuminate/contracts": "^8.0|^9.0|^10.0", + "php": "^8.0|^8.1|^8.2", "spatie/laravel-package-tools": "^1.9.2" }, "require-dev": { @@ -4051,13 +4051,14 @@ "keywords": [ "kilobyteno", "laravel", - "laravel-plausible" + "laravel-plausible", + "plausible" ], "support": { "issues": "https://github.com/kilobyteno/laravel-plausible/issues", - "source": "https://github.com/kilobyteno/laravel-plausible/tree/1.0.0" + "source": "https://github.com/kilobyteno/laravel-plausible/tree/1.1.0" }, - "time": "2023-07-19T18:16:29+00:00" + "time": "2023-12-10T14:50:29+00:00" }, { "name": "kiritokatklian/nova-permission", @@ -8831,17 +8832,11 @@ }, { "name": "restcord/restcord", - "version": "dev-develop", + "version": "dev-patch-1", "source": { "type": "git", - "url": "https://github.com/restcord/restcord.git", - "reference": "7f8e2756dd5b34c215287f400454ffcbc9d4b0d2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/restcord/restcord/zipball/7f8e2756dd5b34c215287f400454ffcbc9d4b0d2", - "reference": "7f8e2756dd5b34c215287f400454ffcbc9d4b0d2", - "shasum": "" + "url": "https://github.com/Bora-Bora-Community/restcord.git", + "reference": "6ecc44be67123171998a6cc42d93bca66bfb5e65" }, "require": { "guzzlehttp/guzzle": "^7.0", @@ -8860,14 +8855,17 @@ "symfony/var-dumper": "^2.6|^3.0|^4.0", "twig/twig": "^1.20|^2.0" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { "RestCord\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "RestCord\\Test\\": "tests/" + } + }, "license": [ "MIT" ], @@ -8878,11 +8876,7 @@ } ], "description": "REST Library for the Discord API", - "support": { - "issues": "https://github.com/restcord/restcord/issues", - "source": "https://github.com/restcord/restcord/tree/develop" - }, - "time": "2023-08-19T23:39:13+00:00" + "time": "2023-11-08T08:38:20+00:00" }, { "name": "sentry/sdk", From b1656d706356c101443dbacad151b5dd7ff85b30 Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Sun, 10 Dec 2023 21:55:31 +0100 Subject: [PATCH 4/8] Temp fix for restcord --- composer.json | 4 ++-- composer.lock | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index bc12db3b2..6e2f50f9b 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "restcord": { "type": "git", - "url": "https://github.com/Bora-Bora-Community/restcord.git" + "url": "https://github.com/dsbilling/restcord.git" } }, "require": { @@ -69,7 +69,7 @@ "origami/consent": "^2.2", "overtrue/laravel-like": "^5.0", "power-components/livewire-powergrid": "^2.2", - "restcord/restcord": "dev-patch-1", + "restcord/restcord": "dev-develop", "sentry/sentry-laravel": "^2.11", "socialiteproviders/facebook": "^4.1", "socialiteproviders/twitch": "^5.3", diff --git a/composer.lock b/composer.lock index a83fca553..eed8431bf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "462bd866709327b812bafe9f25983a7e", + "content-hash": "ecdbb27ebda152ebe2fd52b191ff0255", "packages": [ { "name": "akaunting/laravel-language", @@ -8832,11 +8832,11 @@ }, { "name": "restcord/restcord", - "version": "dev-patch-1", + "version": "dev-develop", "source": { "type": "git", - "url": "https://github.com/Bora-Bora-Community/restcord.git", - "reference": "6ecc44be67123171998a6cc42d93bca66bfb5e65" + "url": "https://github.com/dsbilling/restcord.git", + "reference": "be8dfc66b67de2a7118cb7f69d759993a1f7445e" }, "require": { "guzzlehttp/guzzle": "^7.0", @@ -8855,6 +8855,7 @@ "symfony/var-dumper": "^2.6|^3.0|^4.0", "twig/twig": "^1.20|^2.0" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -8876,7 +8877,7 @@ } ], "description": "REST Library for the Discord API", - "time": "2023-11-08T08:38:20+00:00" + "time": "2023-12-10T20:30:02+00:00" }, { "name": "sentry/sdk", From c82242ec805e7ac477540124ed97e9f8da39d343 Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Fri, 15 Dec 2023 23:09:54 +0100 Subject: [PATCH 5/8] Fixed server edit form --- app/Http/Livewire/Server/ServerCreateForm.php | 18 +++++----- app/Http/Livewire/Server/ServerEditForm.php | 34 +++++++------------ 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/app/Http/Livewire/Server/ServerCreateForm.php b/app/Http/Livewire/Server/ServerCreateForm.php index c5f5c77e2..93b539266 100644 --- a/app/Http/Livewire/Server/ServerCreateForm.php +++ b/app/Http/Livewire/Server/ServerCreateForm.php @@ -5,31 +5,31 @@ use App\Models\Server; use App\Rules\IPHostnameARecord; use App\Rules\StrNotContain; +use Illuminate\Contracts\View\View; use Livewire\Component; +use Livewire\Redirector; class ServerCreateForm extends Component { - public $name; + public string $name; - public $host; + public string $host; - public $port; + public int $port; - public $description; + public string $description; /** * Create a server. - * - * @return void */ - public function save() + public function save(): Redirector { $this->resetErrorBag(); $this->resetValidation(); $this->validate([ 'name' => ['required', 'string', new StrNotContain('official')], - 'host' => ['required', new StrNotContain('pokemon3d.net'), new IPHostnameARecord()], + 'host' => ['required', new StrNotContain('pokemon3d.net'), new IPHostnameARecord(), 'lowercase'], 'port' => ['required', 'integer', 'min:10', 'max:99999'], 'description' => ['nullable', 'string'], ]); @@ -46,7 +46,7 @@ public function save() return redirect()->route('server.index'); } - public function render() + public function render(): View { return view('livewire.server.server-create-form'); } diff --git a/app/Http/Livewire/Server/ServerEditForm.php b/app/Http/Livewire/Server/ServerEditForm.php index 9167a508b..8072032b3 100644 --- a/app/Http/Livewire/Server/ServerEditForm.php +++ b/app/Http/Livewire/Server/ServerEditForm.php @@ -5,22 +5,25 @@ use App\Models\Server; use App\Rules\IPHostnameARecord; use App\Rules\StrNotContain; +use Illuminate\Contracts\View\View; use Livewire\Component; +use Livewire\Redirector; class ServerEditForm extends Component { - public $server; + public Server $server; - public $name; + public string $name; - public $host; + public string $host; - public $port; + public int $port; - public $description; + public string $description; - public function mount() + public function mount(Server $server): void { + $this->server = $server; $this->name = $this->server->name; $this->host = $this->server->host; $this->port = $this->server->port; @@ -29,31 +32,20 @@ public function mount() /** * Update the server. - * - * @return void */ - public function save() + public function save(): Redirector { $this->resetErrorBag(); $this->resetValidation(); $this->validate([ 'name' => ['required', 'string', new StrNotContain('official')], - 'host' => ['required', new StrNotContain('pokemon3d.net'), new IPHostnameARecord()], + 'host' => ['required', new StrNotContain('pokemon3d.net'), new IPHostnameARecord(), 'lowercase'], 'port' => ['required', 'integer', 'min:10', 'max:99999'], 'description' => ['nullable', 'string'], ]); - $server = Server::find($this->server->uuid); - - if (! $server) { - session()->flash('flash.banner', trans('Server not found.')); - session()->flash('flash.bannerStyle', 'danger'); - - return redirect()->route('server.index'); - } - - $server->update([ + $this->server->update([ 'name' => $this->name, 'host' => $this->host, 'port' => $this->port, @@ -65,7 +57,7 @@ public function save() return redirect()->route('server.index'); } - public function render() + public function render(): View { return view('livewire.server.server-edit-form'); } From 476b007dc00842970843bc28543f7cf9a8d9cd16 Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Fri, 15 Dec 2023 23:21:23 +0100 Subject: [PATCH 6/8] Going back to official restcord package --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 6e2f50f9b..9f5c21649 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,6 @@ "laravel-favicon": { "type": "git", "url": "https://github.com/dsbilling/laravel-favicon.git" - }, - "restcord": { - "type": "git", - "url": "https://github.com/dsbilling/restcord.git" } }, "require": { From 3e5aa4d51f0847a531acb9604f637d6475509573 Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Fri, 15 Dec 2023 23:21:26 +0100 Subject: [PATCH 7/8] Update composer.lock --- composer.lock | 84 +++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index eed8431bf..a5474f89a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ecdbb27ebda152ebe2fd52b191ff0255", + "content-hash": "c50580d9ef7896f417d154434d38759e", "packages": [ { "name": "akaunting/laravel-language", @@ -868,16 +868,16 @@ }, { "name": "carbonphp/carbon-doctrine-types", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5" + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/67a77972b9f398ae7068dabacc39c08aeee170d5", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", "shasum": "" }, "require": { @@ -917,7 +917,7 @@ ], "support": { "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", - "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.0.0" + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0" }, "funding": [ { @@ -933,7 +933,7 @@ "type": "tidelift" } ], - "time": "2023-10-01T14:29:01+00:00" + "time": "2023-12-11T17:09:12+00:00" }, { "name": "cebe/php-openapi", @@ -4273,16 +4273,16 @@ }, { "name": "laravel/fortify", - "version": "v1.19.0", + "version": "v1.19.1", "source": { "type": "git", "url": "https://github.com/laravel/fortify.git", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7" + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/fortify/zipball/2da721fead1f3bc18af983e4903c4e1df67177e7", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7", + "url": "https://api.github.com/repos/laravel/fortify/zipball/1dde858a520f679b4a2f453fa68f8a0e98751875", + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875", "shasum": "" }, "require": { @@ -4333,7 +4333,7 @@ "issues": "https://github.com/laravel/fortify/issues", "source": "https://github.com/laravel/fortify" }, - "time": "2023-11-27T22:01:18+00:00" + "time": "2023-12-11T16:16:45+00:00" }, { "name": "laravel/framework", @@ -6679,16 +6679,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -6729,9 +6729,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "nova-kit/nova-packages-tool", @@ -8835,8 +8835,14 @@ "version": "dev-develop", "source": { "type": "git", - "url": "https://github.com/dsbilling/restcord.git", - "reference": "be8dfc66b67de2a7118cb7f69d759993a1f7445e" + "url": "https://github.com/restcord/restcord.git", + "reference": "8619e1a05e4df994c15bd457562eddbf99dea35f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/restcord/restcord/zipball/8619e1a05e4df994c15bd457562eddbf99dea35f", + "reference": "8619e1a05e4df994c15bd457562eddbf99dea35f", + "shasum": "" }, "require": { "guzzlehttp/guzzle": "^7.0", @@ -8862,11 +8868,7 @@ "RestCord\\": "src/" } }, - "autoload-dev": { - "psr-4": { - "RestCord\\Test\\": "tests/" - } - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -8877,7 +8879,11 @@ } ], "description": "REST Library for the Discord API", - "time": "2023-12-10T20:30:02+00:00" + "support": { + "issues": "https://github.com/restcord/restcord/issues", + "source": "https://github.com/restcord/restcord/tree/develop" + }, + "time": "2023-12-11T22:06:27+00:00" }, { "name": "sentry/sdk", @@ -9579,16 +9585,16 @@ }, { "name": "spatie/eloquent-sortable", - "version": "4.0.2", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/spatie/eloquent-sortable.git", - "reference": "74994d10a17d15d2cdb319d6b2ad7cb6fa067c0a" + "reference": "960ee1c888171f77cba9e3108da69c00a0d02e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/74994d10a17d15d2cdb319d6b2ad7cb6fa067c0a", - "reference": "74994d10a17d15d2cdb319d6b2ad7cb6fa067c0a", + "url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/960ee1c888171f77cba9e3108da69c00a0d02e9c", + "reference": "960ee1c888171f77cba9e3108da69c00a0d02e9c", "shasum": "" }, "require": { @@ -9637,7 +9643,7 @@ ], "support": { "issues": "https://github.com/spatie/eloquent-sortable/issues", - "source": "https://github.com/spatie/eloquent-sortable/tree/4.0.2" + "source": "https://github.com/spatie/eloquent-sortable/tree/4.1.0" }, "funding": [ { @@ -9649,7 +9655,7 @@ "type": "github" } ], - "time": "2023-01-23T08:34:14+00:00" + "time": "2023-12-11T16:39:58+00:00" }, { "name": "spatie/enum", @@ -10385,16 +10391,16 @@ }, { "name": "spatie/laravel-schedule-monitor", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-schedule-monitor.git", - "reference": "d5d24aa9b6b6f2422cc420cd90f78778cd382e98" + "reference": "0a0b7993563091837acacd65404e693066e8f3bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-schedule-monitor/zipball/d5d24aa9b6b6f2422cc420cd90f78778cd382e98", - "reference": "d5d24aa9b6b6f2422cc420cd90f78778cd382e98", + "url": "https://api.github.com/repos/spatie/laravel-schedule-monitor/zipball/0a0b7993563091837acacd65404e693066e8f3bb", + "reference": "0a0b7993563091837acacd65404e693066e8f3bb", "shasum": "" }, "require": { @@ -10452,7 +10458,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-schedule-monitor/issues", - "source": "https://github.com/spatie/laravel-schedule-monitor/tree/3.4.1" + "source": "https://github.com/spatie/laravel-schedule-monitor/tree/3.4.2" }, "funding": [ { @@ -10460,7 +10466,7 @@ "type": "github" } ], - "time": "2023-11-29T09:15:27+00:00" + "time": "2023-12-14T22:34:35+00:00" }, { "name": "spatie/laravel-signal-aware-command", @@ -18084,5 +18090,5 @@ "ext-gd": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From f787b6394fe7c822738669b6d8270044196849a4 Mon Sep 17 00:00:00 2001 From: "Daniel S. Billing" Date: Fri, 15 Dec 2023 23:28:32 +0100 Subject: [PATCH 8/8] Update modal.blade.php --- resources/views/components/modal.blade.php | 87 ++++++++++++++++------ 1 file changed, 65 insertions(+), 22 deletions(-) diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php index 9abe61f6b..179c741a7 100644 --- a/resources/views/components/modal.blade.php +++ b/resources/views/components/modal.blade.php @@ -1,25 +1,68 @@ -@props(['formAction' => false]) +@props(['id', 'maxWidth']) -
    - @if($formAction) -
    - @csrf - @endif -
    - @if(isset($title)) -

    - {{ $title }} -

    - @endif -
    -
    - {{ $content }} -
    +@php +$id = $id ?? md5($attributes->wire('model')); -
    - {{ $buttons }} -
    - @if($formAction) -
    - @endif +$maxWidth = [ + 'sm' => 'sm:max-w-sm', + 'md' => 'sm:max-w-md', + 'lg' => 'sm:max-w-lg', + 'xl' => 'sm:max-w-xl', + '2xl' => 'sm:max-w-2xl', +][$maxWidth ?? '2xl']; +@endphp + +