diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d4d6b613..f2ee47a5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. * Basic service pack implementation to allow assignment of modpacks or software to a server to pre-install applications and allow users to update. * Users can now have a username as well as client name assigned to their account. * Ability to create a node through the CLI using `pterodactyl:node` as well as locations via `pterodactyl:location`. +* New theme (AdminLTE) for front-end with tweaks to backend files to work properly with it. ### Fixed * Bug causing error logs to be spammed if someone timed out on an ajax based page. diff --git a/README.md b/README.md index 88c02a171..a26d41468 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ A huge thanks to [PhraseApp](https://phraseapp.com) who provide us the software Ace Editor - [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) - [homepage](https://ace.c9.io) +AdminLTE - [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) - [homepage](https://almsaeedstudio.com) + Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/) Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/) @@ -57,8 +59,12 @@ jQuery Terminal - [license](https://github.com/jcubic/jquery.terminal/blob/maste Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/) +Select2 - [license](https://github.com/select2/select2/blob/master/LICENSE.md) - [homepage](https://select2.github.io) + Socket.io - [license](https://github.com/socketio/socket.io/blob/master/LICENSE) - [homepage](http://socket.io) +Socket.io File Upload - [license](https://github.com/vote539/socketio-file-upload/blob/master/server.js#L1-L27) - [homepage](https://github.com/vote539/socketio-file-upload) + SweetAlert - [license](https://github.com/t4t5/sweetalert/blob/master/LICENSE) - [homepage](http://t4t5.github.io/sweetalert/) Typeahead — [license](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js) — [homepage](https://github.com/bassjobsen/Bootstrap-3-Typeahead) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php deleted file mode 100644 index 9ab5cdbf0..000000000 --- a/resources/views/auth/login.blade.php +++ /dev/null @@ -1,148 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} -{{-- Some Modifications (c) 2015 Dylan Seidt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Login') - - -@section('right-nav') -@endsection - -@section('sidebar') -@endsection - -@section('resp-alerts') -@endsection - -@section('resp-errors') -@endsection - -@section('content') -
- @if (count($errors) > 0) -
- - {{ trans('strings.whoops') }}! {{ trans('auth.errorencountered') }}

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - @foreach (Alert::getMessages() as $type => $messages) - @foreach ($messages as $message) - - @endforeach - @endforeach -
- {{ trans('strings.login') }} -
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
-
- {!! csrf_field() !!} - - -
-
-
-
-
- -
- -@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php deleted file mode 100644 index 064373a53..000000000 --- a/resources/views/auth/passwords/email.blade.php +++ /dev/null @@ -1,63 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} -{{-- Some Modifications (c) 2015 Dylan Seidt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Reset Password') - - -@section('right-nav') -@endsection - -@section('sidebar') -@endsection - -@section('content') -
-
- {{ trans('auth.resetpassword') }} -
- @if (session('status')) -
- {{ trans('strings.success') }}! {{ trans('auth.emailsent') }} -
- @endif -
- -
- - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
-
-
- {!! csrf_field() !!} - -
-
-
-
-
-
-@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php deleted file mode 100644 index 5151ce7a2..000000000 --- a/resources/views/auth/passwords/reset.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} -{{-- Some Modifications (c) 2015 Dylan Seidt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Reset Password') - - -@section('right-nav') -@endsection - -@section('sidebar') -@endsection - -@section('content') -
-
- {{ trans('auth.resetpassword') }} -
- -
- -
- - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
-
- -
- - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -

{{ trans('base.password_req') }}

-
-
-
- -
- - @if ($errors->has('password_confirmation')) - - {{ $errors->first('password_confirmation') }} - - @endif -
-
-
-
- {!! csrf_field() !!} - -
-
-
-
-
-
-@endsection diff --git a/resources/views/base/account.blade.php b/resources/views/base/account.blade.php deleted file mode 100644 index 629d5885b..000000000 --- a/resources/views/base/account.blade.php +++ /dev/null @@ -1,90 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Your Account') - -@section('sidebar-server') -@endsection - -@section('content') -
-
-
-

{{ trans('base.account.update_pass') }}

-
-
- -
- -
-
-
- -
- -

{{ trans('base.password_req') }}

-
-
-
- -
- -
-
-
-
- {!! csrf_field() !!} - -
-
-
-
-
-

{{ trans('base.account.update_email') }}

-
-
- -
- -
-
-
- -
- -
-
-
-
- {!! csrf_field() !!} - -
-
-
-
-
-
- -@endsection diff --git a/resources/views/base/api/index.blade.php b/resources/views/base/api/index.blade.php deleted file mode 100644 index 0fcc69a79..000000000 --- a/resources/views/base/api/index.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'API Access') - -@section('sidebar-server') -@endsection - -@section('scripts') - @parent - {!! Theme::css('css/vendor/sweetalert/sweetalert.min.css') !!} - {!! Theme::js('js/vendor/sweetalert/sweetalert.min.js') !!} -@endsection - -@section('content') -
- - - - - - - - - - - - @foreach ($keys as $key) - - - - - - - - @endforeach - -
Public KeyMemoCreatedExpires
{{ $key->public }}{{ $key->memo }}{{ (new Carbon($key->created_at))->toDayDateTimeString() }} - @if(is_null($key->expires_at)) - Never - @else - {{ (new Carbon($key->expires_at))->toDayDateTimeString() }} - @endif -
-
- -
-
- -@endsection diff --git a/resources/views/base/api/new.blade.php b/resources/views/base/api/new.blade.php deleted file mode 100644 index 0fb75caac..000000000 --- a/resources/views/base/api/new.blade.php +++ /dev/null @@ -1,278 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'API Access') - -@section('sidebar-server') -@endsection - -@section('content') -
-
-
-
    -
  • - 1Permissions - -
    • - @if(Auth::user()->root_admin === 1) -
  • - 2Admin - -
    • - @endif -
  • - @if(Auth::user()->root_admin === 1)3 @else 2 @endifSecurity - -
    • -
-
-
- - -
-
-
-
-
Any servers that you are a subuser for will be accessible through this API with the same permissions that you currently have.
-
-
-

Base Information

-
-
-
-
-
-
-

Server Management

-
-
-
-
-
-
-
- @if(Auth::user()->root_admin === 1) -
-
-
-
-
-
-
-
-
-

User Management

-
-
-
-
-
-
-
-
-
-
-
-
-

Server Management

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Node Management

-
-
-
-
-
-
-
-
-
-
-
-
-

Service Management

-
-
-
-
-

Location Management

-
-
-
-
-
- @endif -
-
- -
- -

Enter a breif description of what this API key will be used for.

-
-
-
- -
- -

Enter a line delimitated list of IPs that are allowed to access the API using this key. CIDR notation is allowed. Leave blank to allow any IP.

-
-
-
-
- {!! csrf_field() !!} -
-
-
- -@endsection diff --git a/resources/views/base/index.blade.php b/resources/views/base/index.blade.php deleted file mode 100644 index 00472d98d..000000000 --- a/resources/views/base/index.blade.php +++ /dev/null @@ -1,124 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Your Servers') - -@section('sidebar-server') -@endsection - -@section('content') -
- @if (Auth::user()->root_admin == 1) -
{{ trans('base.view_as_admin') }}
- @endif - @if (!$servers->isEmpty()) - - - - @if (Auth::user()->root_admin == 1) - - @endif - - - - - - - - - - @foreach ($servers as $server) - - @if (Auth::user()->root_admin == 1) - - @endif - - - - - - - - @endforeach - -
{{ trans('base.server_name') }}{{ trans('strings.node') }}{{ trans('strings.connection') }}{{ trans('strings.status') }}
- @if ($server->owner === Auth::user()->id) - - @else - - @endif - {{ $server->name }}{{ $server->nodeName }}@if(!is_null($server->ip_alias)){{ $server->ip_alias }}@else{{ $server->ip }}@endif:{{ $server->port }}@if($server->suspended === 1)Suspended@else--@endif
-
-
{!! $servers->render() !!}
-
- @else -
{{ trans('base.no_servers') }}
- @endif -
- -@endsection diff --git a/resources/views/base/security.blade.php b/resources/views/base/security.blade.php deleted file mode 100644 index 48b730555..000000000 --- a/resources/views/base/security.blade.php +++ /dev/null @@ -1,205 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title', 'Account Security') - -@section('sidebar-server') -@endsection - -@section('content') -
- @foreach (Alert::getMessages() as $type => $messages) - @foreach ($messages as $message) - - @endforeach - @endforeach -

Active Sessions

- - - - - - - - - - - - @foreach($sessions as $session) - - payload)) ?> - - - - - - - @endforeach - -
Session IDIP AddressUser AgentLast Activity
{{ substr($session->id, 0, 8) }}{{ $session->ip_address }}{{ $session->user_agent }} - @if((time() - $session->last_activity < 10)) - just now - @else - {{ date('D, M j \a\t H:i:s', $session->last_activity) }} - @endif -
- -

