StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add more front-end controllers, language file cleanup

Browse source
This commit is contained in:
Dane Everitt 2017-09-03 16:32:52 -05:00
parent 4532811fcd
commit 54554465f2
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
59 changed files with 1100 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Server/ConsoleController.php
View file

@ -26,12 +26,12 @@ namespace Pterodactyl\Http\Controllers\Server;
use Illuminate\Contracts\Session\Session;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Traits\Controllers\ServerToJavascript;
use Pterodactyl\Traits\Controllers\JavascriptInjection;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
class ConsoleController extends Controller
{
use ServerToJavascript;
use JavascriptInjection;
/**
* @var \Illuminate\Contracts\Config\Repository
@ -77,7 +77,7 @@ class ConsoleController extends Controller
],
]);
return view('server.index', ['server' => $server, 'node' => $server->node]);
return view('server.index');
}
/**
@ -87,13 +87,11 @@ class ConsoleController extends Controller
*/
public function console()
{
$server = $this->session->get('server_data.model');
$this->injectJavascript(['config' => [
'console_count' => $this->config->get('pterodactyl.console.count'),
'console_freq' => $this->config->get('pterodactyl.console.frequency'),
]]);
return view('server.console', ['server' => $server, 'node' => $server->node]);
return view('server.console');
}
}