update admin

views/components/AdminSidebar.php

@@ -88,10 +88,10 @@ body {
                             <i class="bx bx-file-blank nav__icon"></i>
                             <span class="nav__name">Страницы</span>
                         </a>
-                        <!--a href="/admin?type=Settings" class="nav__link">
+                        <a href="/admin?type=Settings" class="nav__link">
                             <i class="bx bx-cog nav__icon"></i>
                             <span class="nav__name">Настройки<span class="badge text-bg-warning">BETA</span></span>
-                        <-->
+                        </a>
                        
 
                     </div>

views/pages/Admin/Contests.php

@@ -5,9 +5,8 @@ use \App\Models\User;
 
 $task = new TaskScheduler();
 
-//$userprofile = new User(explode('/', $_SERVER['REQUEST_URI'])[2]);
 $contestCreate = true;
-if (!$task->isTaskExists("FinishContests", "php /path/to/finish_contests.php")) {
+if (!$task->isTaskExists("ExecContests", "php ".$_SERVER['DOCUMENT_ROOT'].$task->findHandlerById(NGALLERY_TASKS, 'ExecContests'))) {
     $contestCreate = false;
 }
 ?>
@@ -38,16 +37,9 @@ if (!$task->isTaskExists("FinishContests", "php /path/to/finish_contests.php"))
                                                                                                                 } ?>">Провести новый</a>
                 <table class="table">
                     <?php
-                    /*echo $task->addTask(
-                        "FinishContests", 
-                        "php ".$_SERVER['DOCUMENT_ROOT']."/app/Controllers/Exec/Tasks/FinishContests.php >> ".$_SERVER['DOCUMENT_ROOT'].NGALLERY['root']['logslocation']." 2>&1",
-                        "* * * * *" // Каждую минуту (можно менять)
-                    );*/
                     if ($contestCreate === false) {
-                        echo "<div class='alert alert-warning' role='alert'>У вас не добавлена задача на проведение конкурсов. Без неё, сервер не сможет завершать конкурс и проводить новый автоматически.</div>";
+                        echo "<div class='alert alert-warning mt-3' role='alert'>У вас не добавлена задача на проведение конкурсов. Без неё, сервер не сможет завершать конкурс и проводить новый автоматически.<a href='/admin?type=Settings' type='button' style='margin-left: 5px;' class='btn btn-sm btn-outline-dark'>Включить</a></div>";
                     }
-                    echo $task->removeTask("FinishContests", "php /path/to/finish_contests.php");
-
                     ?>
                     <tbody>
                         <tr>

views/pages/Admin/Settings.php

@@ -1,12 +1,14 @@
 <?php
 
-use \App\Services\{KeyTranslation};
+use \App\Services\{KeyTranslation, TaskScheduler};
 use \App\Models\User;
 
 use Symfony\Component\Yaml\Yaml;
 
+$task = new TaskScheduler();
 $yamlFile = $_SERVER['DOCUMENT_ROOT'] . '/ngallery.yaml';
-function renderInputs($data, $prefix = '') {
+function renderInputs($data, $prefix = '')
+{
     foreach ($data as $key => $value) {
         $name = $prefix ? "{$prefix}[{$key}]" : $key;
         $key = KeyTranslation::key($key);
@@ -81,6 +83,23 @@ function renderInputs($data, $prefix = '') {
         <?= \App\Controllers\AdminController::loadContent(); ?>
 
         <h1><b>Настройки</b></h1>
+        <div class="v-header__tabs">
+            <div class="v-tabs">
+                <div class="v-tabs__scroll">
+                    <div class="v-tabs__content"><a href="#" onclick="changeTab('config')" id="config" class="v-tab v-tab-b v-tab--active"><span class="v-tab__label">
+                                Конфиг сервера
+
+                            </span></a><a href="#" onclick="changeTab('tasks')" id="tasks" class="v-tab v-tab-b"><span class="v-tab__label">
+                                Задачи
+
+                            </span></a>
+
+
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="active__block" id="config__block">
         <div class="alert alert-warning" role="alert">
             Изменяйте только на свой страх и риск.
         </div>
@@ -99,9 +118,54 @@ function renderInputs($data, $prefix = '') {
 
 
         </div>
+        <div style="display: none;" id="tasks__block">
+        <table class="table">
+                            <tbody>
+                                <tr>
+                                    <th width="100">ID</th>
+                                    <th width="50%">Статус</th>
+                                    <th>Действия</th>
+                                </tr>
+                               
+                                
+                                <?php
+                                foreach (NGALLERY_TASKS as $nt) {
+                                    $nt = $nt;
+                                    echo '<tr><td>
+
+                                       '.$nt['id'].'
+                                    </td><td>
+                                       '.$task->getTaskStatus($nt['id'], "php {$nt['handler']}").'
+                                    </td><td class="c">
+                                        <a onclick="taskManager(`'.$nt['id'].'`, 1)" class="btn btn-sm btn-primary">Запустить</a> <a onclick="taskManager(`'.$nt['id'].'`, 0)" class="btn btn-sm btn-danger">Остановить</a>
+                                    </td> <tr>';
+                                }
+
+                              
+                            
+                                ?>
+                                
+                            </tbody>
+        </table>
+        </div>
+    </div>
 
 
 
 </body>
+<script>
+    function taskManager(id, type) {
+        $.ajax({
+            type: "GET",
+            url: '/api/admin/settings/taskmanager?id='+id+'&type='+type,
+            success: function(response) {
+                Notify.noty('success', 'OK!');
+
+
+            }
+
+        });
+    }
+    </script>
 
 </html>