Skip to content

Commit 78cbdf4

Browse files
AwilumAwilum
committed
Merge branch 'master' into dev
2 parents 96727e2 + f3e8949 commit 78cbdf4

8 files changed

Lines changed: 137 additions & 130 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
<a name="1.4.0"></a>
2+
# [1.4.0](https://github.com/flextype-plugins/accounts-admin) (2020-08-25)
3+
4+
### Features
5+
6+
* **core** update code base for new Flextype 0.9.11
7+
18
<a name="1.3.0"></a>
29
# [1.3.0](https://github.com/flextype-plugins/accounts-admin) (2020-08-19)
310

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Accounts Admin Plugin for <a href="http://flextype.org/">Flextype</a></h1>
22

33
<p align="center">
4-
<a href="https://github.com/flextype-plugins/accounts-admin/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/accounts-admin.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/accounts-admin"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/accounts-admin"><img src="https://img.shields.io/github/downloads/flextype-plugins/accounts-admin/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.10-green.svg?color=black" alt="Flextype"></a> <a href="https://crowdin.com/project/flextype-plugin-accounts-admin"><img src="https://d322cqt584bo4o.cloudfront.net/flextype-plugin-accounts-admin/localized.svg?color=black" alt="Crowdin"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/accounts-admin?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/accounts-admin.svg?branch=dev&color=black" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat" alt="Discord"></a>
4+
<a href="https://github.com/flextype-plugins/accounts-admin/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-plugins/accounts-admin.svg?label=version&color=black"></a> <a href="https://github.com/flextype-plugins/accounts-admin"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-plugins/accounts-admin"><img src="https://img.shields.io/github/downloads/flextype-plugins/accounts-admin/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype/flextype"><img src="https://img.shields.io/badge/Flextype-0.9.11-green.svg?color=black" alt="Flextype"></a> <a href="https://crowdin.com/project/flextype-plugin-accounts-admin"><img src="https://d322cqt584bo4o.cloudfront.net/flextype-plugin-accounts-admin/localized.svg?color=black" alt="Crowdin"></a> <a href="https://scrutinizer-ci.com/g/flextype-plugins/accounts-admin?branch=dev&color=black"><img src="https://img.shields.io/scrutinizer/g/flextype-plugins/accounts-admin.svg?branch=dev&color=black" alt="Quality Score"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat" alt="Discord"></a>
55
</p>
66

77
Accounts Admin Plugin to manage users accounts in Flextype Admin Panel.
@@ -12,7 +12,7 @@ The following dependencies need to be installed for Accounts Admin Plugin.
1212

