Update core templates for user image

src/Module/Templates/DemoApi/src/Controllers/AuthController.php.tpl

@@ -18,6 +18,7 @@ use Quantum\Libraries\Auth\Exceptions\AuthException;
 use Quantum\Http\Constants\StatusCode;
 use Quantum\Http\Response;
 use Quantum\Http\Request;
+use {{MODULE_NAMESPACE}}\Enums\Role;
 
 /**
  * Class AuthController
@@ -92,7 +93,12 @@ class AuthController extends BaseController
      */
     public function signup(Request $request, Response $response)
     {
-        auth()->signup($request->all());
+        $userData = $request->all();
+
+        $userData['uuid'] =  uuid_ordered();
+        $userData['role'] = Role::EDITOR;
+
+        auth()->signup($userData);
 
         $response->json([
             'status' => self::STATUS_SUCCESS,

src/Module/Templates/DemoApi/src/Enums/Role.php.tpl

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Quantum PHP Framework
+ *
+ * An open source software development framework for PHP
+ *
+ * @package Quantum
+ * @author Arman Ag. <arman.ag@softberg.org>
+ * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
+ * @link http://quantum.softberg.org/
+ * @since 2.9.9
+ */
+
+namespace {{MODULE_NAMESPACE}}\Enums;
+
+/**
+ * Class Role
+ * @package Modules\{{MODULE_NAME}}
+ */
+class Role
+{
+    const ADMIN = 'admin';
+
+    const EDITOR = 'editor';
+}

src/Module/Templates/DemoApi/src/Models/User.php.tpl

@@ -9,7 +9,7 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.9.8
+ * @since 2.9.9
  */
 
 namespace {{MODULE_NAMESPACE}}\Models;
@@ -46,6 +46,7 @@ class User extends QtModel
         'role',
         'email',
         'password',
+        'image',
         'activation_token',
         'remember_token',
         'reset_token',

src/Module/Templates/DemoApi/src/Services/AuthService.php.tpl

@@ -9,7 +9,7 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.9.8
+ * @since 2.9.9
  */
 
 namespace {{MODULE_NAMESPACE}}\Services;
@@ -94,9 +94,6 @@ class AuthService extends QtService implements AuthServiceInterface
      */
     public function add(array $data): AuthUser
     {
-        $data['uuid'] = $data['uuid'] ?? uuid_ordered();
-        $data['role'] = $data['role'] ?? 'editor';
-
         $this->createUserDirectory($data['uuid']);
 
         $user = $this->model->create();
@@ -149,6 +146,7 @@ class AuthService extends QtService implements AuthServiceInterface
             'role' => ['name' => 'role', 'visible' => true],
             'username' => ['name' => 'email', 'visible' => true],
             'password' => ['name' => 'password', 'visible' => false],
+            'image' => ['name' => 'image', 'visible' => true],
             'activationToken' => ['name' => 'activation_token', 'visible' => false],
             'rememberToken' => ['name' => 'remember_token', 'visible' => false],
             'resetToken' => ['name' => 'reset_token', 'visible' => false],
@@ -170,6 +168,10 @@ class AuthService extends QtService implements AuthServiceInterface
      */
     private function createUserDirectory(string $uuid)
     {
-        fs()->makeDirectory(uploads_dir() . DS . $uuid);
+        $userDirectory = uploads_dir() . DS . $uuid;
+
+        if(!fs()->isDirectory($userDirectory)) {
+            fs()->makeDirectory($userDirectory);
+        }
     }
 }

src/Module/Templates/DemoWeb/assets/css/custom.css

@@ -298,6 +298,13 @@ a:hover {
     margin-top: 6px;
 }
 
+.user-avatar {
+    width:32px;
+    height:32px;
+    object-fit:cover;
+    margin-top: 18px;
+    margin-right:8px;
+}
 
 .post-item {
     margin-bottom: 15px;

src/Module/Templates/DemoWeb/src/Controllers/AccountController.php.tpl

@@ -14,7 +14,6 @@
 
 namespace {{MODULE_NAMESPACE}}\Controllers;
 
-use Quantum\Libraries\Auth\Contracts\AuthenticatableInterface;
 use Quantum\Service\Factories\ServiceFactory;
 use {{MODULE_NAMESPACE}}\Services\AuthService;
 use Quantum\Libraries\Hasher\Hasher;

src/Module/Templates/DemoWeb/src/Controllers/AuthController.php.tpl

@@ -17,6 +17,7 @@ namespace {{MODULE_NAMESPACE}}\Controllers;
 use Quantum\Libraries\Auth\Exceptions\AuthException;
 use Quantum\Http\Response;
 use Quantum\Http\Request;
+use {{MODULE_NAMESPACE}}\Enums\Role;
 
 /**
  * Class AuthController
@@ -101,7 +102,13 @@ class AuthController extends BaseController
     public function signup(Request $request, Response $response)
     {
         if ($request->isMethod('post')) {
-            auth()->signup($request->all());
+            $userData = $request->all();
+
+            $userData['uuid'] =  uuid_ordered();
+            $userData['role'] = Role::EDITOR;
+
+            auth()->signup($userData);
+
             session()->setFlash('success', t('common.check_email_signup'));
             redirect(base_url(true) . '/' . current_lang() . '/signup');
         } else {

src/Module/Templates/DemoWeb/src/Enums/Role.php.tpl

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Quantum PHP Framework
+ *
+ * An open source software development framework for PHP
+ *
+ * @package Quantum
+ * @author Arman Ag. <arman.ag@softberg.org>
+ * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
+ * @link http://quantum.softberg.org/
+ * @since 2.9.9
+ */
+
+namespace {{MODULE_NAMESPACE}}\Enums;
+
+/**
+ * Class Role
+ * @package Modules\{{MODULE_NAME}}
+ */
+class Role
+{
+    const ADMIN = 'admin';
+
+    const EDITOR = 'editor';
+}

src/Module/Templates/DemoWeb/src/Models/User.php.tpl

@@ -9,7 +9,7 @@
  * @author Arman Ag. <arman.ag@softberg.org>
  * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
  * @link http://quantum.softberg.org/
- * @since 2.9.8
+ * @since 2.9.9
  */
 
 namespace {{MODULE_NAMESPACE}}\Models;
@@ -46,6 +46,7 @@ class User extends QtModel
         'role',
         'email',
         'password',
+        'image',
         'activation_token',
         'remember_token',
         'reset_token',

src/Module/Templates/DemoWeb/src/Services/AuthService.php.tpl

@@ -94,9 +94,6 @@ class AuthService extends QtService implements AuthServiceInterface
      */
     public function add(array $data): AuthUser
     {
-        $data['uuid'] = $data['uuid'] ?? uuid_ordered();
-        $data['role'] = $data['role'] ?? 'editor';
-
         $this->createUserDirectory($data['uuid']);
 
         $user = $this->model->create();
@@ -149,6 +146,7 @@ class AuthService extends QtService implements AuthServiceInterface
             'role' => ['name' => 'role', 'visible' => true],
             'username' => ['name' => 'email', 'visible' => true],
             'password' => ['name' => 'password', 'visible' => false],
+            'image' => ['name' => 'image', 'visible' => true],
             'activationToken' => ['name' => 'activation_token', 'visible' => false],
             'rememberToken' => ['name' => 'remember_token', 'visible' => false],
             'resetToken' => ['name' => 'reset_token', 'visible' => false],
@@ -170,6 +168,10 @@ class AuthService extends QtService implements AuthServiceInterface
      */
     private function createUserDirectory(string $uuid)
     {
-        fs()->makeDirectory(uploads_dir() . DS . $uuid);
+        $userDirectory = uploads_dir() . DS . $uuid;
+
+        if(!fs()->isDirectory($userDirectory)) {
+            fs()->makeDirectory($userDirectory);
+        }
     }
 }

src/Module/Templates/DemoWeb/src/Views/partials/navbar.php.tpl

@@ -19,7 +19,11 @@
                 <li>
                     <a class="dropdown-trigger login-list" href="#!" data-target="dropdown1">
                         <span class="hide-on-small-only show-on-medium-and-up">
-                            <i class="material-icons left">person</i>
+                            <?php if (auth()->user()->image): ?>
+                                <img src="<?php echo base_url() . '/uploads/' . auth()->user()->uuid . '/' . auth()->user()->image ?>" alt="Avatar" class="circle left user-avatar">
+                            <?php else: ?>
+                                <i class="material-icons left">person</i>
+                            <?php endif; ?>
                             <?php echo auth()->user()->firstname . ' ' . auth()->user()->lastname ?>
                             <i class="material-icons right">arrow_drop_down</i>
                         </span>