Merge branch 'master' into 'production'

Master

See merge request Romulus21/portal!28

app/Http/Resources/User.php

@@ -14,6 +14,7 @@ class User extends JsonResource
      */
     public function toArray($request)
     {
+//        dd($this);
         return [
             'data' => [
                 'type' => 'users',
@@ -21,6 +22,7 @@ class User extends JsonResource
                 'attributes' => [
                     'name' => $this->name,
                     'email' => $this->email,
+                    'last_login' => optional($this->login_at)->diffForHumans(),
                     'is_admin' => $this->isAdmin(),
                 ],
             ],

app/Models/User.php

@@ -43,6 +43,8 @@ class User extends Authenticatable
         'email_verified_at' => 'datetime',
     ];
 
+    protected $dates = ['login_at'];
+
     public function isAdmin(): bool
     {
         return $this->role === 2;

resources/js/views/User/UserAdmin.vue

@@ -36,7 +36,9 @@
             <transition name="fade">
             <ul v-if="userListToggle"  class="box-toggle-content">
                 <Loader v-if="loading" />
-                <li v-else v-for="user in users"><a :href="user.links.self">{{ user.data.attributes.name }}</a> - {{ user.data.attributes.email }} - {{ user.data.attributes.is_admin }}</li>
+                <li v-else v-for="user in users">
+                    <router-link :to="'/user/' + user.data.user_id">{{ user.data.attributes.name }}</router-link> - {{ user.data.attributes.email }} - {{ user.data.attributes.last_login }} | {{ user.data.attributes.is_admin }}
+                </li>
             </ul>
             </transition>
         </div>