Merge branch 'devel'

Author: rakieta2015

README.md

@@ -141,6 +141,19 @@ Then in file ".env" complete this database configuration:
 * DB_USERNAME=root
 * DB_PASSWORD=
 
+### If your project is in subfolder
+
+> If your project url looks like: example.com/sub-folder 
+Then go to `my-project/.env`
+And modify this line:
+```php
+APP_URL = '';
+```
+To make it look like this:
+```php
+APP_URL = 'http://example.com/sub-folder';
+```
+
 ### Next step
 
 ``` bash
@@ -269,7 +282,7 @@ CoreUI Icons are beautifully crafted symbols for common actions and items. You c
 
 ## Copyright and license
 
-copyright 2019 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-laravel-admin-template/blob/master/LICENSE).
+copyright 2020 creativeLabs Łukasz Holeczek. Code released under [the MIT license](https://github.com/coreui/coreui-free-laravel-admin-template/blob/master/LICENSE).
 There is only one limitation you can't can’t re-distribute the CoreUI as stock. You can’t do this if you modify the CoreUI. In past we faced some problems with persons who tried to sell CoreUI based templates.
 
 ## Support CoreUI Development

app/Http/Controllers/MenuElementController.php

@@ -8,7 +8,6 @@
 use App\Http\Menus\GetSidebarMenu;
 use App\Models\Menulist;
 use App\Models\Menus;
-use App\Models\MenusLang;
 use Illuminate\Validation\Rule;
 use App\Services\RolesService;
 

database/seeds/MenusTableSeeder.php

@@ -13,6 +13,7 @@ class MenusTableSeeder extends Seeder
     private $joinData = array();
     private $adminRole = null;
     private $userRole = null;
+    private $subFolder = '';
 
     public function join($roles, $menusId){
         $roles = explode(',', $roles);
@@ -37,6 +38,7 @@ public function joinAllByTransaction(){
     }
 
     public function insertLink($roles, $name, $href, $icon = null){
+        $href = $this->subFolder . $href;
         if($this->dropdown === false){
             DB::table('menus')->insert([
                 'slug' => 'link',
@@ -121,6 +123,16 @@ public function endDropdown(){
      */
     public function run()
     { 
+        /* Set subfolder 
+            If your url looks like: example.org/sub-folder
+            then:
+            $this->subFolder = '/sub-folder';
+        */
+        $this->subFolder = env('APP_URL', '');
+        if(substr($this->subFolder, -1) == '/'){
+            $this->subFolder = rtrim($this->subFolder, '/');
+        }
+
         /* Get roles */
         $this->adminRole = Role::where('name' , '=' , 'admin' )->first();
         $this->userRole = Role::where('name', '=', 'user' )->first();

resources/views/dashboard/editmenu/show.blade.php

@@ -46,33 +46,6 @@
                                     ?>
                                 </td>
                             </tr>
-                            <tr>
-                                <th>
-                                    Translations
-                                </th>
-                                <td>
-                                    <table class="table">
-                                        @foreach($langs as $lang)
-                                            <tr>
-                                                <td>
-                                                    {{ $lang->name }}   
-                                                </td>
-                                                <td>
-                                                    <?php
-                                                        $temp = false;
-                                                        $menuLangId = NULL;
-                                                        for($i=0; $i<count($menuLangs); $i++){
-                                                            if($lang->short_name == $menuLangs[$i]->lang){
-                                                                echo $menuLangs[$i]->name;
-                                                            }
-                                                        }
-                                                    ?>
-                                                </td>
-                                            </tr>
-                                        @endforeach
-                                    </table>
-                                </td>
-                            </tr>
                             <tr>
                                 <th>
                                     Type

resources/views/dashboard/shared/header.blade.php

@@ -2,7 +2,7 @@
 
     <div class="c-wrapper">
       <header class="c-header c-header-light c-header-fixed c-header-with-subheader">
-        <button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button><a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="/assets/brand/coreui-base.svg" width="97" height="46" alt="CoreUI Logo"></a>
+        <button class="c-header-toggler c-class-toggler d-lg-none mr-auto" type="button" data-target="#sidebar" data-class="c-sidebar-show"><span class="c-header-toggler-icon"></span></button><a class="c-header-brand d-sm-none" href="#"><img class="c-header-brand" src="{{ env('APP_URL') }}/assets/brand/coreui-base.svg" width="97" height="46" alt="CoreUI Logo"></a>
         <button class="c-header-toggler c-class-toggler ml-3 d-md-down-none" type="button" data-target="#sidebar" data-class="c-sidebar-lg-show" responsive="true"><span class="c-header-toggler-icon"></span></button>
         <?php
             use App\MenuBuilder\FreelyPositionedMenus;
@@ -13,52 +13,52 @@
         <ul class="c-header-nav ml-auto mr-4">
           <li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
               <svg class="c-icon">
-                <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-bell"></use>
+                <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-bell"></use>
               </svg></a></li>
           <li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
               <svg class="c-icon">
-                <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-list-rich"></use>
+                <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-list-rich"></use>
               </svg></a></li>
           <li class="c-header-nav-item d-md-down-none mx-2"><a class="c-header-nav-link">
               <svg class="c-icon">
-                <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-envelope-open"></use>
+                <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-envelope-open"></use>
               </svg></a></li>
           <li class="c-header-nav-item dropdown"><a class="c-header-nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-              <div class="c-avatar"><img class="c-avatar-img" src="/assets/img/avatars/6.jpg" alt="[email protected]"></div>
+              <div class="c-avatar"><img class="c-avatar-img" src="{{ env('APP_URL') }}/assets/img/avatars/6.jpg" alt="[email protected]"></div>
             </a>
             <div class="dropdown-menu dropdown-menu-right pt-0">
               <div class="dropdown-header bg-light py-2"><strong>Account</strong></div><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-bell"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-bell"></use>
                 </svg> Updates<span class="badge badge-info ml-auto">42</span></a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-envelope-open"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-envelope-open"></use>
                 </svg> Messages<span class="badge badge-success ml-auto">42</span></a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-task"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-task"></use>
                 </svg> Tasks<span class="badge badge-danger ml-auto">42</span></a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-comment-square"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-comment-square"></use>
                 </svg> Comments<span class="badge badge-warning ml-auto">42</span></a>
               <div class="dropdown-header bg-light py-2"><strong>Settings</strong></div><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-user"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-user"></use>
                 </svg> Profile</a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-settings"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-settings"></use>
                 </svg> Settings</a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-credit-card"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-credit-card"></use>
                 </svg> Payments<span class="badge badge-secondary ml-auto">42</span></a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-file"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-file"></use>
                 </svg> Projects<span class="badge badge-primary ml-auto">42</span></a>
               <div class="dropdown-divider"></div><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-lock-locked"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-lock-locked"></use>
                 </svg> Lock Account</a><a class="dropdown-item" href="#">
                 <svg class="c-icon mr-2">
-                  <use xlink:href="/assets/icons/coreui/free-symbol-defs.svg#cui-account-logout"></use>
+                  <use xlink:href="{{ env('APP_URL') }}/assets/icons/coreui/free-symbol-defs.svg#cui-account-logout"></use>
                 </svg><form action="/logout" method="POST"> @csrf <button type="submit" class="btn btn-ghost-dark btn-block">Logout</button></form></a>
             </div>
           </li>

resources/views/dashboard/shared/nav-builder.blade.php

@@ -30,7 +30,7 @@ function renderDropdown($data){
 }
 ?>
 
-      <div class="c-sidebar-brand"><img class="c-sidebar-brand-full" src="/assets/brand/coreui-base-white.svg" width="118" height="46" alt="CoreUI Logo"><img class="c-sidebar-brand-minimized" src="assets/brand/coreui-signet-white.svg" width="118" height="46" alt="CoreUI Logo"></div>
+      <div class="c-sidebar-brand"><img class="c-sidebar-brand-full" src="{{ env('APP_URL') }}/assets/brand/coreui-base-white.svg" width="118" height="46" alt="CoreUI Logo"><img class="c-sidebar-brand-minimized" src="assets/brand/coreui-signet-white.svg" width="118" height="46" alt="CoreUI Logo"></div>
         <ul class="c-sidebar-nav">
         @if(isset($appMenus['sidebar menu']))
             @foreach($appMenus['sidebar menu'] as $menuel)