1313
| Item | Version | Download |
1414
|---|---|---|
15-
| [flextype](https://github.com/flextype/flextype) | 0.9.10 | [download](https://github.com/flextype/flextype/releases) |
15+
| [flextype](https://github.com/flextype/flextype) | 0.9.11 | [download](https://github.com/flextype/flextype/releases) |
1616
| [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
1717
| [form](https://github.com/flextype-plugins/form) | >=1.0.0 | [download](https://github.com/flextype-plugins/form/releases) |
1818
| [form-admin](https://github.com/flextype-plugins/form-admin) | >=1.0.0 | [download](https://github.com/flextype-plugins/form-admin/releases) |

‎app/Controllers/AccountsAdminController.php‎

Lines changed: 102 additions & 102 deletions
Large diffs are not rendered by default.

‎bootstrap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* Set base admin route
2020
*/
21-
$admin_route = $flextype->container('registry')->get('plugins.admin.settings.route');
21+
$admin_route = flextype('registry')->get('plugins.admin.settings.route');
2222

2323
/**
2424
* Ensure vendor libraries exist

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"issues": "https://github.com/flextype-plugins/accounts-admin/issues"
1717
},
1818
"require": {
19-
"php": ">=7.2.0"
19+
"php": ">=7.3.0"
2020
},
2121
"config": {
2222
"apcu-autoloader": true,
2323
"optimize-autoloader": true,
2424
"platform": {
25-
"php": "7.2.0"
25+
"php": "7.3.0"
2626
}
2727
},
2828
"autoload": {

‎dependencies.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
use function Flextype\Component\I18n\__;
1818

1919
// Add Admin Navigation
20-
$flextype->container('registry')->set('plugins.admin.settings.navigation.extends.accounts', ['title' => __('accounts_admin_accounts'),'icon' => 'fas fa-users', 'link' => $flextype->container('router')->pathFor('admin.accounts.index')]);
20+
flextype('registry')->set('plugins.admin.settings.navigation.extends.accounts', ['title' => __('accounts_admin_accounts'),'icon' => 'fas fa-users', 'link' => flextype('router')->pathFor('admin.accounts.index')]);
2121

2222
/**
2323
* Add Accounts Admin Controller to Flextype container
2424
*/
25-
$flextype->container()['AccountsAdminController'] = static function () use ($flextype) {
26-
return new AccountsAdminController($flextype);
25+
flextype()->container()['AccountsAdminController'] = static function () {
26+
return new AccountsAdminController();
2727
};

‎plugin.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Accounts Admin
2-
version: 1.3.0
2+
version: 1.4.0
33
description: Accounts Admin Plugin to manage users accounts in Flextype Admin Panel.
44
icon: fas fa-users
55
author:
@@ -11,7 +11,7 @@ bugs: https://github.com/flextype-plugins/accounts-admin/issues
1111
license: MIT
1212

1313
dependencies:
14-
flextype: 0.9.10
14+
flextype: 0.9.11
1515
twig: '>=1.0.0'
1616
admin: '>=1.0.0'
1717
form: '>=1.0.0'

‎routes/web.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55
use Flextype\Plugin\Acl\Middlewares\AclIsUserLoggedInMiddleware;
66
use Flextype\Plugin\Acl\Middlewares\AclIsUserLoggedInRolesInMiddleware;
77

8-
$flextype->group('/' . $admin_route . '/accounts', function () use ($flextype) {
9-
$flextype->get('/login', 'AccountsAdminController:login')->setName('admin.accounts.login');
10-
$flextype->post('/login', 'AccountsAdminController:loginProcess')->setName('admin.accounts.loginProcess');
11-
$flextype->get('/reset-password', 'AccountsAdminController:resetPassword')->setName('admin.accounts.resetPassword');
12-
$flextype->post('/reset-password', 'AccountsAdminController:resetPasswordProcess')->setName('admin.accounts.resetPasswordProcess');
13-
$flextype->get('/new-password/{email}/{hash}', 'AccountsAdminController:newPasswordProcess')->setName('admin.accounts.newPasswordProcess');
14-
$flextype->get('/registration', 'AccountsAdminController:registration')->setName('admin.accounts.registration');
15-
$flextype->post('/registration', 'AccountsAdminController:registrationProcess')->setName('admin.accounts.registrationProcess');
8+
flextype()->group('/' . $admin_route . '/accounts', function () {
9+
flextype()->get('/login', 'AccountsAdminController:login')->setName('admin.accounts.login');
10+
flextype()->post('/login', 'AccountsAdminController:loginProcess')->setName('admin.accounts.loginProcess');
11+
flextype()->get('/reset-password', 'AccountsAdminController:resetPassword')->setName('admin.accounts.resetPassword');
12+
flextype()->post('/reset-password', 'AccountsAdminController:resetPasswordProcess')->setName('admin.accounts.resetPasswordProcess');
13+
flextype()->get('/new-password/{email}/{hash}', 'AccountsAdminController:newPasswordProcess')->setName('admin.accounts.newPasswordProcess');
14+
flextype()->get('/registration', 'AccountsAdminController:registration')->setName('admin.accounts.registration');
15+
flextype()->post('/registration', 'AccountsAdminController:registrationProcess')->setName('admin.accounts.registrationProcess');
1616
})->add('csrf');
1717

18-
$flextype->group('/' . $admin_route . '/accounts', function () use ($flextype) {
19-
$flextype->get('', 'AccountsAdminController:index')->setName('admin.accounts.index');
20-
$flextype->get('/add', 'AccountsAdminController:add')->setName('admin.accounts.add');
21-
$flextype->post('/add', 'AccountsAdminController:addProcess')->setName('admin.accounts.addProcess');
22-
$flextype->get('/edit', 'AccountsAdminController:edit')->setName('admin.accounts.edit');
23-
$flextype->post('/edit', 'AccountsAdminController:editProcess')->setName('admin.accounts.editProcess');
24-
$flextype->post('/delete', 'AccountsAdminController:deleteProcess')->setName('admin.accounts.deleteProcess');
25-
$flextype->post('/logout', 'AccountsAdminController:logoutProcess')->setName('admin.accounts.logoutProcess');
26-
})->add(new AclIsUserLoggedInMiddleware($flextype, ['redirect' => 'admin.accounts.login']))
27-
->add(new AclIsUserLoggedInRolesInMiddleware($flextype, ['redirect' => ($flextype->getContainer()->acl->isUserLoggedIn() ? 'admin.accounts.no-access' : 'admin.accounts.login'),
18+
flextype()->group('/' . $admin_route . '/accounts', function () {
19+
flextype()->get('', 'AccountsAdminController:index')->setName('admin.accounts.index');
20+
flextype()->get('/add', 'AccountsAdminController:add')->setName('admin.accounts.add');
21+
flextype()->post('/add', 'AccountsAdminController:addProcess')->setName('admin.accounts.addProcess');
22+
flextype()->get('/edit', 'AccountsAdminController:edit')->setName('admin.accounts.edit');
23+
flextype()->post('/edit', 'AccountsAdminController:editProcess')->setName('admin.accounts.editProcess');
24+
flextype()->post('/delete', 'AccountsAdminController:deleteProcess')->setName('admin.accounts.deleteProcess');
25+
flextype()->post('/logout', 'AccountsAdminController:logoutProcess')->setName('admin.accounts.logoutProcess');
26+
})->add(new AclIsUserLoggedInMiddleware(['redirect' => 'admin.accounts.login']))
27+
->add(new AclIsUserLoggedInRolesInMiddleware(['redirect' => (flextype()->getContainer()->acl->isUserLoggedIn() ? 'admin.accounts.no-access' : 'admin.accounts.login'),
2828
'roles' => 'admin']))
2929
->add('csrf');

0 commit comments

Comments
 (0)