Merge branch 'classify_master' of https://github.com/jacobsen9026/AD-Accounts-Manager

Author: jacobsen9026

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace app\controllers;
+
+
+use App\App\AppUpdater;
+use System\Post;
+
+class Update extends Controller
+{
+
+    public function indexPost()
+    {
+        $csrfCheck = Post::get();
+        $updater = new AppUpdater();
+        return $updater->update(false);
+
+
+    }
+}

app/controllers/Update.php

@@ -32,6 +32,7 @@
  * @author cjacobsen
  */
 
+use App\App\AppUpdater;
 use App\Controllers\Controller;
 use System\App\AppLogger;
 use App\Models\Database\AppDatabase;
@@ -58,12 +59,15 @@ public function index()
 
     public function indexPost()
     {
-        AppLogger::get()->info('Editing Settings');
-        $post = \system\Post::getAll();
-        AppDatabase::saveSettings($post);
+        if (Post::get('action') === 'updateApp') {
+            $this->updateApp();
+        }
+    }
 
-        EmailDatabase::saveSettings($post);
-        $this->redirect('/settings/application');
+    private function updateApp()
+    {
+        $this->updater = new AppUpdater();
+        return $this->updater->update(false);
     }
 
 }

app/controllers/settings/Update.php

@@ -33,5 +33,5 @@
 interface DatabaseModelInterface
 {
 
-    public static function saveSettings(array $postData);
+
 }

app/models/database/DatabaseModelInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace App\Models\Database;
+
+
+class SchemaDatabase extends DatabaseModel
+{
+
+    /**
+     * @return mixed
+     */
+    public static function getSchemaVersion()
+    {
+        return self::getDatabaseValue('Schema_Version', 1);
+    }
+}

app/models/database/SchemaDatabase.php

@@ -18,60 +18,37 @@ public function __construct(string $header, string $body, $timeout = 0)
         $this->setHeader($header)
             ->addToBody($body)
             ->setTimeout($timeout);
-        $this->classes = 'position-fixed  center top';
+        $this->classes = 'position-fixed w-auto center top';
     }
 
     /**
-     * @return string
-     */
-    public function getClasses(): string
-    {
-        return $this->classes;
-    }
-
-    /**
-     * @param string $classes
+     * @param string $body
      *
      * @return Toast
      */
-    public function addClasses(string $classes): Toast
+    public function addToBody($body)
     {
-        if (is_string($classes)) {
-            $this->classes = trim(str_replace("  ", " ", $this->classes)) . ' ' . trim($classes);
-        } elseif (is_array($classes)) {
-            foreach ($classes as $class) {
-                $this->classes = trim(str_replace("  ", " ", $this->classes)) . ' ' . trim($class);
-            }
-        }
+        $this->body .= $body;
         return $this;
     }
 
-    public function removeClasses(string $classes): Toast
+    public function printToast()
     {
-        $this->classes = str_replace($classes, '', $this->getClasses());
-        return $this;
-    }
+        $toast = ['toastClasses' => $this->getClasses(), 'header' => $this->getHeader(), 'body' => $this->getBody(), 'timeout' => $this->getTimeout(), 'image' => $this->getImage(), 'closable' => $this->closable];
 
-    /**
-     * @return mixed
-     */
-    public function getImage()
-    {
-        return $this->image;
+        $html = $this->view('layouts/toast', $toast);
+
+        return $html;
     }
 
     /**
-     * @param mixed $image
-     *
-     * @return Toast
+     * @return string
      */
-    public function setImage($image)
+    public function getClasses(): string
     {
-        $this->image = $image;
-        return $this;
+        return $this->classes;
     }
 
-
     /**
      * @return string
      */
@@ -99,17 +76,6 @@ public function getBody()
         return $this->body;
     }
 
-    /**
-     * @param string $body
-     *
-     * @return Toast
-     */
-    public function addToBody($body)
-    {
-        $this->body .= $body;
-        return $this;
-    }
-
     /**
      * @return int
      */
@@ -129,14 +95,23 @@ public function setTimeout($timeout)
         return $this;
     }
 
-
-    public function printToast()
+    /**
+     * @return mixed
+     */
+    public function getImage()
     {
-        $toast = ['toastClasses' => $this->getClasses(), 'header' => $this->getHeader(), 'body' => $this->getBody(), 'timeout' => $this->getTimeout(), 'image' => $this->getImage(), 'closable' => $this->closable];
-
-        $html = $this->view('layouts/toast', $toast);
+        return $this->image;
+    }
 
-        return $html;
+    /**
+     * @param mixed $image
+     *
+     * @return Toast
+     */
+    public function setImage($image)
+    {
+        $this->image = $image;
+        return $this;
     }
 
     public function closable()
@@ -150,5 +125,28 @@ public function bottom()
             ->addClasses('bottom');
     }
 
+    /**
+     * @param string $classes
+     *
+     * @return Toast
+     */
+    public function addClasses(string $classes): Toast
+    {
+        if (is_string($classes)) {
+            $this->classes = trim(str_replace("  ", " ", $this->classes)) . ' ' . trim($classes);
+        } elseif (is_array($classes)) {
+            foreach ($classes as $class) {
+                $this->classes = trim(str_replace("  ", " ", $this->classes)) . ' ' . trim($class);
+            }
+        }
+        return $this;
+    }
+
+    public function removeClasses(string $classes): Toast
+    {
+        $this->classes = str_replace($classes, '', $this->getClasses());
+        return $this;
+    }
+
 
 }

app/models/view/Toast.php

@@ -22,6 +22,7 @@
     $toast = new Toast('New version available!', $toastBody, 10000);
     $toast->closable();
     echo $toast->printToast();
+    echo "this will go away";
 }
 ?>
 

app/views/homepage.php

@@ -5,7 +5,6 @@
 
             <strong class="ml-1 mr-auto">
                 <?= $params['header'] ?></strong>
-
             <?php
             if ($params['timeout'] === 0 || $params['closable']) {
                 ?>

app/views/layouts/toast.php

@@ -51,8 +51,8 @@
 
 
 $updateButton = new FormButton('Update to v' . $latestVersion);
-$updateButton->tiny()
-    ->addAJAXRequest('/api/update', 'settingsOutput', ['action' => 'updateApp']);
+$updateButton->tiny();
+// ->addAJAXRequest('/api/update', 'settingsOutput', ['action' => 'updateApp']);
 $updateForm->addElementToCurrentRow($updateButton)
     ->addElementToNewRow($action);
 $closeModalFunction = '$(\'#' . $updateModal->getId() . '\').modal(\'hide\')';