Merge branch 'feature/vuejs' into develop

Author: DaneEveritt

.babelrc

@@ -21,6 +21,12 @@ debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password_again
 # actually install
 apt-get install -y php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-memcached php7.2-curl php7.2-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null
 
+echo "Install nodejs and yarn"
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+apt-get -y install nodejs yarn > /dev/null
+
 echo "Install composer"
 curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 

.dev/vagrant/provision.sh

@@ -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=192.168.1.202
+TESTING_DB_DATABASE=panel_test
+TESTING_DB_USERNAME=panel_test
+TESTING_DB_PASSWORD=Test1234

.env.dusk

@@ -28,4 +28,4 @@ MAIL_FROM=no-reply@example.com
 
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard
-QUEUE_LOW=low
+QUEUE_LOW=low

.env.example

@@ -7,15 +7,12 @@ storage/framework/*
 /.idea
 /nbproject
 
-package-lock.json
-composer.lock
 node_modules
-
-_ide_helper_models.php
+*.log
 _ide_helper.php
-
-sami.phar
-/.sami
+.phpstorm.meta.php
+.php_cs.cache
+public/assets/*
 
 # For local development with docker
 # Remove if we ever put the Dockerfile in the repo
@@ -32,3 +29,6 @@ coverage.xml
 
 # Vagrant
 *.log
+resources/lang/locales.js
+resources/assets/pterodactyl/scripts/helpers/ziggy.js
+resources/assets/scripts/helpers/ziggy.js

.gitignore

@@ -0,0 +1,57 @@
+# Local Development
+Pterodactyl is now powered by Vuejs and Tailwindcss and uses webpack at its core to generate compiled assets. Release
+versions of Pterodactyl will include pre-compiled, minified, and hashed assets ready-to-go.
+
+However, if you are interested in running custom themes or making modifications to the Vue files you'll need a build
+system in place to generate these compiled assets. To get your environment setup, you'll first need to install at least Nodejs
+`8`, and it is _highly_ recommended that you also install [Yarn](https://yarnpkg.com) to manage your `node_modules`.
+
+### Install Dependencies
+```bash
+yarn install
+```
+
+The command above will download all of the dependencies necessary to get Pterodactyl assets building. After that, its as
+simple as running the command below to generate assets while you're developing.
+
+```bash
+# build the compiled assets for development
+yarn run build
+
+# build the assets automatically when files are modified
+yarn run watch
+```
+
+
+### Hot Module Reloading
+For more advanced users, we also support 'Hot Module Reloading', allowing you to quickly see changes you're making
+to the Vue template files without having to reload the page you're on. To Get started with this, you just need
+to run the command below.
+
+```bash
+PUBLIC_PATH=http://192.168.1.1:8080 yarn run serve --host 192.168.1.1
+```
+
+There are two _very important_ parts of this command to take note of and change for your specific environment. The first
+is the `--host` flag, which is required and should point to the machine where the `webpack-serve` server will be running.
+The second is the `PUBLIC_PATH` environment variable which is the URL pointing to the HMR server and is appended to all of
+the asset URLs used in Pterodactyl.
+
+#### Vagrant
+If you want to use HMR with our Vagrant image, you can use `yarn run v:serve` as a shortcut for the correct parameters.
+In order to have proper file change detection you can use the [`vagrant-notify-forwarder`](https://github.com/mhallin/vagrant-notify-forwarder) to notify file events from the host to the VM.
+```sh
+vagrant plugin install vagrant-notify-forwarder
+vagrant reload
+```
+
+### Building for Production
+Once you have your files squared away and ready for the live server, you'll be needing to generate compiled, minified, and
+hashed assets to push live. To do so, run the command below:
+
+```bash
+yarn run build:production
+```
+
+This will generate a production ready `bundle.js` and `bundle.css` as well as a `manifest.json` and store them in
+the `/public/assets` directory where they can then be access by clients, and read by the Panel.

BUILDING.md

@@ -239,7 +239,7 @@ the response from the server `GET` endpoint.
 * Nest and Egg listings now show the associated ID in order to make API requests easier.
 * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.
 * Creating a new node will now requires a SSL connection if the Panel is configured to use SSL as well.
-* Socketio error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
+* Connector error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
 * File manager now supports mass deletion option for files and folders.
 * Support for CS:GO as a default service option selection.
 * Support for GMOD as a default service option selection.
@@ -369,7 +369,7 @@ the response from the server `GET` endpoint.
 * Changed 2FA login process to be more secure. Previously authentication checking happened on the 2FA post page, now it happens prior and is passed along to the 2FA page to avoid storing any credentials.
 
 ### Added
-* Socketio error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
+* Connector error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
 
 ## v0.7.0-beta.1 (Derelict Dermodactylus)
 ### Added

CHANGELOG.md

@@ -0,0 +1,15 @@
+<?php
+
+namespace Pterodactyl\Contracts\Http;
+
+interface ClientPermissionsRequest
+{
+    /**
+     * Returns the permissions string indicating which permission should be used to
+     * validate that the authenticated user has permission to perform this action aganist
+     * the given resource (server).
+     *
+     * @return string
+     */
+    public function permission(): string;
+}

app/Contracts/Http/ClientPermissionsRequest.php

@@ -13,7 +13,7 @@ interface FileRepositoryInterface extends BaseRepositoryInterface
      * @param string $path
      * @return \stdClass
      *
-     * @throws \GuzzleHttp\Exception\RequestException
+     * @throws \GuzzleHttp\Exception\TransferException
      */
     public function getFileStat(string $path): stdClass;
 
@@ -23,7 +23,7 @@ public function getFileStat(string $path): stdClass;
      * @param string $path
      * @return string
      *
-     * @throws \GuzzleHttp\Exception\RequestException
+     * @throws \GuzzleHttp\Exception\TransferException
      */
     public function getContent(string $path): string;
 
@@ -34,7 +34,7 @@ public function getContent(string $path): string;
      * @param string $content
      * @return \Psr\Http\Message\ResponseInterface
      *
-     * @throws \GuzzleHttp\Exception\RequestException
+     * @throws \GuzzleHttp\Exception\TransferException
      */
     public function putContent(string $path, string $content): ResponseInterface;
 
@@ -44,7 +44,7 @@ public function putContent(string $path, string $content): ResponseInterface;
      * @param string $path
      * @return array
      *
-     * @throws \GuzzleHttp\Exception\RequestException
+     * @throws \GuzzleHttp\Exception\TransferException
      */
     public function getDirectory(string $path): array;
 }

app/Contracts/Repository/Daemon/FileRepositoryInterface.php

@@ -268,7 +268,7 @@ public static function isReportable(Exception $exception): bool
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
+            return response()->json(self::convertToArray($exception), 401);
         }
 
         return redirect()->guest(route('auth.login'));