diff --git a/README.md b/README.md index 1ebf3b22..6b83639d 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ - Stripe Integration - Referral System - Ticket System -- Upgrade/Downgrade Server Ressources +- Upgrade/Downgrade Server Resources - Store (credit system with hourly billing and invoices) - Email Verification - Audit Log - Admin Dashboard - User/Server Management -- Customizable server plans +- Customisable server plans - Vouchers - and so much more! diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index e809da37..848db48a 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; -use App\Models\User; use App\Providers\RouteServiceProvider; use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 0aabb601..465535bf 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -12,7 +12,6 @@ use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; use Illuminate\Validation\ValidationException; diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 8ddd22a6..656064c3 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -9,7 +9,6 @@ use App\Models\Nest; use App\Models\Node; use App\Models\Product; use App\Models\Server; -use App\Models\Settings; use App\Notifications\ServerCreationError; use Exception; use Illuminate\Database\Eloquent\Builder; diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 585b3e0f..bdd71a3a 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -11,7 +11,6 @@ use App\Listeners\Verified; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Event; use SocialiteProviders\Manager\SocialiteWasCalled; class EventServiceProvider extends ServiceProvider diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index c5a9ff7b..b0ae6fc6 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -22,7 +22,6 @@ class UserFactory extends Factory 'email_verified_at' => $this->faker->dateTimeBetween('-30 days', now()), 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password 'remember_token' => Str::random(10), - 'email_verified' => true, ]; } } diff --git a/lang/en.json b/lang/en.json index 2dcc8acb..3cf6b1bc 100644 --- a/lang/en.json +++ b/lang/en.json @@ -324,7 +324,7 @@ "System": "System", "Show Terms of Service": "Show Terms of Service", "Show the TOS link in the footer of every page.
Edit the content in \"resources\/views\/information\/tos-content.blade.php\"": "Show the TOS link in the footer of every page.
Edit the content in \"resources\/views\/information\/tos-content.blade.php\"", - "Show imprint": "Show imprint", + "Show Imprint": "Show Imprint", "Show the imprint link in the footer of every page.
Edit the content in \"resources\/views\/information\/imprint-content.blade.php\"": "Show the imprint link in the footer of every page.
Edit the content in \"resources\/views\/information\/imprint-content.blade.php\"", "Show Privacy Policy": "Show Privacy Policy", "Show the privacy policy link in the footer of every page.
Edit the content in \"resources\/views\/information\/privacy-content.blade.php\"": "Show the privacy policy link in the footer of every page.
Edit the content in \"resources\/views\/information\/privacy-content.blade.php\"", @@ -535,6 +535,7 @@ "MB": "MB", "MySQL": "MySQL", "ports": "ports", + "to create this server": "to create this server", "Server can´t fit on this node": "Server can´t fit on this node", "Not enough": "Not enough", "Create server": "Create server", diff --git a/public/install/functions.php b/public/install/functions.php index 7eed0735..ed983c57 100644 --- a/public/install/functions.php +++ b/public/install/functions.php @@ -4,7 +4,7 @@ $required_extentions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer' $requirements = [ 'minPhp' => '8.1', - 'maxPhp' => '8.1.9', // This version is not supported + 'maxPhp' => '8.2', // This version is not supported 'mysql' => '5.7.22', ]; diff --git a/themes/default/views/admin/overview/index.blade.php b/themes/default/views/admin/overview/index.blade.php index 20fef894..062b50c6 100644 --- a/themes/default/views/admin/overview/index.blade.php +++ b/themes/default/views/admin/overview/index.blade.php @@ -59,7 +59,7 @@
{{__('Servers')}} - {{$counters['servers']->total}} + {{$counters['servers']->active}}/{{$counters['servers']->total}}
diff --git a/themes/default/views/admin/partners/create.blade.php b/themes/default/views/admin/partners/create.blade.php index c2a56427..f635e51b 100644 --- a/themes/default/views/admin/partners/create.blade.php +++ b/themes/default/views/admin/partners/create.blade.php @@ -58,7 +58,7 @@
diff --git a/themes/default/views/admin/settings/tabs/system.blade.php b/themes/default/views/admin/settings/tabs/system.blade.php index fa983254..dc1231af 100644 --- a/themes/default/views/admin/settings/tabs/system.blade.php +++ b/themes/default/views/admin/settings/tabs/system.blade.php @@ -33,7 +33,7 @@ - +
') }}" diff --git a/themes/default/views/admin/users/index.blade.php b/themes/default/views/admin/users/index.blade.php index 530f47de..b6be7a74 100644 --- a/themes/default/views/admin/users/index.blade.php +++ b/themes/default/views/admin/users/index.blade.php @@ -77,7 +77,7 @@ url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' }, processing: true, - serverSide: false, //increases loading times too much? change back to "true" if it does + serverSide: true, //why was this set to false before? increased loadingtimes by 10 seconds stateSave: true, ajax: "{{route('admin.users.datatable')}}", order: [[ 11, "asc" ]], diff --git a/themes/default/views/servers/create.blade.php b/themes/default/views/servers/create.blade.php index a24d2284..dcc807e6 100644 --- a/themes/default/views/servers/create.blade.php +++ b/themes/default/views/servers/create.blade.php @@ -26,7 +26,8 @@
-
+ @csrf
@@ -34,10 +35,10 @@
{{ __('Server configuration') }}
- @if (!config("SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS")) + @if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS'))
The creation of new servers has been disabled for regular users, enable it again - {{ __('here') }}. + {{ __('here') }}.
@endif @if ($productCount === 0 || $nodeCount === 0 || count($nests) === 0 || count($eggs) === 0) @@ -47,7 +48,7 @@ @if (Auth::user()->role == 'admin') {{ __('Make sure to link your products to nodes and eggs.') }}
{{ __('There has to be at least 1 valid product for server creation') }} - {{ __('Sync now') }} + {{ __('Sync now') }} @endif

@@ -102,8 +103,8 @@
- @@ -134,8 +135,8 @@
- @@ -206,11 +207,19 @@ ({{ __('ports') }}) +
  • + + {{ __('Required') }} {{ CREDITS_DISPLAY_NAME }} + {{ __('to create this server') }} + +
    • {{ __('Description') }} -

    +

    @@ -222,13 +231,18 @@ x-text="product.price + ' {{ CREDITS_DISPLAY_NAME }}'">
    -
    - +
    + +
    +
    +
    @@ -246,7 +260,6 @@