{{ trans('base.account.totp_header') }} @if (Auth::user()->use_totp === 1){{ trans('strings.enabled') }}@else{{ trans('strings.disabled') }}@endif

- @if (Auth::user()->use_totp === 1) -
-
{{ trans('base.account.totp_disable') }}
-
-

{{ trans('base.account.totp_disable_help') }}

-
-
-
-
- {{ trans('base.account.totp_token') }} - - - {!! csrf_field() !!} - {{ method_field('DELETE') }} - - -
-
-
-
-
- @else -
-
-

{{ trans('base.account.totp_header') }}

-
-
-

{{ trans('base.account.totp_enable_help') }}

-
{{ trans('base.account.totp_apps') }}
-
-
-
-
-
- {!! csrf_field() !!} - -
-
-
- @endif - - -
- -@endsection diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php deleted file mode 100644 index 1f6feb8e0..000000000 --- a/resources/views/layouts/master.blade.php +++ /dev/null @@ -1,313 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} - - - - @section('scripts') - - - - {!! Theme::css('css/vendor/bootstrap/bootstrap.css') !!} - {!! Theme::css('css/pterodactyl.css') !!} - {!! Theme::css('css/animate.css') !!} - {!! Theme::css('css/vendor/fontawesome/font-awesome.min.css') !!} - {!! Theme::css('css/vendor/sweetalert/sweetalert.min.css') !!} - {!! Theme::css('css/vendor/fuelux/fuelux.min.css') !!} - {!! Theme::js('js/vendor/jquery/jquery.min.js') !!} - {!! Theme::js('js/vendor/bootstrap/bootstrap.min.js') !!} - {!! Theme::js('js/vendor/socketio/socket.io.min.js') !!} - {!! Theme::js('js/vendor/sweetalert/sweetalert.min.js') !!} - {!! Theme::js('js/vendor/fuelux/fuelux.min.js') !!} - {!! Theme::js('js/admin.min.js') !!} - {!! Theme::js('js/bootstrap-notify.min.js') !!} - - @section('server-socket') - @if (isset($server->name) && isset($node->name)) - - @endif - @show - @show - {{ Settings::get('company') }} - @yield('title') - - -
-
-
- - {{ Settings::get('company', 'Pterodactyl Panel') }} -
-
- @section('server-name') - @if (isset($server->name) && isset($node->name)) - - @endif - @show - @section('navbar-links') - - @show - @section('right-nav') - - @show -
-
-
- -
-
-
- @section('resp-errors') - @if (count($errors) > 0) -
- - {{ trans('strings.whoops') }}! {{ trans('auth.errorencountered') }}

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - @show - @section('resp-alerts') - @foreach (Alert::getMessages() as $type => $messages) - @foreach ($messages as $message) - - @endforeach - @endforeach - @show -
-
-
- @yield('content') -
-
-
-
-
-
- Copyright © 2015 - {{ date('Y') }} Pterodactyl Software & Design.
- Pterodactyl is licensed under a MIT license. -
-
-
-
- - - diff --git a/resources/views/server/files/add.blade.php b/resources/views/server/files/add.blade.php deleted file mode 100644 index ac3fdadea..000000000 --- a/resources/views/server/files/add.blade.php +++ /dev/null @@ -1,290 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Add File to: {{ $server->name }} -@endsection - -@section('scripts') - @parent - {!! Theme::js('js/vendor/upload/client.min.js') !!} - {!! Theme::js('js/vendor/lodash/lodash.js') !!} -@endsection - -@section('content') -
- -
-
-
-
-
- Save As: - -
-

