This commit is contained in:
Marcel Pociot
2020-05-03 00:21:16 +02:00
parent c717683634
commit 72d33b1b70
19 changed files with 408 additions and 103 deletions

View File

@@ -2,9 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
@@ -19,20 +18,20 @@ class DeleteUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->database->query("DELETE FROM users WHERE id = :id", ['id' => $request->id])
->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});
$this->userRepository->deleteUser($request->get('id'))
->then(function() use ($httpConnection) {
$httpConnection->send(respond_json(['deleted' => true], 200));
$httpConnection->close();
});
}
}

View File

@@ -5,9 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;

View File

@@ -2,8 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
@@ -17,26 +17,24 @@ class ListUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
{
$this->database->query('SELECT * FROM users ORDER by created_at DESC')->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $result->rows]))
);
$this->userRepository
->getUsers()
->then(function ($users) use ($httpConnection) {
$httpConnection->send(
respond_html($this->getView($httpConnection, 'server.users.index', ['users' => $users]))
);
$httpConnection->close();
}, function (\Exception $exception) use ($httpConnection) {
$httpConnection->send(respond_html('Something went wrong: '.$exception->getMessage(), 500));
$httpConnection->close();
});
$httpConnection->close();
});
}
}

View File

@@ -5,7 +5,6 @@ namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;

View File

@@ -3,11 +3,7 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\ConnectionManager;
use App\Http\Controllers\Controller;
use App\Server\Configuration;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
use Ratchet\ConnectionInterface;
use Twig\Environment;

View File

@@ -2,8 +2,8 @@
namespace App\Server\Http\Controllers\Admin;
use App\Contracts\UserRepository;
use App\Http\Controllers\Controller;
use Clue\React\SQLite\DatabaseInterface;
use Clue\React\SQLite\Result;
use GuzzleHttp\Psr7\Response;
use Illuminate\Http\Request;
@@ -19,12 +19,12 @@ class StoreUsersController extends AdminController
{
protected $keepConnectionOpen = true;
/** @var DatabaseInterface */
protected $database;
/** @var UserRepository */
protected $userRepository;
public function __construct(DatabaseInterface $database)
public function __construct(UserRepository $userRepository)
{
$this->database = $database;
$this->userRepository = $userRepository;
}
public function handle(Request $request, ConnectionInterface $httpConnection)
@@ -47,16 +47,11 @@ class StoreUsersController extends AdminController
'auth_token' => (string)Str::uuid()
];
$this->database->query("
INSERT INTO users (name, auth_token, created_at)
VALUES (:name, :auth_token, DATETIME('now'))
", $insertData)
->then(function (Result $result) use ($httpConnection) {
$this->database->query("SELECT * FROM users WHERE id = :id", ['id' => $result->insertId])
->then(function (Result $result) use ($httpConnection) {
$httpConnection->send(respond_json(['user' => $result->rows[0]], 200));
$httpConnection->close();
});
});
$this->userRepository
->storeUser($insertData)
->then(function ($user) use ($httpConnection) {
$httpConnection->send(respond_json(['user' => $user], 200));
$httpConnection->close();
});
}
}