Misc Fixes

composer.json

@@ -35,7 +35,7 @@
         }
     },
     "scripts": {
-        "testbench": "composer require --dev \"orchestra/testbench=~3.4.0\""
+        "testbench": "composer require --dev \"orchestra/testbench=~3.4\""
     },
     "extra": {
         "branch-alias": {

resources/views/admin/_includes/sidebar.blade.php

@@ -0,0 +1,43 @@
+<?php
+
+use Arcanesoft\Sidebar\Entities\Item;
+
+/**
+ * Render sidebar item.
+ *
+ * @param  \Arcanesoft\Sidebar\Entities\Item  $item
+ *
+ * @return string
+ */
+function renderSidebarItem(Item $item)
+{
+    $output   = [];
+    $output[] = '<li class="'.trim($item->childrenClass().' '.$item->activeClass('active open')).'">';
+
+    if ($item->hasChildren()) {
+        $output[] = '<a href="javascript:void(0);">';
+        $output[] = '<i class="'.$item->icon().'"></i> <span>'.$item->title().'</span> <i class="fa fa-angle-left pull-right"></i>';
+        $output[] = '</a>';
+        $output[] = '<ul class="treeview-menu">';
+        $output[] = $item->children()->transform(function ($child) { return renderSidebarItem($child); })->implode(PHP_EOL);
+        $output[] = '</ul>';
+    }
+    else {
+        $output[] = '<a href="'.$item->url().'">';
+        $output[] = '<i class="'.$item->icon().'"></i> <span>'.$item->title().'</span>';
+        $output[] = '</a>';
+    }
+
+    $output[] = '</li>';
+
+    return implode(PHP_EOL, $output);
+}
+
+?>
+
+<ul class="sidebar-menu">
+    <li class="header">{{ trans('foundation::navigation.sidebar.main-navigation') }}</li>
+    @foreach($sidebarItems as $item)
+        {!! renderSidebarItem($item) !!}
+    @endforeach
+</ul>

resources/views/admin/_template/sidebar-main.blade.php

@@ -26,6 +26,6 @@
             </form>
         @endif
 
-        {{ sidebar()->render('foundation::admin._composers.sidebar.main') }}
+        {{ sidebar()->render('foundation::admin._includes.sidebar') }}
     </section>
 </aside>

resources/views/admin/system/log-viewer/_includes/timeline-pagination.blade.php

@@ -1,7 +1,7 @@
 <li>
     <div class="timeline-item">
         <div class="timeline-body text-center">
-            {!! $entries->render('foundation::admin_partials.pagination.small') !!}
+            {!! $entries->render('foundation::admin._partials.pagination.small') !!}
         </div>
     </div>
 </li>

src/ViewComposers/System/ApplicationInfoComposer.php

@@ -1,6 +1,8 @@
 <?php namespace Arcanesoft\Foundation\ViewComposers\System;
 
 use Illuminate\View\View;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 
 /**
  * Class     ApplicationInfoComposer
@@ -68,16 +70,16 @@ private function getApplicationSize()
     /**
      * Get the folder size.
      *
-     * @param  string  $dir
+     * @param  string  $path
      *
      * @return int
      */
-    private function getFolderSize($dir)
+    private function getFolderSize($path)
     {
         $size = 0;
 
-        foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) {
-            $size += is_file($each) ? filesize($each) : $this->getFolderSize($each);
+        foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $directory){
+            $size += $directory->getSize();
         }
 
         return $size;