Commit graph

273 commits

Author SHA1 Message Date
Matthew Penner
00d1b5861a Properly setup Mount model, add database migration, get mount admin page added 2020-05-20 18:07:56 -06:00
Matthew Penner
59a150148a feature/server-mounts initial commit 2020-05-20 17:29:03 -06:00
Charles Morgan
46285fefd7
CSS Changes
More CSS Changes....

Server overview page now looks more..... fluid
Boxes have their correct color top colors back, When admin side was changed to dark theme all by the yellow was changed to a single color, this is reverted.
Node overview page uses blue over gray box for total servers.
Lightened the text color on the side bar
Removed delete button for allocations that are assigned.
Changes Node configuration box to not hurt eyes
2020-05-10 18:09:01 -04:00
Dane Everitt
86dbb141f4
Make this helper text more correct 2020-05-09 15:45:38 -07:00
Dane Everitt
3b2e2c63c6
Only show relevant configuration; update default path to be what the daemon expects 2020-05-09 15:44:13 -07:00
Dane Everitt
2d95204e9a
Pass a value for skipping scripts correctly; closes #1991 2020-05-07 20:46:49 -07:00
Dane Everitt
c6d8bed095
close #1801 2020-05-07 20:20:20 -07:00
Dane Everitt
f1c3762f4d
Add base support for definining the number of backups that can be created for a server 2020-04-26 12:12:29 -07:00
Dane Everitt
72ecac5236
Merge pull request #1963 from Sir3lit/maxconn
Add Max Concurrent Connections for database users
2020-04-25 11:01:01 -07:00
Dane Everitt
0385d2a05c
Merge pull request #1939 from Sir3lit/optionaldesc
Allow description fields to be optional
2020-04-23 20:37:02 -07:00
Dane Everitt
0ccfdd722c
Merge pull request #1924 from Sir3lit/adminchanges
Update Admin Overview for server
2020-04-23 20:36:43 -07:00
Charles Morgan
82dd7dc8e3 Allow Null = 0
Allow Value to be nullable, will autofill 0 if value is null or 0, to facilitate "unlimited" connections.
2020-04-23 10:45:44 -04:00
AreYouScared
f0e4764a11 Add Max Concurrent Connections for database users
Closes #1849