All files are saved relative to /home/container. You can enter more of the path into the Save As field to save the file into a specific folder.

 -
-
-
-
-
-
-
-
-
-
-
- - -
-
- -
-
-
- @can('upload-files', $server) -
-
-
-
- Upload Directory: - -
-

All files are saved relative to /home/container. You can enter more of the path into the Save As field to save the file into a specific folder.

 -
-
- -
Edit the path location above before you upload files. They will automatically be placed in the directory you specify above. You can change this each time you upload a new file without having to press anything else. The directory must exist before performing an upload.
- - -
-
-

Drag and Drop File(s) Here

-

The maximum size for web-based file uploads is currently {{ $node->upload_size }} MB.

-
-
- -
- @endcan -
-
-{!! Theme::js('js/vendor/ace/ace.js') !!} -{!! Theme::js('js/vendor/ace/ext-modelist.js') !!} - -@endsection diff --git a/resources/views/server/files/edit.blade.php b/resources/views/server/files/edit.blade.php deleted file mode 100644 index ed6c38637..000000000 --- a/resources/views/server/files/edit.blade.php +++ /dev/null @@ -1,103 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Managing Files for: {{ $server->name }} -@endsection - -@section('content') -
-

Editing File: /home/container/{{ $file }}

-
-
-
{{ $contents }}
-
-
- @can('save-files', $server) -
-
-
- - - {{ trans('server.files.back') }} -
-
- @endcan -
-{!! Theme::js('js/vendor/ace/ace.js') !!} -{!! Theme::js('js/vendor/ace/ext-modelist.js') !!} - -@endsection diff --git a/resources/views/server/files/index.blade.php b/resources/views/server/files/index.blade.php deleted file mode 100644 index 987556b63..000000000 --- a/resources/views/server/files/index.blade.php +++ /dev/null @@ -1,190 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Managing Files for: {{ $server->name }} -@endsection - -@section('scripts') - @parent - {!! Theme::js('js/vendor/async/async.min.js') !!} - {!! Theme::js('js/vendor/lodash/lodash.js') !!} - {!! Theme::js('js/vendor/upload/client.min.js') !!} -@endsection - -@section('content') -
-
-
-
- {{ trans('server.files.loading') }} -
-
-
-
-
-
-
-
-
-
-
-
-
-

