diff --git a/app/Http/Livewire/UserTable.php b/app/Http/Livewire/UserTable.php index 357c3f6..f7ec6a6 100644 --- a/app/Http/Livewire/UserTable.php +++ b/app/Http/Livewire/UserTable.php @@ -16,21 +16,22 @@ class UserTable extends DataTableComponent { $this->setPrimaryKey('id'); $this->setPerPageAccepted([50, 100, 250, 500, 1000, -1]); + $this->setColumnSelectEnabled(); } public function columns(): array { return [ - Column::make("Id", "id") + Column::make(__('messages.ID'), "id") ->sortable() ->searchable(), - Column::make("Name", "name") + Column::make(__('messages.Name'), "name") ->sortable() ->searchable(), - Column::make("Email", "email") + Column::make(__('messages.E-Mail'), "email") ->sortable() ->searchable(), - Column::make("Littlelink name", "littlelink_name") + Column::make(__('messages.Page'), "littlelink_name") ->sortable() ->searchable() ->format(function ($value, $row, Column $column) { @@ -41,22 +42,20 @@ class UserTable extends DataTableComponent } }) ->html(), - Column::make("Role", "role") + Column::make(__('messages.Role'), "role") ->sortable() ->searchable(), - Column::make("Test", "id") - ->sortable() + Column::make(__('messages.Links'), "id") ->format(function ($value, $row) { $linkCount = Link::where('user_id', $row->id)->count(); return $linkCount; }), - Column::make("Clicks Sum", "id") - ->sortable() + Column::make(__('messages.Clicks'), "id") ->format(function ($value, $row) { $clicksSum = Link::where('user_id', $row->id)->sum('click_number'); return $clicksSum; }), - Column::make("E-mail", "email_verified_at") + Column::make(__('messages.E-Mail'), "email_verified_at") ->sortable() ->format(function ($value, $row, Column $column) { if (env('REGISTER_AUTH') !== 'auth') { @@ -78,7 +77,7 @@ class UserTable extends DataTableComponent } return ''; })->html(), - Column::make("Blocked", "block") + Column::make(__('messages.Status'), "block") ->sortable() ->format(function ($value, $row, Column $column) { if ($row->role === 'admin' && $row->id === 1) { @@ -94,7 +93,7 @@ class UserTable extends DataTableComponent } }) ->html(), - Column::make("Created at", "created_at") + Column::make(__('messages.Created at'), "created_at") ->sortable() ->format(function ($value) { if ($value) { @@ -103,7 +102,7 @@ class UserTable extends DataTableComponent return ''; } }), - Column::make("Last seen", "updated_at") + Column::make(__('messages.Last seen'), "updated_at") ->sortable() ->format(function ($value) { $now = now(); @@ -119,7 +118,7 @@ class UserTable extends DataTableComponent return $diff->y . ' years ago'; } }), - Column::make('Actions', "id") + Column::make(__('messages.Action'), "id") ->format(function ($value, $row, Column $column) { return view('components.table-components.action', ['user' => $row]); }), diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 74fb1a2..74ad3c4 100755 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -19,7 +19,6 @@ $usrhandl = Auth::user()->littlelink_name; - @livewireStyles @include('layouts.analytics') @stack('sidebar-stylesheets') @include('layouts.notifications') @@ -792,7 +791,6 @@ $usrhandl = Auth::user()->littlelink_name; -@livewireScripts @stack('sidebar-scripts') diff --git a/resources/views/panel/users.blade.php b/resources/views/panel/users.blade.php index 1e73909..52dfd0c 100755 --- a/resources/views/panel/users.blade.php +++ b/resources/views/panel/users.blade.php @@ -23,7 +23,6 @@

{{__('messages.Manage Users')}}

- {{__('messages.Users:')}} @@ -52,8 +51,9 @@
-@push('sidebar-styles') +@push('sidebar-stylesheets') + @endpush @push('sidebar-scripts')