Merge branch 'dev'

Author: Awilum

CHANGELOG.md

@@ -1,3 +1,10 @@
+<a name="1.0.9"></a>
+# [1.0.9](https://github.com/flextype-plugins/admin) (2020-06-21)
+
+### Refactor
+
+* **refactor(core)** remove User functionality and update code base for new ACL
+
 <a name="1.0.8"></a>
 # [1.0.8](https://github.com/flextype-plugins/admin) (2020-06-13)
 

README.md

@@ -20,12 +20,15 @@ The following dependencies need to be installed for Form Admin Plugin.
 | [form-admin](https://github.com/flextype-plugins/form-admin) | >=1.0.0 | [download](https://github.com/flextype-plugins/form-admin/releases) |
 | [jquery](https://github.com/flextype-plugins/jquery) | >=1.0.0 | [download](https://github.com/flextype-plugins/jquery/releases) |
 | [icon](https://github.com/flextype-plugins/icon) | >=1.0.0 | [download](https://github.com/flextype-plugins/icon/releases) |
+| [acl](https://github.com/flextype-plugins/acl) | >=1.0.0 | [download](https://github.com/flextype-plugins/acl/releases) |
+| [accounts-admin](https://github.com/flextype-plugins/accounts-admin) | >=1.0.0 | [download](https://github.com/flextype-plugins/accounts-admin/releases) |
 
 ## Installation
 
 1. Download & Install all required dependencies.
 2. Create new folder `/project/plugins/admin`
-3. Download Themes Admin Plugin and unzip plugin content to the folder `/project/plugins/admin`
+3. Download Admin Plugin and unzip plugin content to the folder `/project/plugins/admin`
+4. Go to `YOUR_SITE_URL/admin/accounts/registration` and create your super admin account.
 
 ## Settings
 
@@ -34,7 +37,7 @@ The following dependencies need to be installed for Form Admin Plugin.
 | enabled | true | true or false to disable the plugin |
 | priority | 80 | admin plugin priority |
 | flextype_menu | [] | admin flextype menu |
-| route | admin | custom admin pane route |
+| route | admin | custom admin panel route |
 
 
 ### Entries settings

app/Controllers/UsersController.php

@@ -27,9 +27,7 @@
     },
     "autoload": {
         "classmap": [
-            "app",
-            "twig",
-            "middlewares"
+            "app"
         ]
     }
 }

composer.json

@@ -23,9 +23,6 @@
 $flextype->registry->set('plugins.admin.settings.navigation.system.tools', ['title' => __('admin_tools'),'icon' => 'fas fa-toolbox', 'link' => $flextype->router->pathFor('admin.tools.index')]);
 $flextype->registry->set('plugins.admin.settings.navigation.system.api', ['title' => __('admin_api'),'icon' => 'fas fa-network-wired', 'link' => $flextype->router->pathFor('admin.api.index')]);
 
-// Add Global Vars Admin Twig Extension
-$flextype->twig->addExtension(new GlobalVarsAdminTwigExtension($flextype));
-
 /**
  * Add Assets
  */
@@ -57,10 +54,6 @@
     return new EntriesController($container);
 };
 
-$flextype['UsersController'] = static function ($container) {
-    return new UsersController($container);
-};
-
 $flextype['ToolsController'] = static function ($container) {
     return new ToolsController($container);
 };

dependencies.php

@@ -1,6 +1,6 @@
 {
   "name": "Admin",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Admin theme for Flextype",
   "homepage": "http://flextype.org",
   "author": "Sergey Romanenko",