Small fixes, added addPath() tpl method for custom dashboards

Author: RobiNN1

index.php

@@ -46,7 +46,10 @@
 
 foreach ($admin->getDashboards() as $d_key => $d_dashboard) {
     $d_info = $d_dashboard->getDashboardInfo();
-    $nav[$d_key] = $d_info['title'];
+    $nav[$d_key] = [
+        'title' => $d_info['title'],
+        'icon'  => $d_info['icon'] ?? $d_key,
+    ];
 }
 
 $current = $admin->currentDashboard();

src/Dashboards/Memcached/MemcachedTrait.php

@@ -125,7 +125,7 @@ private function moreInfo(array $servers): string {
      * @return array<int, array<string, string|int>>
      */
     private function getAllKeys($memcached): array {
-        $keys = [];
+        static $keys = [];
 
         foreach ($memcached->getKeys() as $key_data) {
             $keys[] = [

src/Dashboards/Redis/RedisTrait.php

@@ -209,7 +209,7 @@ private function getDatabases(Redis $redis): array {
      * @return array<int, array<string, string|int>>
      */
     private function getAllKeys(Redis $redis): array {
-        $keys = [];
+        static $keys = [];
         $filter = Http::get('s');
         $filter = !empty($filter) ? $filter : '*';
 
@@ -229,26 +229,6 @@ private function getAllKeys(Redis $redis): array {
         return $keys;
     }
 
-    /**
-     * Get a key type.
-     *
-     * @param int $type
-     *
-     * @return string
-     */
-    private function getType(int $type): string {
-        $data_types = [
-            Redis::REDIS_STRING    => 'string',
-            Redis::REDIS_SET       => 'set',
-            Redis::REDIS_LIST      => 'list',
-            Redis::REDIS_ZSET      => 'zset',
-            Redis::REDIS_HASH      => 'hash',
-            Redis::REDIS_NOT_FOUND => 'other',
-        ];
-
-        return $data_types[$type];
-    }
-
     /**
      * Main dashboard content.
      *

src/Dashboards/Redis/TypesTrait.php

@@ -17,6 +17,26 @@
 use RobiNN\Pca\Http;
 
 trait TypesTrait {
+    /**
+     * Get a key type.
+     *
+     * @param int $type
+     *
+     * @return string
+     */
+    private function getType(int $type): string {
+        $data_types = [
+            Redis::REDIS_STRING    => 'string',
+            Redis::REDIS_SET       => 'set',
+            Redis::REDIS_LIST      => 'list',
+            Redis::REDIS_ZSET      => 'zset',
+            Redis::REDIS_HASH      => 'hash',
+            Redis::REDIS_NOT_FOUND => 'other',
+        ];
+
+        return $data_types[$type];
+    }
+
     /**
      * Get key's value. (For edit form)
      *

src/Helpers.php

@@ -170,14 +170,14 @@ public static function returnJson(array $data): string {
     /**
      * Get svg icon from file.
      *
-     * @param string  $icon
+     * @param string  $icon Icon name from `assets/icons/` or custom path.
      * @param ?int    $size
      * @param ?string $class
      *
      * @return ?string
      */
     public static function svg(string $icon, ?int $size = 16, ?string $class = null): ?string {
-        $file = __DIR__.'/../assets/icons/'.$icon.'.svg';
+        $file = is_file($icon) ? $icon : __DIR__.'/../assets/icons/'.$icon.'.svg';
 
         if (is_file($file)) {
             $content = trim(file_get_contents($file));

src/Template.php

@@ -14,6 +14,7 @@
 
 use Exception;
 use Twig\Environment;
+use Twig\Error\LoaderError;
 use Twig\Extension\DebugExtension;
 use Twig\Loader\FilesystemLoader;
 use Twig\TwigFilter;
@@ -25,6 +26,11 @@ class Template {
      */
     private array $globals = [];
 
+    /**
+     * @var array<string, string>
+     */
+    private array $paths = [];
+
     /**
      * Add global template variable.
      *
@@ -37,6 +43,18 @@ public function addGlobal(string $name, $value): void {
         $this->globals[$name] = $value;
     }
 
+    /**
+     * Add a path with namespace.
+     *
+     * @param string $namespace
+     * @param string $path
+     *
+     * @return void
+     */
+    public function addPath(string $namespace, string $path): void {
+        $this->paths[$namespace] = $path;
+    }
+
     /**
      * Render template.
      *
@@ -53,6 +71,14 @@ public function render(string $tpl, array $data = []): string {
                 'debug' => Config::get('twigdebug'),
             ]);
 
+            foreach ($this->paths as $namespace => $path) {
+                try {
+                    $loader->addPath(realpath($path), $namespace);
+                } catch (LoaderError $e) {
+                    echo $e->getMessage();
+                }
+            }
+
             if (Config::get('twigdebug')) {
                 $twig->addExtension(new DebugExtension());
             }

templates/layout.twig

@@ -12,9 +12,9 @@
     <nav class="bg-{{ color }}-500 fixed top-0 left-0 bottom-0 block w-64 overflow-hidden overflow-y-auto py-4 pt-6 px-6 shadow-xl shadow-gray-500">
         <div class="mx-auto min-h-full w-full px-0">
             <a class="hidden pb-2 text-white md:block" href="index.php">{{ svg('logo', null) }}</a>
-            {% for link, title in nav %}
+            {% for link, item in nav %}
                 <a class="flex items-center py-2 {{ current == link ? ' font-bold' : '' }} text-white hover:text-gray-200" href="?type={{ link }}">
-                    {{ svg(link, 16, 'mr-1' ~ (current == link ? '' : ' opacity-75')) }} {{ title }}
+                    {{ svg(item.icon, 16, 'mr-1' ~ (current == link ? '' : ' opacity-75')) }} {{~ item.title ~}}
                 </a>
             {% endfor %}
             <footer class="my-4 text-center text-white">

templates/partials/info_table.twig

@@ -31,10 +31,12 @@
                             <td colspan="2" class="px-4 py-2 text-xs font-bold uppercase whitespace-nowrap">{{ name|replace({'_': ' '}) }}</td>
                         </tr>
                         {% for sub_name, sub_value in value %}
-                            <tr class="[&:last-child>*]:border-b-0">
-                                <td class="border-b border-gray-100 px-4 py-1 text-sm font-semibold whitespace-nowrap">{{ sub_name }}</td>
-                                <td class="border-b border-gray-100 px-4 py-1 text-sm">{{ sub_value|raw }}</td>
-                            </tr>
+                            {% if sub_value is not iterable %}
+                                <tr class="[&:last-child>*]:border-b-0">
+                                    <td class="border-b border-gray-100 px-4 py-1 text-sm font-semibold whitespace-nowrap">{{ sub_name }}</td>
+                                    <td class="border-b border-gray-100 px-4 py-1 text-sm">{{ sub_value|raw }}</td>
+                                </tr>
+                            {% endif %}
                         {% endfor %}
                     {% else %}
                         <tr class="[&:last-child>*]:border-b-0">