Merge branch 'dev'

Awilum · Awilum · commit c23118259f7d · 2020-06-23T14:16:39.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.0.10"></a>
+# [1.0.10](https://github.com/flextype-plugins/admin) (2020-06-23)
+
+### Refactor
+
+* **refactor(core)** update code base for new ACL
+
 <a name="1.0.9"></a>
 # [1.0.9](https://github.com/flextype-plugins/admin) (2020-06-21)
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Admin",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Admin theme for Flextype",
   "homepage": "http://flextype.org",
   "author": "Sergey Romanenko",
diff --git a/plugin.yaml b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Admin
-version: 1.0.9
+version: 1.0.10
 description: Admin Panel plugin for Flextype.
 icon: fab fa-fort-awesome
 author:
@@ -19,3 +19,4 @@ dependencies:
   jquery: '>=1.0.0'
   acl: '>=1.0.0'
   accounts-admin: '>=1.0.0'
+  phpmailer: '>=1.0.0'
diff --git a/routes/web.php b/routes/web.php
@@ -86,8 +86,8 @@
     $app->post('/api/management/entries/edit', 'ApiManagementEntriesController:editProcess')->setName('admin.api_management_entries.editProcess');
     $app->post('/api/management/entries/delete', 'ApiManagementEntriesController:deleteProcess')->setName('admin.api_management_entries.deleteProcess');
 
-})->add(new AclAccountIsUserLoggedInMiddleware(['container' => $flextype, 'redirect' => 'admin.accounts.login']))
-  ->add(new AclAccountsIsUserLoggedInRolesOneOfMiddleware(['container' => $flextype,
-                                                           'redirect' => ($flextype->acl->isUserLoggedIn() ? 'admin.accounts.no-access' : 'admin.accounts.login'),
-                                                           'roles' => 'admin']))
+})->add(new AclIsUserLoggedInMiddleware(['container' => $flextype, 'redirect' => 'admin.accounts.login']))
+  ->add(new AclIsUserLoggedInRolesInMiddleware(['container' => $flextype,
+                                                'redirect' => ($flextype->acl->isUserLoggedIn() ? 'admin.accounts.no-access' : 'admin.accounts.login'),
+                                                'roles' => 'admin']))
   ->add('csrf');
diff --git a/templates/partials/base.html b/templates/partials/base.html
@@ -27,7 +27,7 @@
     </head>
     <body>
         <main>
-            <nav class="navigation {% if not acl.isUserLoggedInRolesOneOf('admin') %}hidden{% endif %}">
+            <nav class="navigation {% if not acl.isUserLoggedInRolesIn('admin') %}hidden{% endif %}">
                 <ul>
                     <li class="navigation__item--logo-wrapper">
                         <a href="javascript:;" class="navigation__item navigation__item--logo navigation__item--flextype-logo relative">
@@ -97,8 +97,8 @@
                     {% endif %}
                 </ul>
             </nav>
-            <div class="content {% if not acl.isUserLoggedInRolesOneOf('admin') %}w-full max-w-full m-0{% endif %}">
-                <div class="bars clearfix {% if not acl.isUserLoggedInRolesOneOf('admin') %}hidden{% endif %}">
+            <div class="content {% if not acl.isUserLoggedInRolesIn('admin') %}w-full max-w-full m-0{% endif %}">
+                <div class="bars clearfix {% if not acl.isUserLoggedInRolesIn('admin') %}hidden{% endif %}">
                     <div class="navigation-top-primary">
                         {% if links %}
                             <div class="lg:w-auto block float-left">

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Admin",`
`3`		`- "version": "1.0.9",`
	`3`	`+ "version": "1.0.10",`
`4`	`4`	`"description": "Admin theme for Flextype",`
`5`	`5`	`"homepage": "http://flextype.org",`
`6`	`6`	`"author": "Sergey Romanenko",`