diff --git a/app/Transformers/Api/Client/ServerTransformer.php b/app/Transformers/Api/Client/ServerTransformer.php index c44630b5c..64282686a 100644 --- a/app/Transformers/Api/Client/ServerTransformer.php +++ b/app/Transformers/Api/Client/ServerTransformer.php @@ -28,6 +28,7 @@ class ServerTransformer extends BaseClientTransformer 'identifier' => $server->uuidShort, 'uuid' => $server->uuid, 'name' => $server->name, + 'node' => $server->node->name, 'description' => $server->description, 'allocation' => [ 'ip' => $server->allocation->alias, diff --git a/composer.json b/composer.json index d2ac885f0..d922ebad4 100644 --- a/composer.json +++ b/composer.json @@ -26,6 +26,7 @@ "laracasts/utilities": "^3.0", "laravel/framework": "5.6.*", "laravel/tinker": "^1.0", + "lcobucci/jwt": "^3.2", "lord/laroute": "^2.4", "matriphe/iso-639": "^1.2", "nesbot/carbon": "^1.22", diff --git a/composer.lock b/composer.lock index bbb170e99..80cf8495e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "9232ff40da15c9430731254edc662eb7", + "content-hash": "f84af54d009a128472ca7e19a50fccf8", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -1569,6 +1569,64 @@ ], "time": "2018-05-17T13:42:07+00:00" }, + { + "name": "lcobucci/jwt", + "version": "3.2.2", + "source": { + "type": "git", + "url": "https://github.com/lcobucci/jwt.git", + "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0b5930be73582369e10c4d4bb7a12bac927a203c", + "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": ">=5.5" + }, + "require-dev": { + "mdanter/ecc": "~0.3.1", + "mikey179/vfsstream": "~1.5", + "phpmd/phpmd": "~2.2", + "phpunit/php-invoker": "~1.1", + "phpunit/phpunit": "~4.5", + "squizlabs/php_codesniffer": "~2.3" + }, + "suggest": { + "mdanter/ecc": "Required to use Elliptic Curves based algorithms." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Lcobucci\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Luís Otávio Cobucci Oblonczyk", + "email": "lcobucci@gmail.com", + "role": "developer" + } + ], + "description": "A simple library to work with JSON Web Token and JSON Web Signature", + "keywords": [ + "JWS", + "jwt" + ], + "time": "2017-09-01T08:23:26+00:00" + }, { "name": "league/flysystem", "version": "1.0.45", diff --git a/package.json b/package.json index a790e437f..29711e168 100644 --- a/package.json +++ b/package.json @@ -24,16 +24,19 @@ "gulp-rev": "^8.1.1", "gulp-uglify-es": "^1.0.1", "jquery": "^3.3.1", + "jwt-decode": "^2.2.0", "lodash": "^4.17.5", "postcss": "^6.0.21", "postcss-import": "^11.1.0", "postcss-preset-env": "^3.4.0", "postcss-scss": "^1.0.4", "tailwindcss": "^0.5.1", + "vee-validate": "^2.0.9", "vue": "^2.5.7", "vue-axios": "^2.1.1", "vue-devtools": "^3.1.9", "vue-loader": "^14.2.2", + "vue-mc": "^0.2.4", "vue-router": "^3.0.1", "vue-template-compiler": "^2.5.16", "vueify-insert-css": "^1.0.0", diff --git a/resources/assets/scripts/components/dashboard/Dashboard.vue b/resources/assets/scripts/components/dashboard/Dashboard.vue index 5ee5199ce..97188f8ee 100644 --- a/resources/assets/scripts/components/dashboard/Dashboard.vue +++ b/resources/assets/scripts/components/dashboard/Dashboard.vue @@ -8,7 +8,7 @@ /> -
+
@@ -38,7 +38,7 @@
-

{{ server.node_name }}

+

{{ server.node }}

{{ server.allocation.ip }}:{{ server.allocation.port }}

@@ -49,7 +49,7 @@