🎨 [REFACTOR] Cleaning up.

Protoqol · Jul 19, 2019 · 0a5e0f4 · 0a5e0f4
1 parent 27cfafd
commit 0a5e0f4
Show file tree

Hide file tree

Showing 8 changed files with 109,237 additions and 67 deletions.
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/resources/assets/js/components/MainContent/ManageDatabase/Management.vue b/resources/assets/js/components/MainContent/ManageDatabase/Management.vue
@@ -9,11 +9,11 @@
                            :value="app.serverInfo.QUERIES_PER_SECOND_AVG ? app.serverInfo.QUERIES_PER_SECOND_AVG : 'Could not retrieve'"
                            :unit="app.serverInfo.QUERIES_PER_SECOND_AVG ? 'queries per second' : '...'">
                 <slot ref="alert">
-                    <Badge v-if="app.serverInfo.QUERIES_PER_SECOND_AVG && app.serverInfo.QUERIES_PER_SECOND_AVG === 0"
+                    <Badge v-if="app.serverInfo.QUERIES_PER_SECOND_AVG === 0"
                            type="critical"/>
-                    <Badge v-if="app.serverInfo.QUERIES_PER_SECOND_AVG && app.serverInfo.QUERIES_PER_SECOND_AVG >= 0.3"
-                           type="average"/>
-                    <Badge v-if="app.serverInfo.QUERIES_PER_SECOND_AVG && app.serverInfo.QUERIES_PER_SECOND_AVG >= 1"
+                    <Badge v-else-if="app.serverInfo.QUERIES_PER_SECOND_AVG <= 0.3 && app.serverInfo.QUERIES_PER_SECOND_AVG <= 0.9"
+                           type="neutral"/>
+                    <Badge v-else-if="app.serverInfo.QUERIES_PER_SECOND_AVG > 0.9"
                            type="good"/>
                 </slot>
             </StatusDisplay>