File Path Information

-
-
- When configuring any file paths in your server plugins or settings you should use /home/container as your base path. The maximum size for web-based file uploads is currently {{ $node->upload_size }} MB. -
-
-
-
-
-@if(App::environment('production')) - {!! Theme::js('js/filemanager.min.js') !!} -@else - {!! Theme::js('js/files/index.js') !!} - {!! Theme::js('js/files/contextmenu.js') !!} - {!! Theme::js('js/files/actions.js') !!} -@endif - -@endsection diff --git a/resources/views/server/files/list.blade.php b/resources/views/server/files/list.blade.php deleted file mode 100644 index ea56a580e..000000000 --- a/resources/views/server/files/list.blade.php +++ /dev/null @@ -1,160 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} - - - - - - - - - - - - - - - - @if (isset($directory['first']) && $directory['first'] === true) - - - - - - - - @endif - @if (isset($directory['show']) && $directory['show'] === true) - - - - - - - - @endif - @foreach ($folders as $folder) - - - - - - - - @endforeach - @foreach ($files as $file) - - - - - - - - @endforeach - -
File NameSizeLast Modified
- /home/container{{ $directory['header'] }} - - - - - -
←
- ← {{ $directory['link_show'] }} -
- {{ $folder['entry'] }} - {{ $folder['size'] }} - timezone(env('APP_TIMEZONE', 'America/New_York')); ?> - @if($carbon->diffInMinutes(Carbon::now()) > 60) - {{ $carbon->format('m/d/y H:i:s') }} - @elseif($carbon->diffInSeconds(Carbon::now()) < 5 || $carbon->isFuture()) - seconds ago - @else - {{ $carbon->diffForHumans() }} - @endif -
- {{-- oh boy --}} - @if(in_array($file['mime'], [ - 'application/x-7z-compressed', - 'application/zip', - 'application/x-compressed-zip', - 'application/x-tar', - 'application/x-gzip', - 'application/x-bzip', - 'application/x-bzip2', - 'application/java-archive' - ])) - - @elseif(in_array($file['mime'], [ - 'application/json', - 'application/javascript', - 'application/xml', - 'application/xhtml+xml', - 'text/xml', - 'text/css', - 'text/html', - 'text/x-perl', - 'text/x-shellscript' - ])) - - @elseif(starts_with($file['mime'], 'image')) - - @elseif(starts_with($file['mime'], 'video')) - - @elseif(starts_with($file['mime'], 'video')) - - @elseif(starts_with($file['mime'], 'application/vnd.ms-powerpoint')) - - @elseif(in_array($file['mime'], [ - 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - 'application/msword' - ]) || starts_with($file['mime'], 'application/vnd.ms-word')) - - @elseif(in_array($file['mime'], [ - 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', - ]) || starts_with($file['mime'], 'application/vnd.ms-excel')) - - @elseif($file['mime'] === 'application/pdf') - - @else - - @endif - - @if(in_array($file['mime'], $editableMime)) - @can('edit-files', $server) - {{ $file['entry'] }} - @else - {{ $file['entry'] }} - @endcan - @else - {{ $file['entry'] }} - @endif - {{ $file['size'] }} - timezone(env('APP_TIMEZONE', 'America/New_York')); ?> - @if($carbon->diffInMinutes(Carbon::now()) > 60) - {{ $carbon->format('m/d/y H:i:s') }} - @elseif($carbon->diffInSeconds(Carbon::now()) < 5 || $carbon->isFuture()) - seconds ago - @else - {{ $carbon->diffForHumans() }} - @endif -
diff --git a/resources/views/server/index.blade.php b/resources/views/server/index.blade.php deleted file mode 100644 index 8da04161b..000000000 --- a/resources/views/server/index.blade.php +++ /dev/null @@ -1,522 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Viewing Server: {{ $server->name }} -@endsection - -@section('scripts') - @parent - {!! Theme::css('css/jquery.terminal.css') !!} - {!! Theme::js('js/jquery.mousewheel-min.js') !!} - {!! Theme::js('js/jquery.terminal-0.11.23.min.js') !!} - {!! Theme::js('js/unix_formatting.js') !!} - {!! Theme::js('js/vendor/chartjs/chart.min.js') !!} - {!! Theme::js('js/vendor/jquery/jquery-dateFormat.min.js') !!} -@endsection - -@section('content') -
- -
-
-
-
-
-
-
- - -
-
-
-
-
- @can('power-start', $server)@endcan - @can('power-restart', $server)@endcan - @can('power-stop', $server)@endcan - @can('power-kill', $server)@endcan - - -
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
- @can('view-allocation', $server) -
-
-
-
-
Below is a listing of all avaliable IPs and Ports for your service. To change the default connection address for your server, simply click on the one you would like to make default below.
- - - - - - - - @foreach ($allocations as $allocation) - - - - - - - @endforeach -
IP AddressAliasPort
- {{ $allocation->ip }} - ip_alias))class="muted"@endif> - @if(is_null($allocation->ip_alias)) - none - @else - {{ $allocation->ip_alias }} - @endif - {{ $allocation->port }} - @if($allocation->id === $server->allocation) - Primary - @else - Make Primary - @endif -
-
-
-
- @endcan -
-
- -@if($server->a_serviceFile === 'minecraft') - {!! Theme::js('js/plugins/minecraft/eula.js') !!} -@endif - -@endsection diff --git a/resources/views/server/settings.blade.php b/resources/views/server/settings.blade.php deleted file mode 100644 index 4acead9e8..000000000 --- a/resources/views/server/settings.blade.php +++ /dev/null @@ -1,246 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Server Settings -@endsection - -@section('content') -
-

Server Settings

- -
- @can('view-sftp', $server) -
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
-
- @can('reset-sftp', $server) -
- -
- - - {!! csrf_field() !!} - - -
-

Passwords must meet the following requirements: at least one uppercase character, one lowercase character, one digit, and be at least 8 characters in length. Click here to generate one to use.

-
- @endcan -
-
- @can('view-sftp-password', $server) - -
- -
- @endcan -
-
-
-
-
- @endcan - @can('view-startup', $server) -
-
-
-
-
-
-
- -
- {{ $service->executable }} - -
-
-
-
- @can('edit-startup', $server) -
-
-
- @foreach($variables as $item) -
- -
- user_editable === 1) - name="{{ $item->env_variable }}" - @else - readonly="readonly" - @endif - class="form-control" value="{{ old($item->env_variable, $item->a_serverValue) }}" data-action="matchRegex" data-regex="{{ $item->regex }}" /> -
-

