esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

MAPG-156 rename profile to account

Browse Source
This commit is contained in:
Bence Pőcze 2020-06-25 16:44:34 +02:00
parent e2067627c4
commit ad24f8ac28
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/static/js/profile.js → public/static/js/account.js
View File

@ -1,5 +1,5 @@
(function () {
var form = document.getElementById('profileForm');
var form = document.getElementById('accountForm');
form.elements.password_new.onkeyup = function () {
MapGuesser.toggleDisableOnChange(this, form.elements.save);
@ -33,14 +33,14 @@
break;
}
var profileFormError = document.getElementById('profileFormError');
profileFormError.style.display = 'block';
profileFormError.innerHTML = errorText;
var accountFormError = document.getElementById('accountFormError');
accountFormError.style.display = 'block';
accountFormError.innerHTML = errorText;
return;
}
document.getElementById('profileFormError').style.display = 'none';
document.getElementById('accountFormError').style.display = 'none';
form.reset();
form.elements.save.disabled = true;
}, formData);

6
src/Controller/UserController.php
View File

@ -27,7 +27,7 @@ class UserController implements ISecured
return $user !== null;
}
public function getProfile(): IContent
public function getAccount(): IContent
{
/**
* @var User $user
@ -35,10 +35,10 @@ class UserController implements ISecured
$user = $this->request->user();
$data = ['user' => $user->toArray()];
return new HtmlContent('profile', $data);
return new HtmlContent('account', $data);
}
public function saveProfile(): IContent
public function saveAccount(): IContent
{
/**
* @var User $user

8
views/profile.php → views/account.php
View File

@ -1,20 +1,20 @@
<?php
$jsFiles = [
'js/profile.js',
'js/account.js',
];
?>
<?php require ROOT . '/views/templates/main_header.php'; ?>
<?php require ROOT . '/views/templates/header.php'; ?>
<h2>Profile</h2>
<h2>Account</h2>
<div class="box">
<form id="profileForm" action="/profile" method="post">
<form id="accountForm" action="/account" method="post">
<input class="big fullWidth" type="password" name="password" placeholder="Current password" autofocus>
<hr>
<?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
<input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
<input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
<input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
<p id="profileFormError" class="formError justify marginTop"></p>
<p id="accountFormError" class="formError justify marginTop"></p>
<div class="right marginTop">
<button type="submit" name="save" disabled>Save</button>
</div>

2
views/templates/header.php
View File

@ -7,7 +7,7 @@
</h1>
<p>
<?php if (Container::$request->user()) : ?>
<span><a href="/profile" title="Profile">
<span><a href="/account" title="Account">
<?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
<svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>

6
web.php
View File

@ -32,9 +32,9 @@ Container::$routeCollection->group('signup', function (MapGuesser\Routing\RouteC
$routeCollection->get('signup.cancel', 'cancel/{token}', [MapGuesser\Controller\LoginController::class, 'cancel']);
});
Container::$routeCollection->get('logout', 'logout', [MapGuesser\Controller\LoginController::class, 'logout']);
Container::$routeCollection->group('profile', function (MapGuesser\Routing\RouteCollection $routeCollection) {
$routeCollection->get('profile', '', [MapGuesser\Controller\UserController::class, 'getProfile']);
$routeCollection->post('profile-action', '', [MapGuesser\Controller\UserController::class, 'saveProfile']);
Container::$routeCollection->group('account', function (MapGuesser\Routing\RouteCollection $routeCollection) {
$routeCollection->get('account', '', [MapGuesser\Controller\UserController::class, 'getAccount']);
$routeCollection->post('account-action', '', [MapGuesser\Controller\UserController::class, 'saveAccount']);
});
//Container::$routeCollection->get('maps', 'maps', [MapGuesser\Controller\MapsController::class, 'getMaps']);
Container::$routeCollection->group('game', function (MapGuesser\Routing\RouteCollection $routeCollection) {