commiting prod build

Author: gilbert-rehling

app/Http/Controllers/Api/DatabasesController.php

@@ -404,6 +404,53 @@ public function deleteDatabase(Request $request)
         }
     }
 
+    /**
+     * Run command against a database
+     *
+     * URL:         /api/databases/{database}/command
+     * Method:      POST
+     * Description: Return the results of a database command
+     * ToDo: setup a method to analyse the result before returning
+     *
+     * @param  Request $request
+     * @param  $database
+     * @return mixed
+     *
+     * @throws MongoDB\Driver\Exception\Exception
+     */
+    public function databaseCommand(Request $request, $database)
+    {
+        try {
+            // primitive validation
+            if ($request->get('database') == $database) {
+                // create the database Todo: !! may not be required !!
+                //$db = $this->mongo->connectClientDb($database);
+
+                // connect the manager
+                $this->mongo->connectManager();
+                /** @var MongoDB\Driver\Manager $manager */
+                $manager = $this->mongo->getManager();
+                $params  = $request->get('params');
+                $command = json_decode($params['command'], true);
+
+                /** @var MongoDB\Collection $coll */
+                $command = new MongoDB\Driver\Command($command);
+
+                // ToDo !! analyse results and act accordingly !!
+                $results = $manager->executeCommand($database, $command);
+
+                // be good be good! - Johnny !!
+                return response()->success('success', array('results' => $results->toArray()[0] ));
+
+            } else {
+                return response()->error('failed', array('error' => 'database names mismatched'));
+            }
+        }
+        catch (\Exception $e) {
+            return response()->error('failed', array('error' => $e->getMessage()));
+        }
+    }
+
     /**
      *
      * @inheritDoc

app/Http/Controllers/Api/ServerController.php

@@ -134,7 +134,8 @@ private function getVersion()
     {
         try {
             $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https' : 'http';
-            $url      = $protocol . '://' . $_SERVER['HTTP_HOST'] . '/version.php';
+            //$url      = $protocol . '://' . $_SERVER['HTTP_HOST'] . '/version.php';
+            $url      =  './version.php'; // this handles a relative PATH
             // initialise curl
             $ch = curl_init();
 

public/img/icon/delete.png

@@ -59,5 +59,18 @@ export default {
                 names: names,
                 _token: window.axios.defaults.headers.common['X-CSRF-TOKEN']
             });
+    },
+
+    /*
+    *   Run a command against a database
+    *   POST  /api/v1/database/{database}/command
+    */
+    databaseCommand: ( data ) => {
+        return axios.post( MONGO_CONFIG.API_URL + '/databases/' + data.database + '/command',
+            {
+                database: data.database,
+                params: data.params,
+                _token: window.axios.defaults.headers.common['X-CSRF-TOKEN']
+            });
     }
 }

public/js/app.js

@@ -106,7 +106,11 @@ if (currentLang) {
     locale = currentLang;
 }
 if (!currentLang) {
-    axios.get( MONGO_CONFIG.WEB_URL + '/js/acceptLang.js' )
+    /*axios.get( MONGO_CONFIG.WEB_URL + '/js/acceptLang.js' )
+    .then( (response) => {
+        locale = userLang === response.data ? userLang : response.data;
+    });*/
+    axios.get( 'js/acceptLang.js' )
     .then( (response) => {
         locale = userLang === response.data ? userLang : response.data;
     });

resources/js/api/database.js

@@ -76,7 +76,7 @@
             }
 
             .image-rating-container.over {
-                background: $white url("/img/thumbs-color-over.jpg") no-repeat scroll 0 0;
+                background: $white url("./img/thumbs-color-over.jpg") no-repeat scroll 0 0;
             }
         }
 

resources/js/app.js

@@ -53,7 +53,7 @@
     <transition name="slide-in-top">
         <div class="no-results-notification-container" v-show="show">
             <div class="noresult-notification">
-                <img src="/img/error.svg"/> {{ errorMessage }}
+                <img src="img/error.svg"/> {{ errorMessage }}
             </div>
         </div>
     </transition>

resources/js/components/admin/ListCard.vue

@@ -133,10 +133,19 @@
 </style>
 
 <template>
-    <div ref="pmaDatabaseView" id="pma-databases-view" class="pma-database-view align-left" v-show="show">
+    <div ref="pmaDatabaseView" id="pma-database-view" class="pma-database-view align-left" v-show="show">
         <database-top-view></database-top-view>
         <database-card v-bind:db="getDatabase"></database-card>
-        <NewCollection></NewCollection>
+        <new-collection></new-collection>
+        <commands></commands>
+        <execute></execute>
+        <transfer></transfer>
+        <import></import>
+        <export></export>
+        <profile></profile>
+        <repair></repair>
+        <authentication></authentication>
+        <drop></drop>
     </div>
 </template>
 
@@ -152,6 +161,15 @@
     import DatabaseTopView from "./top/DatabaseTopView";
     import DatabaseCard from "./DatabaseCard";
     import NewCollection from "./collection/NewCollection";
+    import Commands from "./database/Command";
+    import Execute from "./database/Execute";
+    import Transfer from "./database/Transfer";
+    import Import from "./database/Import";
+    import Export from "./database/Export";
+    import Profile from "./database/Profile";
+    import Repair from "./database/Repair";
+    import Authentication from "./database/Authentication";
+    import Drop from "./database/Drop";
 
     export default {
         /*
@@ -160,7 +178,16 @@
         components: {
             DatabaseTopView,
             DatabaseCard,
-            NewCollection
+            NewCollection,
+            Commands,
+            Execute,
+            Transfer,
+            Import,
+            Export,
+            Profile,
+            Repair,
+            Authentication,
+            Drop
         },
 
         /*

resources/js/components/admin/NoResultsFound.vue

@@ -129,7 +129,7 @@
 
             .panel-modal-inner {
                 /* background: $white; */
-                background: $white url("/img/white-bg.jpg") repeat center center;
+                background: $white url('/img/white-bg.jpg') repeat center center;
                 background-size: cover;
                 box-shadow: 0 0 4px 0 rgba(0,0,0,0.12), 0 4px 4px 0 rgba(0,0,0,0.24);
                 border-left: 5px solid $orange;
@@ -378,13 +378,13 @@
             </tr>
         </table>
         <div ref="query-fields-list" class="fields-menu">
-            <span class="fields-control"><span class="pma-link" title="Click to close" v-on:click="closeQueryFields()"><img alt="Select" src="/img/icon/accept.png" /></span></span>
+            <span class="fields-control"><span class="pma-link" title="Click to close" v-on:click="closeQueryFields()"><img alt="Select" src="img/icon/accept.png" /></span></span>
             <ul>
                 <!-- to do fields list -->
             </ul>
         </div>
         <div ref="query-hints-list" class="fields-menu">
-            <span class="fields-control"><span class="pma-link" title="Click to close" v-on:click="closeQueryHints()"><img alt="Select" src="/img/icon/accept.png" /></span></span>
+            <span class="fields-control"><span class="pma-link" title="Click to close" v-on:click="closeQueryHints()"><img alt="Select" src="img/icon/accept.png" /></span></span>
             <ul>
                 <!-- to do hints list -->
             </ul>