Allows database users to be limited to a number of concurrent connections to prevent one user from connecting hundreds of time and bottlenecking the MySQL server.
2020-04-22 06:00:04 -04:00
AreYouScared
c54cbe6638 Update Admin CSS / Few css fixes
Changed `code` color to be a little lighter, more contrast / easier to read (From #999 to #c3c3c3)
Added Readonly style, was white box with grey letters. Changes to Dark grey box and white letters.
Changed cursor for disabled / read-only to `not-allowed` instead of `text`
Closes #1918 -> Dropdown text was grey with a grey background.
Added Green and Yellow Text colors
Added Text-Danger
Changed Link color, to be a tad lighter
Added well/well-sm/well-lg to pterodactyl.css
Changed well to match the dark theme.
Hovering over Start / Restart show respective colors Green / Blue
2020-04-19 08:30:52 -04:00
AreYouScared
21491e3aaa Allow descrition field to be optional
Allows for Nest, Node, Location and Egg description fields to be blank / nullable.
Removed "required" wording next to them aswell
2020-04-17 20:52:40 -04:00
AreYouScared
0cad2b9362 Update Admin Overview for server
Changes CPU Threads show Not Set instead of n/a
Changes 0% -> Unlimited, when cpu is set to 0(unlimited)
Changes 0MB -> Unlimited, when memory is set to 0(unlimited)
Changes 0MB Swap -> Not Set
Changes -1 Swap -> Unlimited
Changes Name -> Server Name
Changes Service -> Current Egg
2020-04-13 18:11:45 -04:00
Dane Everitt
fda88940f7
Fix up node autodeployment 2020-04-12 17:20:09 -07:00
Dane Everitt
07381da8fb
This warning is no longer true 2020-04-12 16:02:09 -07:00
Matthew Penner
a7dab69711 Persist service variables 2020-04-11 14:46:30 -06:00
Matthew Penner
dec6868a55 Persist nest_id, egg_id, pack_id 2020-04-11 14:14:05 -06:00
Matthew Penner
b5e50719ac Remove old Theme::js calls in blade layouts. Persist checkboxes, Server Owner, Node, Default Allocation, and Additional Allocations on servers/new.blade.php 2020-04-11 13:56:03 -06:00
Dane Everitt
7557dddf49
Store node daemon tokens in an encrypted manner 2020-04-10 15:15:38 -07:00
AreYouScared
7daf6e2e93 Uniformity is Key
Updated logical order to match new server page on build and overview page.
2020-04-10 00:54:40 -04:00
AreYouScared
411ed41582 New server formatting
Fixed auto-sizing for resource mangemnet
Moved them in logical order(CPU->RAM->Disk) with advanced stuff to the right.
2020-04-09 23:46:12 -04:00
Matthew Penner
fd4de9168a
Merge branch 'develop' into feature/server-transfers-actually 2020-04-04 16:28:02 -06:00
Matthew Penner
6ba6c34252 Add ServerTransfer relation in Models/Server.php, notify the new daemon about the incoming server transfer 2020-04-04 14:10:18 -06:00
Dane Everitt
9d0262e7a1
Update index.blade.php 2020-04-03 22:53:49 -07:00
Matthew Penner
a2eab3ca43 Add ui elements for handling server transfers, add TransferJob.php and TransferService.php 2020-04-03 21:45:37 -06:00
Matthew Penner
829f05a2c7 Add migration for 'threads' column, fix errors on some admin pages, add validation rule for 'threads' column 2020-04-03 18:50:07 -06:00
Dane Everitt
86de7372a8
Add notes about IO/CPU Threads 2020-04-03 14:43:15 -07:00
Dane Everitt
78d6e59fc5
Merge branch 'develop' into cputhreads 2020-04-03 13:48:06 -07:00
AreYouScared
dfefd8845b
Fixed textboxes (#1886)
Text boxes on the user view page were set to readonly not allowing admins to change user values

Co-Authored-By: Lance Pioch <me@lance.sh>
2020-04-03 13:46:24 -07:00
AreYouScared
2561e3e8d5 Add CPU Thread assignments
Added CPU Thread assignments for each server
2020-03-29 14:41:55 -04:00
Dane Everitt
51defae917
Merge branch 'master' into develop 2019-12-28 11:49:08 -08:00
Dane Everitt
6276a03a4e
Fix links in admin area 2019-12-22 14:03:49 -08:00
Dane Everitt
52ea0f2d0a
Fix allocation management 2019-12-22 13:55:58 -08:00
Dane Everitt
bc3286c7e4
Don't need this box anymore 2019-12-22 13:50:35 -08:00
Dane Everitt
d75073116f
Health check 2019-12-16 21:42:58 -08:00
Dane Everitt
7405d7c8ee
Fix routing to server pages 2019-12-16 21:27:01 -08:00
Dane Everitt
a247310372
Fix nav for servers 2019-12-16 21:14:27 -08:00
Dane Everitt
447c4291ad
Update all places in the code referencing named routes using JS that doesn't exist now 2019-12-15 18:19:35 -08:00
Dane Everitt
564d947f7e
[#3c9g25] Add support for new endpoint to collect node information 2019-12-09 21:05:39 -08:00
Dane Everitt
979bdc1f9f
Use YAML for configuration file 2019-12-08 11:29:46 -08:00
Dane Everitt
c087f6429f
Temporary patch to get user management pages displaying correctly 2019-12-08 11:02:59 -08:00
Dane Everitt
c17f9ba8a9
Move server view management parts to new controller and clean up code 2019-11-24 12:50:16 -08:00
Dane Everitt
c97461d602
[L6] Move all of the template files into the new correct location 2019-09-04 21:19:52 -07:00
Dane Everitt
955d89c0c6
Move everything over to pterodactyl theme 2017-03-16 19:48:24 -04:00
Dane Everitt
1c47b2ed55
Finish pack management in Admin CP 2017-03-15 20:52:37 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages 2017-03-14 21:18:36 -04:00
Dane Everitt
37a723aa58
Remove old views no longer in use. 2017-03-12 16:29:04 -04:00
Dane Everitt
d7682bb7c9
Complete new service, option, and variable management interface in Admin CP 2017-03-12 00:00:06 -05:00
Dane Everitt
9a14cb5687
Remove old views 2017-03-03 23:40:33 -05:00
Dane Everitt
e9762b4277
Fixes port deletion for node allocations as well as server notes on allocations.
closes #305
2017-02-17 19:59:40 -05:00
Dane Everitt
d4e1bc6cc0
Discord link via CDN now. 2017-02-16 15:01:26 -05:00
Dane Everitt
19d352619e
More singularization and correct file names. 2017-02-12 16:03:17 -05:00
Dane Everitt
8ba479e51f
Singularize model names. 2017-02-12 16:02:23 -05:00
Dane Everitt
32a1dc17ed
API model updates, as well as general model updates and code fixes. 2017-02-10 20:26:38 -05:00
Dane Everitt
ba175e6b55
Cleanup location model and controller for Admin. 2017-02-10 17:09:56 -05:00
Dane Everitt
0720bfe62f
Cleanup database query code. 2017-02-10 17:03:58 -05:00
Dane Everitt
4f61637284
More model updates to more places than I anticipated.
This probably broke a lot of things.
2017-02-09 17:43:54 -05:00
Dane Everitt
323f1d943f
Completed model updates for Services 2017-02-05 17:58:17 -05:00
Dane Everitt
09d23deed6
New models for node and location admin pages. 2017-02-03 16:50:28 -05:00
Dane Everitt
96d3aa767f
Model updates for Database Management in ACP 2017-02-03 15:19:14 -05:00
Dane Everitt
d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Dane Everitt
9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Dane Everitt
95d0c646f9
Require packs to be a tarball 2017-01-25 18:25:34 -05:00
Dane Everitt
95730da419
Fix pack edit display 2017-01-25 18:25:34 -05:00
Dane Everitt
bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Emmet Young
9c87e03c0c Repair the admin side add user functionality. 2017-01-23 13:24:14 +11:00
Emmet Young
7bd1fbb14c Fix up the configuration token, app.url should already have the protocol included with it. Appending a new one messes it up 2017-01-23 11:02:10 +11:00
Dane Everitt
1a6532d369 Correct link to new Discord channel invite 2017-01-16 16:36:48 -05:00
Dane Everitt
16a3514abf
Cleanup auto-configure stuff 2017-01-14 19:36:47 -05:00
Dane Everitt
e91362eee6
Update user controller 2017-01-12 15:40:24 -05:00
Dane Everitt
8323477d0c
Better display of configuration button for services 2017-01-12 13:38:59 -05:00
Dane Everitt
6bd9663f59
Merge branch 'develop' into feature/service-changes 2017-01-12 13:15:37 -05:00
Jakob Schrettenbrunner
9f2ca17ea4 replace manual json headers with laravel response()->json()
better Carbon dependency
rename admin.nodes.configuration-token route
style fixes
2017-01-08 15:21:02 +01:00
Jakob Schrettenbrunner
67bb8fe230 add protocol to the generated node configuration command 2017-01-07 22:16:23 +01:00
Jakob Schrettenbrunner
cc0d54e906 improve wording on token explanation on node configuration tab 2017-01-07 18:33:37 +01:00
Jakob Schrettenbrunner
a1568e5acb add button to generate token to node configuration tab
add info message after node creation about token generation
2017-01-07 18:27:19 +01:00
Jakob Schrettenbrunner
24bab6de17 use getConfigurationAsJson in the admin/nodes/view view 2017-01-07 18:09:04 +01:00
Dane Everitt
9231171fa9
Update link to docker reference for BlockIO 2016-12-30 15:46:26 -05:00
Dane Everitt
9a494d8245
Adjust server name requirements, closes #205 2016-12-30 15:46:10 -05:00
Dane Everitt
fc38b09e1f
Merge branch 'develop' into feature/service-changes 2016-12-14 16:53:53 -05:00
spaceemotion
a85ac87ae8 Refactor to use more laravel logic and improve compatibility with older PHP versions (#206)
* Fix @param namespaces for PHPDocs in ServerPolicy

* Reduce permission check duplication in ServerPolicy

This introduces a new checkPermission method to reduce code duplication when checking for permissions.

* Simplify logic to list accessible servers for the user

We can directly use the pluck function that laravel collections provide to simplify the logic.

* Fix pagination issue when databases/servers exceed 20

Laravels strips out the currently selected tab (or any GET query for that matter) by default when using pagination. the appends() methods helps with keeping that information.

* Refactor unnecessary array_merge calls

We can just append to the array instead of constantly merging a new copy.

* Fix accessing “API Access” on some versions of PHP

The “new” word is reserved and should not be used as a method name.

http://stackoverflow.com/questions/9575590/why-am-i-getting-an-unexpected-t-new-error-in-php

* Fix revoking API keys on older versions of php (5.6)

“string” was not a valid function argument type yet, so revoking keys results in an error on older installations.

* Fix issues with API due to methods named “list”

“list” is yet another reserved keyword in PHP and messes up older installations of PHP (5.6).
This renames all methods named “list” to “lists”. The API route names are left untouched (e.g. still called “api.admin.users.list”).

* Refactor and shorten some API logic

Used laravel collection methods where applicable to directly transform the values instead of converting back and forth.
This also removes some dead variables that were never used as well as getting rid of a n+1 problem in the Service API (loading service variables afterwards, not during the model creation).

* Return model save status in repositories where applicable

* Fix typo in ServicePolicy#powerStart

* Apply StyleCI corrections
2016-12-12 14:30:57 -05:00
Dane Everitt
9ae716ee42
show container ID for server in panel
Also shows the UID of the user to ease permissions setting

closes #160
2016-12-02 19:35:08 -05:00
Dane Everitt
2ac734d595
Update node config sent over API 2016-12-02 19:12:29 -05:00
Dane Everitt
e39c750563
Remove link that shouldn't exist in the first place. 2016-12-02 18:47:22 -05:00
Dane Everitt
259b220dfc
misc file cleanup 2016-12-02 18:45:08 -05:00
Dane Everitt
3cd0a8337f
Add ability to filter user list 2016-12-02 18:41:52 -05:00
Dane Everitt
1eb1f96e71
Add support for updating the daemon's configuration file automatically. 2016-12-01 18:33:32 -05:00
Dane Everitt
72ad6d5c87
Show file upload size limit when uploading files
Also handle errors better.
2016-12-01 18:32:05 -05:00
Dane Everitt
a2d2069d8c
Merge branch 'develop' into feature/service-changes 2016-11-28 14:02:09 -05:00
Dane Everitt
b4bcc7247f
Add some things to node config block that will be useful to some 2016-11-28 13:55:02 -05:00
Dane Everitt
3549abd5ae
Fix error page when no nodes exist. 2016-11-28 13:51:18 -05:00
Dane Everitt
5c20d0a748
Fix daemon version displaying panel version; closes #184 2016-11-28 13:41:26 -05:00
Dane Everitt
2b16472cd2
Fix data multiplicator on wrong field. 2016-11-28 13:37:36 -05:00
Dane Everitt
75de060a55
Fix pack selector 2016-11-27 14:57:23 -05:00
Dane Everitt
c4a4b84bd3
Add service pack reference to server and send to daemon 2016-11-27 14:50:10 -05:00
Dane Everitt
238f08f222
Add pack selection to view 2016-11-27 14:30:44 -05:00
Dane Everitt
9eb14614c2
Merge branch 'develop' into feature/service-changes 2016-11-27 14:01:13 -05:00