Skip to content

Commit 3479d18

Browse files
armanistarmanist
authored
Merge pull request #342 from armanist/341-Update-core-templates-for-user-image
Update core templates for user image
2 parents 7cbeadb + bbdf9f5 commit 3479d18

File tree

11 files changed

+96
-15
lines changed

11 files changed

+96
-15
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use Quantum\Libraries\Auth\Exceptions\AuthException;
1818
use Quantum\Http\Constants\StatusCode;
1919
use Quantum\Http\Response;
2020
use Quantum\Http\Request;
21+
use {{MODULE_NAMESPACE}}\Enums\Role;
2122

2223
/**
2324
* Class AuthController
@@ -92,7 +93,12 @@ class AuthController extends BaseController
9293
*/
9394
public function signup(Request $request, Response $response)
9495
{
95-
auth()->signup($request->all());
96+
$userData = $request->all();
97+
98+
$userData['uuid'] = uuid_ordered();
99+
$userData['role'] = Role::EDITOR;
100+
101+
auth()->signup($userData);
96102
97103
$response->json([
98104
'status' => self::STATUS_SUCCESS,

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
/**
4+
* Quantum PHP Framework
5+
*
6+
* An open source software development framework for PHP
7+
*
8+
* @package Quantum
9+
* @author Arman Ag. <arman.ag@softberg.org>
10+
* @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
11+
* @link http://quantum.softberg.org/
12+
* @since 2.9.9
13+
*/
14+
15+
namespace {{MODULE_NAMESPACE}}\Enums;
16+
17+
/**
18+
* Class Role
19+
* @package Modules\{{MODULE_NAME}}
20+
*/
21+
class Role
22+
{
23+
const ADMIN = 'admin';
24+
25+
const EDITOR = 'editor';
26+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @author Arman Ag. <arman.ag@softberg.org>
1010
* @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
1111
* @link http://quantum.softberg.org/
12-
* @since 2.9.8
12+
* @since 2.9.9
1313
*/
1414

1515
namespace {{MODULE_NAMESPACE}}\Models;
@@ -46,6 +46,7 @@ class User extends QtModel
4646
'role',
4747
'email',
4848
'password',
49+
'image',
4950
'activation_token',
5051
'remember_token',
5152
'reset_token',

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @author Arman Ag. <arman.ag@softberg.org>
1010
* @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
1111
* @link http://quantum.softberg.org/
12-
* @since 2.9.8
12+
* @since 2.9.9
1313
*/
1414

1515
namespace {{MODULE_NAMESPACE}}\Services;
@@ -94,9 +94,6 @@ class AuthService extends QtService implements AuthServiceInterface
9494
*/
9595
public function add(array $data): AuthUser
9696
{
97-
$data['uuid'] = $data['uuid'] ?? uuid_ordered();
98-
$data['role'] = $data['role'] ?? 'editor';
99-
10097
$this->createUserDirectory($data['uuid']);
10198
10299
$user = $this->model->create();
@@ -149,6 +146,7 @@ class AuthService extends QtService implements AuthServiceInterface
149146
'role' => ['name' => 'role', 'visible' => true],
150147
'username' => ['name' => 'email', 'visible' => true],
151148
'password' => ['name' => 'password', 'visible' => false],
149+
'image' => ['name' => 'image', 'visible' => true],
152150
'activationToken' => ['name' => 'activation_token', 'visible' => false],
153151
'rememberToken' => ['name' => 'remember_token', 'visible' => false],
154152
'resetToken' => ['name' => 'reset_token', 'visible' => false],
@@ -170,6 +168,10 @@ class AuthService extends QtService implements AuthServiceInterface
170168
*/
171169
private function createUserDirectory(string $uuid)
172170
{
173-
fs()->makeDirectory(uploads_dir() . DS . $uuid);
171+
$userDirectory = uploads_dir() . DS . $uuid;
172+
173+
if(!fs()->isDirectory($userDirectory)) {
174+
fs()->makeDirectory($userDirectory);
175+
}
174176
}
175177
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,13 @@ a:hover {
298298
margin-top: 6px;
299299
}
300300

301+
.user-avatar {
302+
width:32px;
303+
height:32px;
304+
object-fit:cover;
305+
margin-top: 18px;
306+
margin-right:8px;
307+
}
301308

302309
.post-item {
303310
margin-bottom: 15px;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
namespace {{MODULE_NAMESPACE}}\Controllers;
1616

17-
use Quantum\Libraries\Auth\Contracts\AuthenticatableInterface;
1817
use Quantum\Service\Factories\ServiceFactory;
1918
use {{MODULE_NAMESPACE}}\Services\AuthService;
2019
use Quantum\Libraries\Hasher\Hasher;

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace {{MODULE_NAMESPACE}}\Controllers;
1717
use Quantum\Libraries\Auth\Exceptions\AuthException;
1818
use Quantum\Http\Response;
1919
use Quantum\Http\Request;
20+
use {{MODULE_NAMESPACE}}\Enums\Role;
2021

2122
/**
2223
* Class AuthController
@@ -101,7 +102,13 @@ class AuthController extends BaseController
101102
public function signup(Request $request, Response $response)
102103
{
103104
if ($request->isMethod('post')) {
104-
auth()->signup($request->all());
105+
$userData = $request->all();
106+
107+
$userData['uuid'] = uuid_ordered();
108+
$userData['role'] = Role::EDITOR;
109+
110+
auth()->signup($userData);
111+
105112
session()->setFlash('success', t('common.check_email_signup'));
106113
redirect(base_url(true) . '/' . current_lang() . '/signup');
107114
} else {

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
/**
4+
* Quantum PHP Framework
5+
*
6+
* An open source software development framework for PHP
7+
*
8+
* @package Quantum
9+
* @author Arman Ag. <arman.ag@softberg.org>
10+
* @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
11+
* @link http://quantum.softberg.org/
12+
* @since 2.9.9
13+
*/
14+
15+
namespace {{MODULE_NAMESPACE}}\Enums;
16+
17+
/**
18+
* Class Role
19+
* @package Modules\{{MODULE_NAME}}
20+
*/
21+
class Role
22+
{
23+
const ADMIN = 'admin';
24+
25+
const EDITOR = 'editor';
26+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @author Arman Ag. <arman.ag@softberg.org>
1010
* @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org)
1111
* @link http://quantum.softberg.org/
12-
* @since 2.9.8
12+
* @since 2.9.9
1313
*/
1414

1515
namespace {{MODULE_NAMESPACE}}\Models;
@@ -46,6 +46,7 @@ class User extends QtModel
4646
'role',
4747
'email',
4848
'password',
49+
'image',
4950
'activation_token',
5051
'remember_token',
5152
'reset_token',

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ class AuthService extends QtService implements AuthServiceInterface
9494
*/
9595
public function add(array $data): AuthUser
9696
{
97-
$data['uuid'] = $data['uuid'] ?? uuid_ordered();
98-
$data['role'] = $data['role'] ?? 'editor';
99-
10097
$this->createUserDirectory($data['uuid']);
10198
10299
$user = $this->model->create();
@@ -149,6 +146,7 @@ class AuthService extends QtService implements AuthServiceInterface
149146
'role' => ['name' => 'role', 'visible' => true],
150147
'username' => ['name' => 'email', 'visible' => true],
151148
'password' => ['name' => 'password', 'visible' => false],
149+
'image' => ['name' => 'image', 'visible' => true],
152150
'activationToken' => ['name' => 'activation_token', 'visible' => false],
153151
'rememberToken' => ['name' => 'remember_token', 'visible' => false],
154152
'resetToken' => ['name' => 'reset_token', 'visible' => false],
@@ -170,6 +168,10 @@ class AuthService extends QtService implements AuthServiceInterface
170168
*/
171169
private function createUserDirectory(string $uuid)
172170
{
173-
fs()->makeDirectory(uploads_dir() . DS . $uuid);
171+
$userDirectory = uploads_dir() . DS . $uuid;
172+
173+
if(!fs()->isDirectory($userDirectory)) {
174+
fs()->makeDirectory($userDirectory);
175+
}
174176
}
175177
}

0 commit comments

Comments
 (0)