{!! $item->description !!}

-
- @endforeach -
-
-
-
-
-
- {!! csrf_field() !!} - -
-
-
- @endcan -
-
-
- @endcan - @can('view-databases', $server) -
-
-
-
- @if(count($databases) > 0) - - - - - - - - - - - @foreach($databases as $database) - - - - - - - @endforeach - -
DatabaseUsernamePasswordDB Server
{{ $database->database }}{{ $database->username }}{{ Crypt::decrypt($database->password) }} @can('reset-db-password', $server)@endcan{{ $database->a_host }}:{{ $database->a_port }}
- @else -
- There are no databases configured for this server. - @if(Auth::user()->root_admin === 1) - Add a new database. - @endif -
- @endif -
-
-
- @endcan -
-
- -@endsection diff --git a/resources/views/server/tasks/index.blade.php b/resources/views/server/tasks/index.blade.php deleted file mode 100644 index 9c76dece8..000000000 --- a/resources/views/server/tasks/index.blade.php +++ /dev/null @@ -1,156 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Scheduled Tasks -@endsection - -@section('content') -
-

Manage Scheduled Tasks

- - - - - - - - @can('delete-task', $server)@endcan - @can('toggle-task', $server)@endcan - - - - @foreach($tasks as $task) - active === 0)class="text-disabled"@endif> - {{-- --}} - - - - - @can('delete-task', $server) - - @endcan - @can('toggle-task', $server) - - @endcan - - - @endforeach - -
ActionDataLast RunNext Run
{{ $actions[$task->action] }}{{ $actions[$task->action] }}{{ $task->data }}{{ Carbon::parse($task->last_run)->toDayDateTimeString() }}

