sidebar

jjanampa · Jul 15, 2021 · 29ae259 · 29ae259
1 parent db5226b
commit 29ae259
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 30 deletions.
diff --git a/publish/Admin/Resources/views/dashboard/pages/index.blade.php b/publish/Admin/Resources/views/dashboard/pages/index.blade.php
@@ -42,7 +42,7 @@
                                 @foreach($pages as $item)
                                     <tr>
                                         <td>{{ $item->id }}</td>
-                                        <td>{{ $item->title }}</td><td>{{ $item->content }}</td>
+                                        <td>{{ $item->title }}</td><td>{!! $item->content !!}</td>
                                         <td class="text-right">
                                             <a href="{{ route('admin.pages.show' , $item) }}" title="{{ __('View Page') }}"><button class="btn btn-info btn-sm"><i class="fa fa-eye" aria-hidden="true"></i></button></a>
                                             <a href="{{ route('admin.pages.edit' , $item) }}" title="{{ __('Edit Page') }}"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i></button></a>

diff --git a/publish/Admin/Resources/views/layouts/app.blade.php b/publish/Admin/Resources/views/layouts/app.blade.php
@@ -17,7 +17,7 @@
     <link href="{{ asset('material') }}/css/material-dashboard.css?v=2.1.1" rel="stylesheet" />
 
     <!-- main Styles -->
-    <link href="{{ asset('css/admin.css') }}" rel="stylesheet">
+    <link href="{{ asset('static-admin/css/app.css') }}" rel="stylesheet">
     @stack('styles')
 </head>
 <body class="{{ $class ?? '' }}">
@@ -44,13 +44,13 @@
 <script src="{{ asset('material') }}/js/material-dashboard.js?v=2.1.1" type="text/javascript"></script>
 
 <!-- Scripts -->
-<script defer src="{{ asset('js/admin.js') }}"></script>
+<script defer src="{{ asset('static-admin/js/app.js') }}"></script>
 @stack('scripts')
 <script>
     document.addEventListener("DOMContentLoaded", function(event) {
-        @foreach (['error', 'warning', 'success', 'info'] as $key)
-            @if(Session::has($key))
-                showNotification('{{ $key }}', '{{ Session::get($key) }}')
+        @foreach (['error', 'warning', 'success', 'info'] as $typeAlert)
+            @if(session()->has($typeAlert))
+                showNotification('{{ session()->get($typeAlert) }}', '{{ $typeAlert }}')
             @endif
         @endforeach
     });

diff --git a/publish/Admin/Resources/views/layouts/auth.blade.php b/publish/Admin/Resources/views/layouts/auth.blade.php
@@ -16,7 +16,7 @@
     <!-- CSS Files -->
     <link href="{{ asset('material') }}/css/material-dashboard.css?v=2.1.1" rel="stylesheet" />
     <!-- main Styles -->
-    <link href="{{ asset('css/admin.css') }}" rel="stylesheet">
+    <link href="{{ asset('static-admin/css/app.css') }}" rel="stylesheet">
 </head>
 <body class="{{ $class ?? '' }}">
     <div class="wrapper wrapper-full-page">
@@ -36,7 +36,7 @@
 <script src="{{ asset('material') }}/js/material-dashboard.js?v=2.1.1" type="text/javascript"></script>
 
 <!-- Scripts -->
-<script src="{{ asset('js/admin.js') }}"></script>
+<script src="{{ asset('static-admin/js/app.js') }}"></script>
 @stack('scripts')
 </body>
 </html>
diff --git a/publish/Admin/Resources/views/layouts/partial/nav.blade.php b/publish/Admin/Resources/views/layouts/partial/nav.blade.php
@@ -49,10 +49,9 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link" href="#pablo" id="navbarDropdownProfile" data-toggle="dropdown"
                        aria-haspopup="true" aria-expanded="false">
-                        <i class="material-icons">person</i>
-                        <p class="d-lg-none d-md-block">
-                            {{ __('Account') }}
-                        </p>
+                        <i class="material-icons">person</i>                        
+                        {{ __('Account') }}
+
                     </a>
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownProfile">
                         <a class="dropdown-item" href="{{ route('admin.profile.edit') }}">{{ __('Profile') }}</a>

diff --git a/publish/Admin/Resources/views/layouts/partial/sidebar.blade.php b/publish/Admin/Resources/views/layouts/partial/sidebar.blade.php
@@ -36,13 +36,13 @@
             </li>
 
             <li class="nav-item active-pro">
-                <a class="nav-link" data-toggle="collapse" href="#userManagement" aria-expanded="true">
+                <a class="nav-link" data-toggle="collapse" href="#configManagement" aria-expanded="true">
                     <i class="material-icons">settings</i>
                     <p>{{ __('Settings') }}
                         <b class="caret"></b>
                     </p>
                 </a>
-                <div class="collapse show" id="userManagement">
+                <div class="collapse show" id="configManagement">
                     <ul class="nav">
                         <li class="nav-item {{ Request::routeIs('admin.settings.*') ? 'active' : '' }}">
                             <a class="nav-link" href="{{ route('admin.settings.index') }}">

diff --git a/publish/Admin/webpack.mix.js b/publish/Admin/webpack.mix.js
@@ -6,8 +6,8 @@ require('laravel-mix-merge-manifest');
 
 mix.setPublicPath('../../public').mergeManifest();
 
-mix.js(__dirname + '/Resources/assets/js/app.js', 'js/admin.js')
-    .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/admin.css');
+mix.js(__dirname + '/Resources/assets/js/app.js', 'static-admin/js')
+    .sass( __dirname + '/Resources/assets/sass/app.scss', 'static-admin/css');
 
 if (mix.inProduction()) {
     mix.version();

diff --git a/publish/public/css/admin.css b/publish/public/css/admin.css
diff --git a/publish/public/static-admin/css/app.css b/publish/public/static-admin/css/app.css
diff --git a/publish/public/js/admin.js → publish/public/static-admin/js/app.js b/publish/public/js/admin.js → publish/public/static-admin/js/app.js
diff --git a/src/LaravelAdminCommand.php b/src/LaravelAdminCommand.php
@@ -80,8 +80,15 @@ public function handle()
 
     protected function cleanModule()
     {
-        $this->call('module:migrate-reset', ['Admin']);
+
         (new Filesystem)->deleteDirectory($this->getModulePath());
+        Schema::dropIfExists('admin_permission_role');
+        Schema::dropIfExists('admin_role_user');
+        Schema::dropIfExists('admin_roles');
+        Schema::dropIfExists('admin_permissions');
+        Schema::dropIfExists('admin_users');
+        Schema::dropIfExists('pages');
+        Schema::dropIfExists('settings');
     }
 
     /**
@@ -106,18 +113,8 @@ protected function publishModule()
     protected function updateAssets()
     {
         $this->info("Publishing the assets");
-        if (!(new Filesystem)->isDirectory(public_path('css')))
-        {
-            (new Filesystem)->makeDirectory(public_path('css'));
-        }
-        if (!(new Filesystem)->isDirectory(public_path('js')))
-        {
-            (new Filesystem)->makeDirectory(public_path('js'));
-        }
-
-        static::copyFile('public/css/admin.css', public_path('css/admin.css'));
-        static::copyFile('public/js/admin.js', public_path('js/admin.js'));
         static::copyDirectory('public/material', public_path('material'));
+        static::copyDirectory('public/static-admin', public_path('static-admin'));
     }
 
     protected function migrate()