Merge 5eb0f34 into f5ad1ff

rorteg · Feb 13, 2019 · 5c4fc0a · 5c4fc0a
2 parents f5ad1ff + 5eb0f34
commit 5c4fc0a
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 44 deletions.
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -41,7 +41,7 @@
 date_default_timezone_set('America/Sao_Paulo');
 
 // Modules Settings
-$modulesConfig = Factory::fromFiles(glob(BP . '/app/code/*/config/*.*'), true);
+$modulesConfig = Factory::fromFiles(glob(BP . '/app/code/*/*/config/*.*'), true);
 
 // Global Settings
 $globalConfig = Factory::fromFiles(glob(BP . '/app/config/*.*'), true);

diff --git a/app/code/Shelf/Admin/Controllers/Admin/IndexAction.php b/app/code/Shelf/Admin/Controllers/Admin/IndexAction.php
@@ -46,7 +46,7 @@ public function __invoke(): ResponseInterface
             '',
             'Project Example'
         );
-        $html = $this->templateRenderer->render('@admin/index.html');
+        $html = $this->templateRenderer->render('@shelf_admin/index.html');
         return new HtmlResponse($html);
     }
 }
diff --git a/app/code/Shelf/Admin/config/view.php b/app/code/Shelf/Admin/config/view.php
@@ -3,8 +3,8 @@
 return [
     'view' => [
         'paths' => [
-            'admin' => [
-                BP . '/app/code/Admin/view/templates'
+            'shelf_admin' => [
+                BP . '/app/code/Shelf/Admin/view/templates'
             ]
         ],
         'twig_functions' => [

diff --git a/app/code/Shelf/Admin/view/templates/index.html b/app/code/Shelf/Admin/view/templates/index.html
@@ -1 +1 @@
-{% extends "@admin/layout.html" %}
+{% extends "@shelf_admin/layout.html" %}
diff --git a/app/code/Shelf/Admin/view/templates/layout.html b/app/code/Shelf/Admin/view/templates/layout.html
@@ -10,11 +10,11 @@
         <!-- Favicon icon -->
         <link rel="icon" type="image/png" sizes="16x16" href="/favicon.ico">
         <title>{% block title %}{% endblock %} Madeira Madeira Project</title>
-        {{ assets({files: ['@admin/assets/styles.css']}) }}
+        {{ assets({files: ['@shelf_admin/assets/styles.css']}) }}
         {{ assets({files: ['@js_lib/bootstrap/dist/css/bootstrap.min.css']}) }}
-        {{ assets({files: ['@admin/assets/float-chart.css']}) }}
-        {{ assets({files: ['@admin/assets/toastr.min.css']}) }}
-        {{ assets({files: ['@admin/assets/custom.css']}) }}
+        {{ assets({files: ['@shelf_admin/assets/float-chart.css']}) }}
+        {{ assets({files: ['@shelf_admin/assets/toastr.min.css']}) }}
+        {{ assets({files: ['@shelf_admin/assets/custom.css']}) }}
         {% block head %}
 
         <!-- Custom CSS -->
@@ -47,7 +47,7 @@
         <!-- Topbar header - style you can find in pages.scss -->
         <!-- ============================================================== -->
         <header class="topbar" data-navbarbg="skin5">
-            {% embed "@admin/layout/header.html" %}{% endembed %}
+            {% embed "@shelf_admin/layout/header.html" %}{% endembed %}
         </header>
         <!-- ============================================================== -->
         <!-- End Topbar header -->
@@ -129,26 +129,26 @@ <h1>Project Example</h1>
     {{ assets({files: ['@js_lib/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.js']}) }}
     {{ assets({files: ['@js_lib/jquery-sparkline/jquery.sparkline.min.js']}) }}
     <!--Wave Effects -->
-    {{ assets({files: ['@admin/js/dist/waves.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/waves.js']}) }}
     <!--Menu sidebar -->
-    {{ assets({files: ['@admin/js/dist/sidebar.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/sidebar.js']}) }}
     <!--Custom JavaScript -->
-    {{ assets({files: ['@admin/js/dist/custom.min.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/custom.min.js']}) }}
     <!--This page JavaScript -->
     <!-- <script src="../../dist/js/pages/dashboards/dashboard1.js"></script> -->
     <!-- Charts js Files -->
-    {{ assets({files: ['@admin/js/dist/excanvas.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.pie.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.time.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.stack.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.crosshair.js']}) }}
-    {{ assets({files: ['@admin/js/dist/jquery.flot.tooltip.min.js']}) }}
-    {{ assets({files: ['@admin/js/dist/chart-page-init.js']}) }}
-    {{ assets({files: ['@admin/js/dist/toastr.min.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/excanvas.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.pie.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.time.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.stack.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.crosshair.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/jquery.flot.tooltip.min.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/chart-page-init.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/dist/toastr.min.js']}) }}
     {% block js_footer %}
     {% endblock %}
 
-    {% embed "@admin/layout/notification.html" %}{% endembed %}
+    {% embed "@shelf_admin/layout/notification.html" %}{% endembed %}
     </body>
 </html>
diff --git a/app/code/Shelf/Admin/view/templates/layout/header.html b/app/code/Shelf/Admin/view/templates/layout/header.html
@@ -17,7 +17,7 @@
             <!-- Logo text -->
             <span class="logo-text">
                              <!-- dark Logo text -->
-                             {% embed "@admin/layout/logo.html" %}{% endembed %}
+                             {% embed "@shelf_admin/layout/logo.html" %}{% endembed %}
 
                         </span>
             <!-- Logo icon -->

diff --git a/app/code/Shelf/App/Controllers/Home/IndexAction.php b/app/code/Shelf/App/Controllers/Home/IndexAction.php
@@ -34,7 +34,7 @@ public function __construct(TemplateRendererInterface $templateRenderer)
      */
     public function __invoke(): ResponseInterface
     {
-        $html = $this->templateRenderer->render('@app/home/index.html', [
+        $html = $this->templateRenderer->render('@shelf_app/home/index.html', [
             'name' => 'Rafael Ortega Bueno'
         ]);
         return new HtmlResponse($html);

diff --git a/app/code/Shelf/App/config/view.php b/app/code/Shelf/App/config/view.php
@@ -3,8 +3,8 @@
 return [
     'view' => [
         'paths' => [
-            'app' => [
-                BP . '/app/code/App/view/templates'
+            'shelf_app' => [
+                BP . '/app/code/Shelf/App/view/templates'
             ],
             'js_lib' => [
                 BP . '/node_modules'

diff --git a/app/code/Shelf/App/view/templates/home/index.html b/app/code/Shelf/App/view/templates/home/index.html
@@ -1,8 +1,8 @@
-{% extends "@app/layout.html" %}
+{% extends "@shelf_app/layout.html" %}
 
 {% block head %}
 {{ parent() }}
-{{ assets({files: ['@app/assets/starter-template.css']}) }}
+{{ assets({files: ['@shelf_app/assets/starter-template.css']}) }}
 {% endblock %}
 
 {% block title %}Welcome!{% endblock %}

diff --git a/app/code/Shelf/App/view/templates/layout.html b/app/code/Shelf/App/view/templates/layout.html
@@ -13,7 +13,7 @@
 </head>
 <body>
     <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-    {% embed "@app/layout/nav.html" %}{% endembed %}
+    {% embed "@shelf_app/layout/nav.html" %}{% endembed %}
     </nav>
 
     <main role="main" class="container">

diff --git a/app/code/Shelf/Auth/Controllers/Auth/LoginAction.php b/app/code/Shelf/Auth/Controllers/Auth/LoginAction.php
@@ -34,7 +34,7 @@ public function __construct(TemplateRendererInterface $templateRenderer)
      */
     public function __invoke() : ResponseInterface
     {
-        $html = $this->templateRenderer->render('@auth/login.html');
+        $html = $this->templateRenderer->render('@shelf_auth/login.html');
         return new HtmlResponse($html);
     }
 }
diff --git a/app/code/Shelf/Auth/config/view.php b/app/code/Shelf/Auth/config/view.php
@@ -3,8 +3,8 @@
 return [
     'view' => [
         'paths' => [
-            'auth' => [
-                BP . '/app/code/Auth/view/templates'
+            'shelf_auth' => [
+                BP . '/app/code/Shelf/Auth/view/templates'
             ]
         ]
     ]

diff --git a/app/code/Shelf/Auth/view/templates/login.html b/app/code/Shelf/Auth/view/templates/login.html
@@ -13,8 +13,8 @@
     {% block head %}
     <title>{% block title %}{% endblock %} Madeira Madeira Project</title>
     <!-- Custom CSS -->
-    {{ assets({files: ['@admin/assets/styles.css']}) }}
-    {{ assets({files: ['@admin/assets/custom.css']}) }}
+    {{ assets({files: ['@shelf_admin/assets/styles.css']}) }}
+    {{ assets({files: ['@shelf_admin/assets/custom.css']}) }}
     {% endblock %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -102,7 +102,7 @@
 			c-1.9,0.1-3.7-0.4-5.2-1.5c-1.3-1.1-2-2.7-1.9-4.4c-0.1-1.6,0.5-3.1,1.6-4.3c1.5-1.1,3.2-1.9,5.2-2.1c0.8-0.1,1.9-0.3,3.4-0.5
 			c4.2-0.5,7.2-1.2,9-2.2L333.8,49.5z"></path></g></svg></span>
                 </div>
-                {% embed "@app/layout/flash.html" %}{% endembed %}
+                {% embed "@shelf_app/layout/flash.html" %}{% endembed %}
                 <!-- Form -->
                 <form class="form-horizontal m-t-20" id="loginform" action="/loginPost" method="post">
                     <div class="row p-b-30">

diff --git a/app/code/Shelf/User/config/view.php b/app/code/Shelf/User/config/view.php
@@ -4,7 +4,7 @@
     'view' => [
         'paths' => [
             'user' => [
-                BP . '/app/code/User/view/templates'
+                BP . '/app/code/Shelf/User/view/templates'
             ]
         ]
     ]

diff --git a/app/code/Shelf/User/view/templates/admin/user_form.html b/app/code/Shelf/User/view/templates/admin/user_form.html
@@ -1,4 +1,4 @@
-{% extends "@admin/layout.html" %}
+{% extends "@shelf_admin/layout.html" %}
 
 {% block title %}New User{% endblock %}
 

diff --git a/app/code/Shelf/User/view/templates/admin/user_list.html b/app/code/Shelf/User/view/templates/admin/user_list.html
@@ -1,9 +1,9 @@
-{% extends "@admin/layout.html" %}
+{% extends "@shelf_admin/layout.html" %}
 {% block title %} User List {% endblock %}
 {% block head %}
 
-{{ assets({files: ['@admin/assets/multicheck.css']}) }}
-{{ assets({files: ['@admin/assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.css']}) }}
+{{ assets({files: ['@shelf_admin/assets/multicheck.css']}) }}
+{{ assets({files: ['@shelf_admin/assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.css']}) }}
 {% endblock %}
 
 {% block breadcrumb %}
@@ -95,9 +95,9 @@ <h5 class="modal-title" id="exampleModalLabel">Alert!</h5>
 {% endblock %}
 
 {% block js_footer %}
-    {{ assets({files: ['@admin/js/extra-libs/multicheck/datatable-checkbox-init.js']}) }}
-    {{ assets({files: ['@admin/js/extra-libs/multicheck/jquery.multicheck.js']}) }}
-    {{ assets({files: ['@admin/js/extra-libs/DataTables/datatables.min.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/extra-libs/multicheck/datatable-checkbox-init.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/extra-libs/multicheck/jquery.multicheck.js']}) }}
+    {{ assets({files: ['@shelf_admin/js/extra-libs/DataTables/datatables.min.js']}) }}
     <script type="text/javascript">
         window.userIdByDelete = false;