From 411441e1a89f8aeb3bd191d0b430e8cb7b109339 Mon Sep 17 00:00:00 2001 From: Ferks-FK Date: Sun, 5 Feb 2023 17:20:55 +0000 Subject: [PATCH] Migrate all variables in the front-end --- .../Admin/ApplicationApiController.php | 7 ++- .../Controllers/Admin/PartnerController.php | 7 ++- .../Controllers/Admin/PaymentController.php | 5 +- .../Controllers/Admin/ProductController.php | 17 ++++-- .../Controllers/Admin/ServerController.php | 7 ++- .../Admin/ShopProductController.php | 4 +- .../Admin/UsefulLinkController.php | 7 ++- app/Http/Controllers/Admin/UserController.php | 7 ++- .../Controllers/Admin/VoucherController.php | 10 +++- app/Http/Controllers/HomeController.php | 6 +- .../Moderation/TicketsController.php | 18 +++--- .../Pterodactyl/PterodactylController.php | 12 ++++ app/Http/Controllers/TicketsController.php | 12 ++-- app/Settings/DiscordSettings.php | 12 ++-- app/Settings/TicketSettings.php | 17 ++++++ app/Settings/WebsiteSettings.php | 2 + config/app.php | 3 +- ...3_02_01_182043_create_discord_settings.php | 4 +- ...3_02_01_182158_create_website_settings.php | 2 +- ...23_02_04_181156_create_ticket_settings.php | 34 +++++++++++ routes/web.php | 17 +++--- .../default/views/admin/api/index.blade.php | 2 +- .../views/admin/partners/index.blade.php | 2 +- .../views/admin/payments/index.blade.php | 2 +- .../views/admin/products/create.blade.php | 2 +- .../views/admin/products/edit.blade.php | 2 +- .../views/admin/products/index.blade.php | 2 +- .../views/admin/products/show.blade.php | 2 +- .../views/admin/servers/index.blade.php | 57 ++++++++++++++++--- .../default/views/admin/store/index.blade.php | 2 +- .../views/admin/usefullinks/index.blade.php | 2 +- .../default/views/admin/users/index.blade.php | 2 +- .../views/admin/vouchers/index.blade.php | 2 +- .../views/admin/vouchers/users.blade.php | 2 +- themes/default/views/auth/login.blade.php | 29 +++------- .../views/auth/passwords/email.blade.php | 10 ++-- .../views/auth/passwords/reset.blade.php | 7 ++- themes/default/views/auth/register.blade.php | 41 +++++-------- themes/default/views/layouts/app.blade.php | 7 ++- themes/default/views/layouts/main.blade.php | 25 ++++---- .../moderator/ticket/blacklist.blade.php | 2 +- .../views/moderator/ticket/index.blade.php | 2 +- themes/default/views/ticket/index.blade.php | 2 +- 43 files changed, 267 insertions(+), 149 deletions(-) create mode 100644 app/Http/Controllers/Pterodactyl/PterodactylController.php create mode 100644 app/Settings/TicketSettings.php create mode 100644 database/settings/2023_02_04_181156_create_ticket_settings.php diff --git a/app/Http/Controllers/Admin/ApplicationApiController.php b/app/Http/Controllers/Admin/ApplicationApiController.php index b7168939..f037efe8 100644 --- a/app/Http/Controllers/Admin/ApplicationApiController.php +++ b/app/Http/Controllers/Admin/ApplicationApiController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\ApplicationApi; +use App\Settings\LocaleSettings; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -20,9 +21,11 @@ class ApplicationApiController extends Controller * * @return Application|Factory|View|Response */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.api.index'); + return view('admin.api.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** diff --git a/app/Http/Controllers/Admin/PartnerController.php b/app/Http/Controllers/Admin/PartnerController.php index c91f592d..0a793904 100644 --- a/app/Http/Controllers/Admin/PartnerController.php +++ b/app/Http/Controllers/Admin/PartnerController.php @@ -5,13 +5,16 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\PartnerDiscount; use App\Models\User; +use App\Settings\LocaleSettings; use Illuminate\Http\Request; class PartnerController extends Controller { - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.partners.index'); + return view('admin.partners.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 2eba098c..2f2c2df6 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -18,17 +18,18 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use App\Helpers\ExtensionHelper; - +use App\Settings\LocaleSettings; class PaymentController extends Controller { /** * @return Application|Factory|View */ - public function index() + public function index(LocaleSettings $locale_settings) { return view('admin.payments.index')->with([ 'payments' => Payment::paginate(15), + 'locale_datatables' => $locale_settings->datatables ]); } diff --git a/app/Http/Controllers/Admin/ProductController.php b/app/Http/Controllers/Admin/ProductController.php index 68904e15..62b233d4 100644 --- a/app/Http/Controllers/Admin/ProductController.php +++ b/app/Http/Controllers/Admin/ProductController.php @@ -6,6 +6,8 @@ use App\Http\Controllers\Controller; use App\Models\Pterodactyl\Location; use App\Models\Pterodactyl\Nest; use App\Models\Product; +use App\Settings\GeneralSettings; +use App\Settings\LocaleSettings; use App\Settings\UserSettings; use Exception; use Illuminate\Contracts\Foundation\Application; @@ -22,9 +24,11 @@ class ProductController extends Controller * * @return Application|Factory|View */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.products.index'); + return view('admin.products.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** @@ -32,11 +36,12 @@ class ProductController extends Controller * * @return Application|Factory|View */ - public function create() + public function create(GeneralSettings $general_settings) { return view('admin.products.create', [ 'locations' => Location::with('nodes')->get(), 'nests' => Nest::with('eggs')->get(), + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -91,11 +96,12 @@ class ProductController extends Controller * @param Product $product * @return Application|Factory|View */ - public function show(Product $product, UserSettings $user_settings) + public function show(Product $product, UserSettings $user_settings, GeneralSettings $general_settings) { return view('admin.products.show', [ 'product' => $product, 'minimum_credits' => $user_settings->min_credits_to_make_server, + 'credits_display_name' => $general_settings->credits_display_name ]); } @@ -105,12 +111,13 @@ class ProductController extends Controller * @param Product $product * @return Application|Factory|View */ - public function edit(Product $product) + public function edit(Product $product, GeneralSettings $general_settings) { return view('admin.products.edit', [ 'product' => $product, 'locations' => Location::with('nodes')->get(), 'nests' => Nest::with('eggs')->get(), + 'credits_display_name' => $general_settings->credits_display_name ]); } diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php index c29fcdc8..65fdfa23 100644 --- a/app/Http/Controllers/Admin/ServerController.php +++ b/app/Http/Controllers/Admin/ServerController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\Server; use App\Models\User; +use App\Settings\LocaleSettings; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -22,9 +23,11 @@ class ServerController extends Controller * * @return Application|Factory|View|Response */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.servers.index'); + return view('admin.servers.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** diff --git a/app/Http/Controllers/Admin/ShopProductController.php b/app/Http/Controllers/Admin/ShopProductController.php index e0140218..c8144b45 100644 --- a/app/Http/Controllers/Admin/ShopProductController.php +++ b/app/Http/Controllers/Admin/ShopProductController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Models\ShopProduct; +use App\Settings\LocaleSettings; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -20,7 +21,7 @@ class ShopProductController extends Controller * * @return Application|Factory|View|Response */ - public function index(Request $request) + public function index(LocaleSettings $locale_settings) { $isPaymentSetup = false; @@ -34,6 +35,7 @@ class ShopProductController extends Controller return view('admin.store.index', [ 'isPaymentSetup' => $isPaymentSetup, + 'locale_datatables' => $locale_settings->datatables ]); } diff --git a/app/Http/Controllers/Admin/UsefulLinkController.php b/app/Http/Controllers/Admin/UsefulLinkController.php index 79e6b4da..ddfdb7de 100644 --- a/app/Http/Controllers/Admin/UsefulLinkController.php +++ b/app/Http/Controllers/Admin/UsefulLinkController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Enums\UsefulLinkLocation; use App\Http\Controllers\Controller; use App\Models\UsefulLink; +use App\Settings\LocaleSettings; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -19,9 +20,11 @@ class UsefulLinkController extends Controller * * @return Application|Factory|View|Response */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.usefullinks.index'); + return view('admin.usefullinks.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 58a16482..3adb68c5 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -6,6 +6,7 @@ use App\Events\UserUpdateCreditsEvent; use App\Http\Controllers\Controller; use App\Models\User; use App\Notifications\DynamicNotification; +use App\Settings\LocaleSettings; use Exception; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; @@ -31,9 +32,11 @@ class UserController extends Controller * @param Request $request * @return Application|Factory|View|Response */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.users.index'); + return view('admin.users.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** diff --git a/app/Http/Controllers/Admin/VoucherController.php b/app/Http/Controllers/Admin/VoucherController.php index ce8bcf5d..e46597cb 100644 --- a/app/Http/Controllers/Admin/VoucherController.php +++ b/app/Http/Controllers/Admin/VoucherController.php @@ -6,6 +6,7 @@ use App\Events\UserUpdateCreditsEvent; use App\Http\Controllers\Controller; use App\Models\User; use App\Models\Voucher; +use App\Settings\LocaleSettings; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -22,9 +23,11 @@ class VoucherController extends Controller * * @return Application|Factory|View */ - public function index() + public function index(LocaleSettings $locale_settings) { - return view('admin.vouchers.index'); + return view('admin.vouchers.index', [ + 'locale_datatables' => $locale_settings->datatables + ]); } /** @@ -117,10 +120,11 @@ class VoucherController extends Controller return redirect()->back()->with('success', __('voucher has been removed!')); } - public function users(Voucher $voucher) + public function users(Voucher $voucher, LocaleSettings $locale_settings) { return view('admin.vouchers.users', [ 'voucher' => $voucher, + 'locale_datatables' => $locale_settings->datatables ]); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a8f53ef4..3a319e1d 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,15 +4,15 @@ namespace App\Http\Controllers; use App\Models\PartnerDiscount; use App\Models\UsefulLink; +use App\Settings\GeneralSettings; +use App\Settings\WebsiteSettings; +use App\Settings\ReferralSettings; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\URL; -use App\Settings\GeneralSettings; -use App\Settings\WebsiteSettings; -use App\Settings\ReferralSettings; class HomeController extends Controller { diff --git a/app/Http/Controllers/Moderation/TicketsController.php b/app/Http/Controllers/Moderation/TicketsController.php index c927e685..897cb7f4 100644 --- a/app/Http/Controllers/Moderation/TicketsController.php +++ b/app/Http/Controllers/Moderation/TicketsController.php @@ -10,17 +10,19 @@ use App\Models\TicketCategory; use App\Models\TicketComment; use App\Models\User; use App\Notifications\Ticket\User\ReplyNotification; +use App\Settings\LocaleSettings; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; class TicketsController extends Controller { - public function index() + public function index(LocaleSettings $locale_settings) { - $tickets = Ticket::orderBy('id', 'desc')->paginate(10); - $ticketcategories = TicketCategory::all(); - - return view('moderator.ticket.index', compact('tickets', 'ticketcategories')); + return view('moderator.ticket.index', [ + 'tickets' => Ticket::orderBy('id', 'desc')->paginate(10), + 'ticketcategories' => TicketCategory::all(), + 'locale_datatables' => $locale_settings->datatables + ]); } public function show($ticket_id) @@ -164,9 +166,11 @@ class TicketsController extends Controller ->make(true); } - public function blacklist() + public function blacklist(LocaleSettings $locale_settings) { - return view('moderator.ticket.blacklist'); + return view('moderator.ticket.blacklist', [ + 'locale_datatables' => $locale_settings->datatables + ]); } public function blacklistAdd(Request $request) diff --git a/app/Http/Controllers/Pterodactyl/PterodactylController.php b/app/Http/Controllers/Pterodactyl/PterodactylController.php new file mode 100644 index 00000000..350b7b0d --- /dev/null +++ b/app/Http/Controllers/Pterodactyl/PterodactylController.php @@ -0,0 +1,12 @@ +id)->paginate(10); - $ticketcategories = TicketCategory::all(); - - return view('ticket.index', compact('tickets', 'ticketcategories')); + return view('ticket.index', [ + 'tickets' => Ticket::where('user_id', Auth::user()->id)->paginate(10), + 'ticketcategories' => TicketCategory::all(), + 'locale_datatables' => $locale_settings->datatables + ]); } public function store(Request $request) diff --git a/app/Settings/DiscordSettings.php b/app/Settings/DiscordSettings.php index bcc51498..84decf3f 100644 --- a/app/Settings/DiscordSettings.php +++ b/app/Settings/DiscordSettings.php @@ -6,17 +6,17 @@ use Spatie\LaravelSettings\Settings; class DiscordSettings extends Settings { - public string $bot_token; + public ?string $bot_token; - public string $client_id; + public ?string $client_id; - public string $client_secret; + public ?string $client_secret; - public int $guild_id; + public ?string $guild_id; - public string $invite_url; + public ?string $invite_url; - public int $role_id; + public ?string $role_id; public static function group(): string { diff --git a/app/Settings/TicketSettings.php b/app/Settings/TicketSettings.php new file mode 100644 index 00000000..eeea6d86 --- /dev/null +++ b/app/Settings/TicketSettings.php @@ -0,0 +1,17 @@ +migrator->addEncrypted('discord.bot_token', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:BOT_TOKEN'): ''); $this->migrator->addEncrypted('discord.client_id', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:CLIENT_ID'): ''); $this->migrator->addEncrypted('discord.client_secret', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:CLIENT_SECRET'): ''); - $this->migrator->add('discord.guild_id', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:GUILD_ID'): null); + $this->migrator->add('discord.guild_id', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:GUILD_ID'): ''); $this->migrator->add('discord.invite_url', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:INVITE_URL'): ''); - $this->migrator->add('discord.role_id', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:ROLE_ID'): null); + $this->migrator->add('discord.role_id', $table_exists ? $this->getOldValue('SETTINGS::DISCORD:ROLE_ID'): ''); } public function getOldValue(string $key) diff --git a/database/settings/2023_02_01_182158_create_website_settings.php b/database/settings/2023_02_01_182158_create_website_settings.php index a1eacb3e..7c9a09ac 100644 --- a/database/settings/2023_02_01_182158_create_website_settings.php +++ b/database/settings/2023_02_01_182158_create_website_settings.php @@ -23,7 +23,7 @@ class CreateWebsiteSettings extends SettingsMigration $this->migrator->add('website.useful_links_enabled', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:USEFULLINKS_ENABLED") : true); $this->migrator->add('website.seo_title', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SEO_TITLE") : 'ControlPanel.gg'); $this->migrator->add('website.seo_description', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SEO_DESCRIPTION") : 'Billing software for Pterodactyl Panel.'); - + $this->migrator->add('website.enable_login_logo', true); } public function getOldValue(string $key) diff --git a/database/settings/2023_02_04_181156_create_ticket_settings.php b/database/settings/2023_02_04_181156_create_ticket_settings.php new file mode 100644 index 00000000..293fdf75 --- /dev/null +++ b/database/settings/2023_02_04_181156_create_ticket_settings.php @@ -0,0 +1,34 @@ +exists(); + + // Get the user-set configuration values from the old table. + $this->migrator->add('ticket.enabled', true); + $this->migrator->add('ticket.notify', $table_exists ? $this->getOldValue('SETTINGS::TICKET:NOTIFY') : 'all'); + + } + + public function getOldValue(string $key) + { + // Always get the first value of the key. + $old_value = DB::table('settings_old')->where('key', '=', $key)->get(['value', 'type'])->first(); + + // Handle the old values to return without it being a string in all cases. + if ($old_value->type === "string" || $old_value->type === "text") { + return $old_value->value; + } + + if ($old_value->type === "boolean") { + return filter_var($old_value->value, FILTER_VALIDATE_BOOL); + } + + return filter_var($old_value->value, FILTER_VALIDATE_INT); + } +} diff --git a/routes/web.php b/routes/web.php index fbbdb028..61481945 100644 --- a/routes/web.php +++ b/routes/web.php @@ -106,15 +106,14 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { Route::post('changelocale', [TranslationController::class, 'changeLocale'])->name('changeLocale'); //ticket user - if (config('SETTINGS::TICKET:ENABLED')) { - Route::get('ticket', [TicketsController::class, 'index'])->name('ticket.index'); - Route::get('ticket/datatable', [TicketsController::class, 'datatable'])->name('ticket.datatable'); - Route::get('ticket/new', [TicketsController::class, 'create'])->name('ticket.new'); - Route::post('ticket/new', [TicketsController::class, 'store'])->middleware(['throttle:ticket-new'])->name('ticket.new.store'); - Route::get('ticket/show/{ticket_id}', [TicketsController::class, 'show'])->name('ticket.show'); - Route::post('ticket/reply', [TicketsController::class, 'reply'])->middleware(['throttle:ticket-reply'])->name('ticket.reply'); - Route::post('ticket/status/{ticket_id}', [TicketsController::class, 'changeStatus'])->name('ticket.changeStatus'); - } + Route::get('ticket', [TicketsController::class, 'index'])->name('ticket.index'); + Route::get('ticket/datatable', [TicketsController::class, 'datatable'])->name('ticket.datatable'); + Route::get('ticket/new', [TicketsController::class, 'create'])->name('ticket.new'); + Route::post('ticket/new', [TicketsController::class, 'store'])->middleware(['throttle:ticket-new'])->name('ticket.new.store'); + Route::get('ticket/show/{ticket_id}', [TicketsController::class, 'show'])->name('ticket.show'); + Route::post('ticket/reply', [TicketsController::class, 'reply'])->middleware(['throttle:ticket-reply'])->name('ticket.reply'); + Route::post('ticket/close/{ticket_id}', [TicketsController::class, 'close'])->name('ticket.close'); + //admin Route::prefix('admin')->name('admin.')->middleware('admin')->group(function () { diff --git a/themes/default/views/admin/api/index.blade.php b/themes/default/views/admin/api/index.blade.php index 377095b1..644a1b52 100644 --- a/themes/default/views/admin/api/index.blade.php +++ b/themes/default/views/admin/api/index.blade.php @@ -65,7 +65,7 @@ document.addEventListener("DOMContentLoaded", function () { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/partners/index.blade.php b/themes/default/views/admin/partners/index.blade.php index 59369b01..b1a03c91 100644 --- a/themes/default/views/admin/partners/index.blade.php +++ b/themes/default/views/admin/partners/index.blade.php @@ -68,7 +68,7 @@ document.addEventListener("DOMContentLoaded", function () { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/payments/index.blade.php b/themes/default/views/admin/payments/index.blade.php index 5e1096ae..cda9984c 100644 --- a/themes/default/views/admin/payments/index.blade.php +++ b/themes/default/views/admin/payments/index.blade.php @@ -67,7 +67,7 @@ document.addEventListener("DOMContentLoaded", function() { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/products/create.blade.php b/themes/default/views/admin/products/create.blade.php index c6d72f68..ab538d60 100644 --- a/themes/default/views/admin/products/create.blade.php +++ b/themes/default/views/admin/products/create.blade.php @@ -149,7 +149,7 @@
- diff --git a/themes/default/views/admin/products/edit.blade.php b/themes/default/views/admin/products/edit.blade.php index 61357c71..fb99ec03 100644 --- a/themes/default/views/admin/products/edit.blade.php +++ b/themes/default/views/admin/products/edit.blade.php @@ -153,7 +153,7 @@ @enderror
- diff --git a/themes/default/views/admin/products/index.blade.php b/themes/default/views/admin/products/index.blade.php index bc15a70b..6475e842 100644 --- a/themes/default/views/admin/products/index.blade.php +++ b/themes/default/views/admin/products/index.blade.php @@ -79,7 +79,7 @@ document.addEventListener("DOMContentLoaded", function () { $("#datatable").DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/products/show.blade.php b/themes/default/views/admin/products/show.blade.php index daf9a6ab..217a27bf 100644 --- a/themes/default/views/admin/products/show.blade.php +++ b/themes/default/views/admin/products/show.blade.php @@ -87,7 +87,7 @@
- +
diff --git a/themes/default/views/admin/servers/index.blade.php b/themes/default/views/admin/servers/index.blade.php index 916eedd3..eaadcd66 100644 --- a/themes/default/views/admin/servers/index.blade.php +++ b/themes/default/views/admin/servers/index.blade.php @@ -34,20 +34,59 @@
- - @include('admin.servers.table') - -{{--
--}} -{{-- {!! $servers->links() !!}--}} -{{--
--}} - + + + + + + + + + + + + + + + +
{{__('Name')}}{{__('User')}}{{__('Server id')}}{{__('Config')}}{{__('Suspended at')}}{{__('Created at')}}
- -
@endsection + + diff --git a/themes/default/views/admin/store/index.blade.php b/themes/default/views/admin/store/index.blade.php index 66647030..45a0dbe2 100644 --- a/themes/default/views/admin/store/index.blade.php +++ b/themes/default/views/admin/store/index.blade.php @@ -83,7 +83,7 @@ document.addEventListener("DOMContentLoaded", function() { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ config('app.datatable_locale') }}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/usefullinks/index.blade.php b/themes/default/views/admin/usefullinks/index.blade.php index 5146f10d..da71f1f5 100644 --- a/themes/default/views/admin/usefullinks/index.blade.php +++ b/themes/default/views/admin/usefullinks/index.blade.php @@ -68,7 +68,7 @@ document.addEventListener("DOMContentLoaded", function () { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/users/index.blade.php b/themes/default/views/admin/users/index.blade.php index c1912185..7aa15f09 100644 --- a/themes/default/views/admin/users/index.blade.php +++ b/themes/default/views/admin/users/index.blade.php @@ -75,7 +75,7 @@ document.addEventListener("DOMContentLoaded", function() { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ config('SETTINGS::LOCALE:DATATABLES') }}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, //why was this set to false before? increased loadingtimes by 10 seconds diff --git a/themes/default/views/admin/vouchers/index.blade.php b/themes/default/views/admin/vouchers/index.blade.php index 1f60e9aa..2dd37dff 100644 --- a/themes/default/views/admin/vouchers/index.blade.php +++ b/themes/default/views/admin/vouchers/index.blade.php @@ -70,7 +70,7 @@ document.addEventListener("DOMContentLoaded", function () { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/admin/vouchers/users.blade.php b/themes/default/views/admin/vouchers/users.blade.php index 284dc1c3..62b44358 100644 --- a/themes/default/views/admin/vouchers/users.blade.php +++ b/themes/default/views/admin/vouchers/users.blade.php @@ -63,7 +63,7 @@ document.addEventListener("DOMContentLoaded", function() { $('#datatable').DataTable({ language: { - url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("SETTINGS::LOCALE:DATATABLES")}}.json' + url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ $locale_datatables }}.json' }, processing: true, serverSide: true, diff --git a/themes/default/views/auth/login.blade.php b/themes/default/views/auth/login.blade.php index d0f45635..720effd5 100644 --- a/themes/default/views/auth/login.blade.php +++ b/themes/default/views/auth/login.blade.php @@ -1,20 +1,20 @@ @extends('layouts.app') @section('content') - + @php($website_settings = app(App\Settings\WebsiteSettings::class))