From b6970ebef7bf8a341aa4bdc7fb537ce1dc64fb70 Mon Sep 17 00:00:00 2001
From: Stepan <stevedekart2020@gmail.com>
Date: Fri, 27 Jun 2025 22:44:05 +0200
Subject: [PATCH 1/2] Fixed path issue during upload image by model

---
 apps/Admin/Controllers/Abstract/AdminSingleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/Admin/Controllers/Abstract/AdminSingleController.php b/apps/Admin/Controllers/Abstract/AdminSingleController.php
index 5b4c9a2..b672b9a 100644
--- a/apps/Admin/Controllers/Abstract/AdminSingleController.php
+++ b/apps/Admin/Controllers/Abstract/AdminSingleController.php
@@ -139,7 +139,7 @@ abstract class AdminSingleController extends AdminBaseController
                 case 'image':
                     $file = $_FILES[$field['model_field']];
                     if (isset($file)) {
-                        $path = upload_file($file, $this->model_сlass_name . '/', 'image');
+                        $path = upload_file($file, $this->model_сlass_name::$table_name . '/', 'image');
 
                         if (!empty($path)) {
                             $field_value = $path;

From b66f2c6709af0059b8fdfbc8f884bc9076580b53 Mon Sep 17 00:00:00 2001
From: Stepan <stevedekart2020@gmail.com>
Date: Sat, 28 Jun 2025 00:10:15 +0200
Subject: [PATCH 2/2] Added information on dashboard

---
 .../Admin/Controllers/AdminHomeController.php | 32 ++++++++++++
 apps/Admin/Templates/home.php                 | 50 +++++++++----------
 includes/Model/BaseModel.php                  |  2 +-
 3 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/apps/Admin/Controllers/AdminHomeController.php b/apps/Admin/Controllers/AdminHomeController.php
index 6dbf9e6..832d743 100644
--- a/apps/Admin/Controllers/AdminHomeController.php
+++ b/apps/Admin/Controllers/AdminHomeController.php
@@ -1,6 +1,11 @@
 <?php
 namespace Lycoreco\Apps\Admin\Controllers;
 
+use Lycoreco\Apps\Recipes\Models\IngredientModel;
+use Lycoreco\Apps\Recipes\Models\RecipeModel;
+use Lycoreco\Apps\Users\Models\BanlistModel;
+use Lycoreco\Apps\Users\Models\UserModel;
+
 class AdminHomeController extends Abstract\AdminBaseController
 {
     protected $template_name = APPS_PATH . '/Admin/Templates/home.php';
@@ -13,6 +18,33 @@ class AdminHomeController extends Abstract\AdminBaseController
 
         $datetime_month_ago = new \DateTime();
         $datetime_month_ago->modify("-1 month");
+        $datetime_month_ago_text = $datetime_month_ago->format('Y-m-d H:i:s' . '\'');
+
+        $context['user_count'] = UserModel::count(array(
+            [
+                'name'      =>      'obj.register_at',
+                'type'      =>      '>=',
+                'value'     =>      $datetime_month_ago_text
+            ]
+        ));
+        $context['recipes_count'] = RecipeModel::count(array(
+            [
+                'name'      =>      'obj.created_at',
+                'type'      =>      '>=',
+                'value'     =>      $datetime_month_ago_text
+            ]
+        ));
+        $context['ban_count'] = BanlistModel::count(array(
+            [
+                'name'      =>      'obj.created_at',
+                'type'      =>      '>=',
+                'value'     =>      $datetime_month_ago_text
+            ]
+        ));
+        $context['latest_recipes'] = RecipeModel::filter(
+            array(), 
+            ['-obj.created_at']
+        );
 
 
         return $context;
diff --git a/apps/Admin/Templates/home.php b/apps/Admin/Templates/home.php
index 548f671..57b303b 100644
--- a/apps/Admin/Templates/home.php
+++ b/apps/Admin/Templates/home.php
@@ -7,31 +7,31 @@
         <div id="dashboard-stats">
             <div class="dashboard-stats__item top-sales">
                 <div class="icon">
-                    <i class="fa-solid fa-bag-shopping"></i>
+                    <i class="fa-solid fa-bowl-food"></i>
                 </div>
                 <div class="info">
-                    <div class="label">Total sales</div>
-                    <div class="value">0$</div>
+                    <div class="label">New recipes</div>
+                    <div class="value"><?= $context['recipes_count'] ?></div>
                 </div>
             </div>
 
             <div class="dashboard-stats__item profit">
                 <div class="icon">
-                    <i class="fa-solid fa-money-bill-trend-up"></i>
+                    <i class="fa-solid fa-message"></i>
                 </div>
                 <div class="info">
-                    <div class="label">Profit</div>
-                    <div class="value">0$</div>
+                    <div class="label">New reviews</div>
+                    <div class="value">0</div>
                 </div>
             </div>
 
             <div class="dashboard-stats__item orders">
                 <div class="icon">
-                    <i class="fa-solid fa-cart-shopping"></i>
+                    <i class="fa-solid fa-user-slash"></i>
                 </div>
                 <div class="info">
-                    <div class="label">Orders</div>
-                    <div class="value">0</div>
+                    <div class="label">Banned users</div>
+                    <div class="value"><?= $context['ban_count'] ?></div>
                 </div>
             </div>
 
@@ -41,7 +41,7 @@
                 </div>
                 <div class="info">
                     <div class="label">New users</div>
-                    <div class="value">0</div>
+                    <div class="value"><?= $context['user_count'] ?></div>
                 </div>
             </div>
         </div>
@@ -51,12 +51,12 @@
         <h2 class="title">Quick tools</h2>
 
         <div id="quicktools">
-            <a href="<?php the_permalink('admin:product-new') ?>" class="btn btn-secondary hover-anim">
-                <i class="fa-solid fa-plus"></i> New Product
+            <a href="<?php the_permalink('admin:recipe-new') ?>" class="btn btn-secondary hover-anim">
+                <i class="fa-solid fa-plus"></i> New recipe
             </a>
-            <form action="<?php the_permalink('admin:product-list') ?>" method="get">
+            <form action="<?php the_permalink('admin:recipe-list') ?>" method="get">
                 <div class="input-admin">
-                    <input type="text" name="s" placeholder="Search for products">
+                    <input type="text" name="s" placeholder="Search for recipes">
                     <button class="hover-anim" type="submit"><i class="fa-solid fa-magnifying-glass"></i></button>
                 </div>
             </form>
@@ -64,26 +64,24 @@
         </div>
     </section>
 
-    <h2 class="title">Latest orders</h2>
+    <h2 class="title">Latest resipes</h2>
 
     <table class="admin-table">
         <thead>
             <tr>
-                <th>Order number</th>
-                <th>Method</th>
-                <th>Total price</th>
-                <th>Buyer</th>
-                <th>Created at</th>
+                <th>Title</th>
+                <th>Price</th>
+                <th>Status</th>
+                <th>Created At</th>
             </tr>
         </thead>
         <tbody>
-            <?php foreach ($context['last_orders'] as $order): ?>
+            <?php foreach ($context['latest_recipes'] as $recipe): ?>
             <tr>
-                <td><a href="<?php the_permalink('admin:order', [$order->get_id()]) ?>"><?php echo $order->field_order_number ?></a></td>
-                <td><?php echo $order->field_method ?></td>
-                <td><?php echo $order->get_total_price() ?></td>
-                <td><?php echo $order->get_buyer_username() ?></td>
-                <td><?php echo $order->field_created_at ?></td>
+                <td><a href="<?php the_permalink('admin:recipe', [$recipe->get_id()]) ?>"><?= $recipe->field_title ?></a></td>
+                <td><?= $recipe->get_price() ?></td>
+                <td><?= $recipe->get_status() ?></td>
+                <td><?= $recipe->field_created_at ?></td>
             </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/includes/Model/BaseModel.php b/includes/Model/BaseModel.php
index d924618..d23878c 100644
--- a/includes/Model/BaseModel.php
+++ b/includes/Model/BaseModel.php
@@ -344,7 +344,7 @@ abstract class BaseModel
         else
             return false;
     }
-    static function count($fields, $search, $additional_fields = array())
+    static function count($fields, $search = '', $additional_fields = array())
     {
         $filter_result = static::filter(
             $fields,