Merge branch 'devel'

Author: rakieta2015

README.md

@@ -151,7 +151,7 @@ And modify this line:
 
 To make it look like this:
 
-* APP_URL = http://example.com/sub-folder
+* APP_URL = http://example.com/sub-folder/
 
 
 ### Next step

database/seeds/MenusTableSeeder.php

@@ -123,16 +123,6 @@ 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/shared/nav-builder.blade.php

@@ -19,7 +19,7 @@ function renderDropdown($data){
             for($i = 0; $i < count($data); $i++){
                 if( $data[$i]['slug'] === 'link' ){
                     echo '<li class="c-sidebar-nav-item">';
-                    echo '<a class="c-sidebar-nav-link" href="' . $data[$i]['href'] . '">';
+                    echo '<a class="c-sidebar-nav-link" href="' . env('APP_URL', '') . $data[$i]['href'] . '">';
                     echo '<span class="c-sidebar-nav-icon"></span>' . $data[$i]['name'] . '</a></li>';
                 }elseif( $data[$i]['slug'] === 'dropdown' ){
                     renderDropdown( $data[$i] );
@@ -36,7 +36,7 @@ function renderDropdown($data){
             @foreach($appMenus['sidebar menu'] as $menuel)
                 @if($menuel['slug'] === 'link')
                     <li class="c-sidebar-nav-item">
-                        <a class="c-sidebar-nav-link" href="{{ $menuel['href'] }}">
+                        <a class="c-sidebar-nav-link" href="{{ env('APP_URL', '') . $menuel['href'] }}">
                         @if($menuel['hasIcon'] === true)
                             @if($menuel['iconType'] === 'coreui')
                                 <i class="{{ $menuel['icon'] }} c-sidebar-nav-icon"></i>