diff --git a/resources/assets/js/components/MainContent/ManageDatabase/Migrations.vue b/resources/assets/js/components/MainContent/ManageDatabase/Migrations.vue
@@ -37,15 +37,15 @@
 
     methods: {
       runMigrations: function() {
-        api.get('migrations/run').then(res => {
+        api.get('database/migrations/run').then(res => {
           if (res) {
             window.location.reload();
           }
         });
       },
 
       resetMigrations: function() {
-        api.get('migrations/reset').finally(() => {
+        api.get('database/migrations/reset').finally(() => {
           window.location.reload();
         });
       },

diff --git a/src/Classes/Database/DatabaseTraverser.php b/src/Classes/Database/DatabaseTraverser.php
@@ -184,19 +184,6 @@ public function getTablesFromDB(string $database): array
     {
         $tables = $this->connection->select($this->databaseQueries->showTablesFrom($database));
 
-        // Collect differently if postgres. @TODO.
-        $tmp = [];
-
-        if ($this->databaseConn === 'pgsql') {
-            for ($i = 0; $i < count($tables); $i++) {
-                if ($tables[$i]->schemaname === $database) {
-                    array_push($tmp, $tables[$i]);
-                }
-            }
-            unset($tables);
-            $tables = $tmp;
-        }
-
         return $this->normalise($tables);
     }
 
@@ -227,7 +214,7 @@ public function getAllDatabases(): array
 
     /**
      * Normalise query results; assumes a lot about the structure, which can
-     * potentially cause problems later on. @TODO
+     * potentially cause problems later on.
      * Assumed structure:
      *  -----------------
      *  Array [

diff --git a/src/Http/Controllers/DatabaseController.php b/src/Http/Controllers/DatabaseController.php
@@ -8,10 +8,8 @@
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
-use Protoqol\Prequel\Classes\App\Migrations;
 use Protoqol\Prequel\Classes\Database\DatabaseConnector;
 use Protoqol\Prequel\Classes\Database\DatabaseTraverser;
-use Protoqol\Prequel\Http\Requests\PrequelDatabaseRequest;
 
 /**
  * Class DatabaseActionController
@@ -72,8 +70,6 @@ public function getTableData()
     {
         // If Model exists
         if ($this->model && $this->databaseName === config('database.connections.mysql.database')) {
-            $hidden    = $this->model->getHidden();
-            $visible   = $this->model->getVisible();
             $paginated = $this->model->paginate(config('prequel.pagination'));
             $paginated->setCollection($paginated->getCollection()->each->setHidden([])->each->setVisible([]));
 
@@ -98,25 +94,8 @@ public function getTableData()
         ];
     }
 
-    /**
-     * Get count of rows in table
-     * Not yet used.
-     * @return array
-     */
-    public function countTableRecords(): array
-    {
-        $count = DB::table($this->qualifiedName)
-                   ->count('id');
-
-        return [
-            "table" => $this->qualifiedName,
-            "count" => $count,
-        ];
-    }
-
     /**
      * Find given value in given column with given operator.
-     * @TODO Clean up.
      * @return mixed
      */
     public function findInTable()
@@ -131,22 +110,4 @@ public function findInTable()
                  ->where($column, $queryType, $value)
                  ->paginate(config('prequel.pagination'));
     }
-
-    /**
-     * Run pending migrations.
-     * @return int
-     */
-    public function runMigrations()
-    {
-        return (new Migrations())->run();
-    }
-
-    /**
-     * Reset latest migrations.
-     * @return int
-     */
-    public function resetMigrations()
-    {
-        return (new Migrations())->reset();
-    }
 }
diff --git a/src/Http/Controllers/PrequelController.php b/src/Http/Controllers/PrequelController.php
@@ -6,11 +6,11 @@
 
 use Illuminate\Routing\Controller;
 use Protoqol\Prequel\Classes\App\AppStatus;
+use Protoqol\Prequel\Classes\App\Migrations;
 use Protoqol\Prequel\Classes\Database\DatabaseTraverser;
 
 /**
  * Class PrequelController
- *
  * @package Protoqol\Prequel\Http\Controllers
  */
 class PrequelController extends Controller
@@ -40,11 +40,28 @@ public function index()
 
     /**
      * Get app status.
-     *
      * @return array
      */
     public function status()
     {
         return (new AppStatus())->getStatus();
     }
+
+    /**
+     * Run pending migrations.
+     * @return int
+     */
+    public function runMigrations()
+    {
+        return (new Migrations())->run();
+    }
+
+    /**
+     * Reset latest migrations.
+     * @return int
+     */
+    public function resetMigrations()
+    {
+        return (new Migrations())->reset();
+    }
 }
diff --git a/src/Http/routes.php b/src/Http/routes.php
@@ -2,6 +2,15 @@
 
 use Illuminate\Support\Facades\Route;
 
+
+/**
+ |-----------------------------------------
+ |  Prequel Web Routes /prequel or via config.
+ |-----------------------------------------
+ |
+ | Separate from web route to avoid user configured path messing up the Prequel-API.
+ |
+*/
 Route::namespace('Protoqol\Prequel\Http\Controllers')
      ->middleware(config('prequel.middleware'))
      ->prefix(config('prequel.path'))
@@ -12,9 +21,16 @@
 
      });
 
-// Separate from web route to avoid user configured path messing up the Prequel-API.
+/**
+ |-----------------------------------------
+ |  Prequel API Routes /prequel-api
+ |-----------------------------------------
+ |
+ | Separate from web route to avoid user configured path messing up the Prequel-API.
+ |
+*/
 Route::namespace('Protoqol\Prequel\Http\Controllers')
-     ->middleware([Protoqol\Prequel\Http\Middleware\Authorised::class])
+     ->middleware(config('prequel.middleware'))
      ->prefix('prequel-api')
      ->name('prequel.')
      ->group(function () {
@@ -26,8 +42,8 @@
              Route::get('count/{database}/{table}', 'DatabaseController@countTableRecords');
              Route::get('find/{database}/{table}/{column}/{type}/{value}', 'DatabaseController@findInTable');
 
-             Route::get('run', 'DatabaseController@runMigrations');
-             Route::get('reset', 'DatabaseController@resetMigrations');
+             Route::get('migrations/run', 'PrequelController@runMigrations');
+             Route::get('migrations/reset', 'PrequelController@resetMigrations');
          });
 
      });