diff --git a/app/Http/Livewire/UsersTable.php b/app/Http/Livewire/UsersTable.php index 6b67dfc..e28d85f 100644 --- a/app/Http/Livewire/UsersTable.php +++ b/app/Http/Livewire/UsersTable.php @@ -19,6 +19,18 @@ class UsersTable extends DataTableComponent $this->setDefaultSort('created_at', 'asc'); $this->setPerPageAccepted([50, 100, 250, 500, 1000, -1]); $this->setColumnSelectEnabled(); + + $attributes = [ + 'default' => false, + 'default-colors' => true, + 'default-styling' => false, + ]; + + $this->setTableAttributes(['class' => 'table table-striped']); + $this->setTrAttributes(fn($row, $index) => $attributes); + $this->setTheadAttributes($attributes); + $this->setTbodyAttributes($attributes); + $this->setTrAttributes(fn($row, $index) => $attributes); } public function rendered() @@ -43,7 +55,7 @@ class UsersTable extends DataTableComponent ->searchable() ->format(function ($value, $row, Column $column) { if (!$row->littlelink_name == NULL) { - return "littlelink_name) . "' target='_blank' class='text-warning'>  " . htmlspecialchars($row->littlelink_name) . " "; + return "littlelink_name) . "' target='_blank' class='text-info'>  " . htmlspecialchars($row->littlelink_name) . " "; } else { return 'N/A'; } @@ -63,31 +75,27 @@ class UsersTable extends DataTableComponent return $clicksSum; }), Column::make(__('messages.E-Mail'), "email_verified_at") + ->hideIf(env('REGISTER_AUTH') === 'auth') ->sortable() ->format(function ($value, $row, Column $column) { - if (env('REGISTER_AUTH') !== 'auth') { - if ($row->role == 'admin' && $row->email_verified_at != '') { - return '
-
'; - } else { - if($row->email_verified_at == ''){ - $verifyLinkBool = 'true'; - } else { - $verifyLinkBool = 'false'; - } - $verifyLink = route('verifyUser', [ - 'verify' => $verifyLinkBool, - 'id' => $row->id - ]); - if ($row->email_verified_at == '') { - return '
' . __('messages.Pending') . '
'; - } else { - return '
' . __('messages.Verified') . '
'; - } - } - } else { + if ($row->role == 'admin' && $row->email_verified_at != '') { return '
-
'; + } else { + if($row->email_verified_at == ''){ + $verifyLinkBool = 'true'; + } else { + $verifyLinkBool = 'false'; + } + $verifyLink = route('verifyUser', [ + 'verify' => $verifyLinkBool, + 'id' => $row->id + ]); + if ($row->email_verified_at == '') { + return '
' . __('messages.Pending') . '
'; + } else { + return '
' . __('messages.Verified') . '
'; + } } - return ''; })->html(), Column::make(__('messages.Status'), "block") ->sortable() diff --git a/resources/views/panel/users.blade.php b/resources/views/panel/users.blade.php index 619725b..060f453 100755 --- a/resources/views/panel/users.blade.php +++ b/resources/views/panel/users.blade.php @@ -12,7 +12,6 @@
-
@@ -33,11 +32,11 @@ } .placeholder { - height: 1.5rem; + height: 1.2rem; background-color: #8a92a6; background: linear-gradient(90deg, var(--spinnerColor) 25%, #b8bcc5 50%, var(--spinnerColor) 75%); background-size: 200% 100%; - animation: shimmer 3s infinite linear; + animation: shimmer 2s infinite linear; } @keyframes shimmer { @@ -59,7 +58,7 @@
@@ -82,13 +81,13 @@ - @for ($ii = 0; $ii < 2; $ii++) - + @for ($ii = 0; $ii < 4; $ii++) + @for ($i = 0; $i < 5; $i++)
@endfor - + @for ($i = 0; $i < 5; $i++)
@endfor