mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-07 13:46:42 +02:00
Code Issues Releases Wiki Activity

Flextype Admin Panel: Installation page improvements #194 #186

Browse Source
This commit is contained in:
Awilum
2019-07-30 19:56:22 +03:00
parent 78cb5d1917
commit bd40f153b3
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
site/plugins/admin/app/Controllers/UsersController.php
View File

@@ -46,7 +46,7 @@ class UsersController extends Controller
'plugins/admin/views/templates/users/login.html'
);
} else {
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.installation'));
}
}
}
@@ -80,14 +80,14 @@ class UsersController extends Controller
}
/**
* Registration page
* Installation page
*
* @param Request $request PSR7 request
* @param Response $response PSR7 response
*
* @return Response
*/
public function registration(Request $request, Response $response) : Response
public function installation(Request $request, Response $response) : Response
{
$users = $this->getUsers();
@@ -99,21 +99,21 @@ class UsersController extends Controller
} else {
return $this->view->render(
$response,
'plugins/admin/views/templates/users/registration.html'
'plugins/admin/views/templates/users/installation.html'
);
}
}
}
/**
* Registration page process
* Installation page process
*
* @param Request $request PSR7 request
* @param Response $response PSR7 response
*
* @return Response
*/
public function registrationProcess(Request $request, Response $response) : Response
public function installationProcess(Request $request, Response $response) : Response
{
// Get POST data
$data = $request->getParsedBody();
@@ -130,10 +130,10 @@ class UsersController extends Controller
)) {
return $response->withRedirect($this->router->pathFor('admin.users.login'));
} else {
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.installation'));
}
} else {
return $response->withRedirect($this->router->pathFor('admin.users.registration'));
return $response->withRedirect($this->router->pathFor('admin.users.installation'));
}
}

2
site/plugins/admin/lang/en_US.json
View File

@@ -1,5 +1,7 @@
{
"admin": "Admin",
"admin_welcome": "Welcome",
"admin_create_new_user_welcome": "To finish setup and secure your site, please create the first user by entering the necessary information below.",
"admin_cancel": "Cancel",
"admin_create": "Create",
"admin_debugging": "Debugging",

4
site/plugins/admin/routes/web.php
View File

@@ -4,8 +4,8 @@ namespace Flextype;
// UsersController
$app->group('/' . $admin_route, function () use ($flextype, $app) {
$app->get('/registration', 'UsersController:registration')->setName('admin.users.registration');
$app->post('/registration', 'UsersController:registrationProcess')->setName('admin.users.registrationProcess');
$app->get('/installation', 'UsersController:installation')->setName('admin.users.installation');
$app->post('/installation', 'UsersController:installationProcess')->setName('admin.users.installationProcess');
$app->get('/login', 'UsersController:login')->setName('admin.users.login');
$app->post('/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess');
});

8
site/plugins/admin/views/templates/users/registration.html → site/plugins/admin/views/templates/users/installation.html
View File

@@ -2,11 +2,17 @@
{% block content %}
<div class="row">
<div class="col-4 float-center">
<h3 class="h3 auth-header text-center">{{ tr('admin_welcome') }}!</h3>
<p class="text-center">{{ tr('admin_create_new_user_welcome') }}</p>
</div>
</div>
<form action="" method="post">
{{ csrf() }}
<div class="row">
<div class="col-4 float-center">
<h3 class="h3 auth-header text-center">{{ tr('admin_create_new_user') }}</h3>
<div class="form-group">
<label>{{ tr('admin_username') }}</label>
<input type="text" name="username" value="" class="form-control" placeholder="lowercase chars only, e.g. admin" pattern="^[a-z0-9_-]{3,16}$" required="required">