添加模板渲染

jhasheng · Jun 2, 2016 · 9ce8269 · 9ce8269
1 parent da50e1a
commit 9ce8269
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 23 deletions.
diff --git a/src/Collections/AbstractCollection.php b/src/Collections/AbstractCollection.php
@@ -31,7 +31,11 @@ abstract class AbstractCollection implements CollectionInterface
      * @var Application
      */
     protected $app;
-
+
+    /**
+     * 模板名称
+     * @var string
+     */
     protected $template;
 
     /**
@@ -52,6 +56,13 @@ abstract class AbstractCollection implements CollectionInterface
      */
     protected $global = [];
 
+    /**
+     * icon名称
+     * @var string
+     */
+    protected $icon;
+
+    protected $url;
     /**
      * 注册收集器
      * @param Application $app
@@ -125,6 +136,11 @@ public function getTemplate()
         return $this->template;
     }
 
+    public function getIcon()
+    {
+        return $this->icon;
+    }
+
     /**
      * 获取收集器收集到的信息数量
      * @return int
@@ -134,6 +150,20 @@ public function calcBadge()
         $this->badge = count($this->data[$this->template]);
     }
 
+    public function getMenu()
+    {
+        /**
+         * @var $current \Illuminate\Routing\Route
+         */
+        $current = $this->app['router']->current();
+        return [
+            'name' => $this->getName(),
+            'icon' => $this->getIcon(),
+            'badge' => $this->getBadge(),
+            'url' => route('purple.index', ['id' => $current->getParameter('id'), 'key' => $this->getName()])
+        ];
+    }
+
     public function formatData()
     {
         return [

diff --git a/src/Collections/Database.php b/src/Collections/Database.php
@@ -18,7 +18,7 @@ class Database extends AbstractCollection
     protected $name = 'db';
 
     protected $icon = 'database';
-    
+
     protected $template = 'query';
 
     public function before(Application $application)

diff --git a/src/Collections/Event.php b/src/Collections/Event.php
@@ -22,11 +22,10 @@ class Event extends AbstractCollection
 
     public function before(Application $application)
     {
-        parent::before($application);
-
         /**
          * @var $event \Illuminate\Events\Dispatcher
          */
+        parent::before($application);
         $event = $application['events'];
         $event->listen('*', [$this, 'eventFired']);
     }

diff --git a/src/Collections/Route.php b/src/Collections/Route.php
@@ -19,7 +19,7 @@ class Route extends AbstractCollection
     protected $icon = 'road';
 
     protected $template = 'routes';
-
+    
     public function after(Application $app, Response $response)
     {
         /**

diff --git a/src/Controller/PurpleController.php b/src/Controller/PurpleController.php
@@ -59,6 +59,7 @@ protected function buildViewData($result, CollectionInterface $collection)
     protected function getGlobalData()
     {
         $global = [];
+        $menu = [];
         /**
          * @var $hook \Purple\PurpleHook
          */
@@ -67,9 +68,10 @@ protected function getGlobalData()
 
         foreach ($collections as $collection) {
             $global = array_merge($collection->getGlobal(), $global);
+            array_push($menu, $collection->getMenu());
         }
 
-        $global['menu'] = [];
+        $global['menus'] = $menu;
         return $global;
     }
 

diff --git a/src/PurpleHook.php b/src/PurpleHook.php
@@ -59,7 +59,6 @@ public function __construct(Application $app)
         $this->app = $app;
 
         foreach ($this->defaultCollections as $collection) {
-//            array_push($this->collections, $app->make($collection));
             $collection                                = $app->make($collection);
             $this->collections[$collection->getName()] = $collection;
         }

diff --git a/src/Resources/index.blade.php b/src/Resources/index.blade.php
@@ -17,22 +17,22 @@ class="fa fa-reply"></i></a></span>
 </header>
 <nav>
     <ul>
-        @foreach($menu as $item)
-            <li>
-                <a href="{{ array_get($item, 'url') }}" @if(array_get($item, 'title') == $name)class="active"@endif>
-                    @if(array_get($item, 'title') != $name)
-                    <span class="label">
-                        {{ array_get($item, 'title') }} <i class="arrow"></i>
-                    </span>
-                    @endif
-                    <i class="fa fa-{{ array_get($item, 'icon') }}"></i>
-                    @if (array_get($item, 'badge') > 0)
-                    <span class="badge">
-                        <i class="badge-inner">{{ array_get($item, 'badge') > 9 ? '+' : array_get($item, 'badge')  }}</i>
-                    </span>
-                    @endif
-                </a>
-            </li>
+        @foreach($menus as $item)
+        <li>
+            <a href="{{ $item['url'] }}" @if(array_get($item, 'name') == $name)class="active"@endif>
+                @if(array_get($item, 'name') != $name)
+                <span class="label">
+                    {{ array_get($item, 'name') }} <i class="arrow"></i>
+                </span>
+                @endif
+                <i class="fa fa-{{ array_get($item, 'icon') }}"></i>
+                @if (array_get($item, 'badge') > 0)
+                <span class="badge">
+                    <i class="badge-inner">{{ array_get($item, 'badge') > 9 ? '+' : array_get($item, 'badge')  }}</i>
+                </span>
+                @endif
+            </a>
+        </li>
         @endforeach
     </ul>
 </nav>

diff --git a/src/Resources/modules/event.blade.php → src/Resources/modules/events.blade.php b/src/Resources/modules/event.blade.php → src/Resources/modules/events.blade.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ class Route extends AbstractCollection @@
         protected $icon = 'road';
         protected $template = 'routes';
         public function after(Application $app, Response $response)
         {
             /**
@@ Expand Down @@