({{ Carbon::parse($task->last_run)->diffForHumans() }})

 - @if($task->active !== 0) - {{ Carbon::parse($task->next_run)->toDayDateTimeString() }}

({{ Carbon::parse($task->next_run)->diffForHumans() }})

- @else - n/a - @endif -
- @can('create-task', $server) - - @endcan -
- -@endsection diff --git a/resources/views/server/tasks/new.blade.php b/resources/views/server/tasks/new.blade.php deleted file mode 100644 index 230a8399f..000000000 --- a/resources/views/server/tasks/new.blade.php +++ /dev/null @@ -1,172 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Scheduled Tasks -@endsection - -@section('content') -
-

Create Scheduled Task
Current System Time: {{ Carbon::now()->toDayDateTimeString() }}

-
-
You may use either the dropdown selection boxes or enter custom cron variables into the fields below.
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
-
- -
- -
-
-
- -
- -

For example, if you selected Send Command enter the command here. If you selected Send Power Option put the power action here (e.g. restart).

-
-
-
-
-
- {!! csrf_field() !!} - -
-
-
-
- -@endsection diff --git a/resources/views/server/tasks/view.blade.php b/resources/views/server/tasks/view.blade.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/resources/views/server/users/index.blade.php b/resources/views/server/users/index.blade.php deleted file mode 100644 index 96a1d40ff..000000000 --- a/resources/views/server/users/index.blade.php +++ /dev/null @@ -1,107 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Viewing Subusers -@endsection - -@section('content') -
-

