Merge branch 'feature/vuejs' into feature/vue-serverview

Author: DaneEveritt

.env.dusk

@@ -0,0 +1,26 @@
+APP_ENV=local
+APP_DEBUG=false
+APP_KEY=NDWgIKKi9ovNK1PXZpzfNVSBdfCXGb5i
+APP_JWT_KEY=test1234
+APP_TIMEZONE=America/Los_Angeles
+APP_URL=http://pterodactyl.local
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+
+HASHIDS_SALT=IqRr0g82tCTeuyxGs8RV
+HASHIDS_LENGTH=8
+
+MAIL_DRIVER=log
+MAIL_FROM=support@pterodactyl.io
+QUEUE_DRIVER=array
+
+APP_SERVICE_AUTHOR=testing@pterodactyl.io
+MAIL_FROM_NAME="Pterodactyl Panel"
+RECAPTCHA_ENABLED=false
+
+DB_CONNECTION=testing
+TESTING_DB_HOST=services.pterodactyl.local
+TESTING_DB_DATABASE=panel_test
+TESTING_DB_USERNAME=panel_test
+TESTING_DB_PASSWORD=Test1234

app/Http/Controllers/Base/DashboardController.php

@@ -3,6 +3,8 @@
 namespace Pterodactyl\Transformers\Api\Client;
 
 use Pterodactyl\Models\Server;
+use GuzzleHttp\Exception\RequestException;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface;
 
 class StatsTransformer extends BaseClientTransformer
@@ -36,6 +38,8 @@ public function getResourceName(): string
      *
      * @param \Pterodactyl\Models\Server $model
      * @return array
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
     public function transform(Server $model)
     {
@@ -61,7 +65,10 @@ public function transform(Server $model)
             'disk' => [
                 'current' => round(object_get($object, 'proc.disk.used', 0)),
                 'limit' => floatval($model->disk),
+                'io' => $model->io,
             ],
+            'installed' => $model->installed === 1,
+            'suspended' => (bool) $model->suspended,
         ];
     }
 

app/Transformers/Api/Client/StatsTransformer.php

@@ -48,6 +48,7 @@
         "filp/whoops": "^2.1",
         "friendsofphp/php-cs-fixer": "^2.11.1",
         "fzaninotto/faker": "^1.6",
+        "laravel/dusk": "^3.0",
         "martinlindhe/laravel-vue-i18n-generator": "^0.1.28",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
@@ -68,6 +69,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Pterodactyl\\Tests\\Browser\\": "tests/Browser",
             "Pterodactyl\\Tests\\Integration\\": "tests/Integration",
             "Tests\\": "tests/"
         }

composer.json

@@ -2,6 +2,7 @@ const babel = require('gulp-babel');
 const concat = require('gulp-concat');
 const cssmin = require('gulp-cssmin');
 const del = require('del');
+const exec = require('child_process').exec;
 const gulp = require('gulp');
 const gulpif = require('gulp-if');
 const postcss = require('gulp-postcss');
@@ -85,6 +86,32 @@ function watch() {
     }, scripts));
 }
 
+/**
+ * Generate the language files to be consumed by front end.
+ *
+ * @returns {Promise<any>}
+ */
+function i18n() {
+    return new Promise((resolve, reject) => {
+        exec('php artisan vue-i18n:generate', {}, (err, stdout, stderr) => {
+            return err ? reject(err) : resolve({ stdout, stderr });
+        })
+    })
+}
+
+/**
+ * Generate the routes file to be used in Vue files.
+ * 
+ * @returns {Promise<any>}
+ */
+function routes() {
+    return new Promise((resolve, reject) => {
+        exec('php artisan ziggy:generate resources/assets/scripts/helpers/ziggy.js', {}, (err, stdout, stderr) => {
+            return err ? reject(err) : resolve({ stdout, stderr });
+        });
+    })
+}
+
 /**
  * Cleanup unused versions of hashed assets.
  */
@@ -93,9 +120,12 @@ function clean() {
 }
 
 exports.clean = clean;
+exports.i18n = i18n;
+exports.routes = routes;
 exports.styles = styles;
 exports.scripts = scripts;
 exports.watch = watch;
 
+gulp.task('components', gulp.parallel(i18n, routes));
 gulp.task('scripts', gulp.series(clean, scripts));
-gulp.task('default', gulp.series(clean, styles, scripts));
+gulp.task('default', gulp.series(clean, i18n, routes, styles, scripts));

composer.lock

@@ -30,6 +30,7 @@
         "jquery": "^3.3.1",
         "jwt-decode": "^2.2.0",
         "lodash": "^4.17.5",
+        "luxon": "^1.2.1",
         "postcss": "^6.0.21",
         "postcss-import": "^11.1.0",
         "postcss-preset-env": "^3.4.0",
@@ -42,6 +43,7 @@
         "vue": "^2.5.7",
         "vue-axios": "^2.1.1",
         "vue-devtools": "^3.1.9",
+        "vue-feather-icons": "^4.7.1",
         "vue-loader": "^14.2.2",
         "vue-mc": "^0.2.4",
         "vue-router": "^3.0.1",
@@ -58,6 +60,7 @@
         "build:filemanager": "./node_modules/babel-cli/bin/babel.js public/themes/pterodactyl/js/frontend/files/src --source-maps --out-file public/themes/pterodactyl/js/frontend/files/filemanager.min.js",
         "watch": "./node_modules/gulp-cli/bin/gulp.js watch",
         "build": "./node_modules/gulp-cli/bin/gulp.js default",
+        "build:components": "./node_modules/gulp-cli/bin/gulp.js components",
         "build:styles": "./node_modules/gulp-cli/bin/gulp.js styles",
         "build:scripts": "./node_modules/gulp-cli/bin/gulp.js scripts"
     }

gulpfile.js

@@ -10,6 +10,9 @@
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
+        <testsuite name="Browser">
+            <directory suffix="Test.php">./tests/Browser/Processes</directory>
+        </testsuite>
         <testsuite name="Integration">
             <directory suffix="Test.php">./tests/Integration</directory>
         </testsuite>

package.json

@@ -17,8 +17,8 @@ try {
  */
 
 window.axios = require('axios');
-
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+window.axios.defaults.headers.common['Accept'] = 'application/json';
 window.axios.defaults.headers.common['Authorization'] = 'Bearer ' + localStorage.token || '';
 
 if (typeof phpdebugbar !== 'undefined') {