Manage Sub-Users

- - - - - - @can('view-subuser', $server)@endcan - @can('delete-subuser', $server)@endcan - - - - @foreach($subusers as $user) - - - - @can('view-subuser', $server) - - @endcan - @can('delete-subuser', $server) - - @endcan - - @endforeach - -
EmailCreated
{{ $user->a_userEmail }}{{ $user->created_at }}
- @can('create-subuser', $server) -
-
-
- -
-
-
- @endcan -
- -@endsection diff --git a/resources/views/server/users/new.blade.php b/resources/views/server/users/new.blade.php deleted file mode 100644 index 1f1bca4e1..000000000 --- a/resources/views/server/users/new.blade.php +++ /dev/null @@ -1,301 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Create New Subuser -@endsection - -@section('content') -
-

Create New Subuser
- @can('edit-subuser', $server) -
- @endcan - -
-
-
- -
- -
-
-
-
-
-
-

Power Management

-
-
-
-
-
-
-
-
-
-
-
-
-

File Management

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Subuser Management

-
-
-
-
-
-
-
-
-
-
-
-
-

Server Management

-
-
-
-
-
-
-
-
-
-
-

Database Management

-
-
-
-
-
-
-

SFTP Management

-
-
-
-
-
-
-
-
-
-
-

Task Management

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @can('edit-subuser', $server) -
-
-
- {!! csrf_field() !!} - -
-
-
-
- @endcan -

- -@endsection diff --git a/resources/views/server/users/view.blade.php b/resources/views/server/users/view.blade.php deleted file mode 100644 index 9d76060b5..000000000 --- a/resources/views/server/users/view.blade.php +++ /dev/null @@ -1,290 +0,0 @@ -{{-- Copyright (c) 2015 - 2016 Dane Everitt --}} - -{{-- Permission is hereby granted, free of charge, to any person obtaining a copy --}} -{{-- of this software and associated documentation files (the "Software"), to deal --}} -{{-- in the Software without restriction, including without limitation the rights --}} -{{-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell --}} -{{-- copies of the Software, and to permit persons to whom the Software is --}} -{{-- furnished to do so, subject to the following conditions: --}} - -{{-- The above copyright notice and this permission notice shall be included in all --}} -{{-- copies or substantial portions of the Software. --}} - -{{-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --}} -{{-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --}} -{{-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --}} -{{-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --}} -{{-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --}} -{{-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --}} -{{-- SOFTWARE. --}} -@extends('layouts.master') - -@section('title') - Manage Subuser: {{ $subuser->a_userEmail }} -@endsection - -@section('content') -
-

Manage Subuser {{ $subuser->a_userEmail }}

- @can('edit-subuser', $server) -
- @endcan -
-
-

Power Management

-
-
-
-
-
-
-
-
-
-
-
-
-

File Management

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Subuser Management

-
-
-
-
-
-
-
-
-
-
-
-
-

Server Management

-
-
-
-
-
-
-
-
-
-
-

Database Management

-
-
-
-
-
-
-

SFTP Management

-
-
-
-
-
-
-
-
-
-
-

Task Management

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @can('edit-subuser', $server) -
-
-
- {!! csrf_field() !!} - -
-
-
-
- @endcan -
- -@endsection