Commit graph

358 commits

Author SHA1 Message Date
purple
1d07c3a0a9 Dashboard css is now copied to resources/scripts/css 2023-08-02 13:46:05 +02:00
purple
5b2e62431a Dashboard css wasn't working because of a typo. 2023-08-02 13:32:54 +02:00
purple
c316d091d0 Change the filename of custom extension css for both the admin and client panel. 2023-08-02 10:32:04 +02:00
purple
fa4f2d7677 Update fallback version to latest. 2023-07-31 17:45:56 +02:00
purple
661a07f879 -remove is no longer experimental 2023-07-31 12:51:35 +02:00
purple
31f0917e08 Create function for checking dependencies. 2023-07-31 11:14:32 +02:00
purple
9e2fdee9a9 Add confirmation for removing extensions. 2023-07-31 11:10:39 +02:00
purple
1ba0ce77bd Mute duplicate mkdir logs, silence unzip and quote conf.yml options.
Also -remove works now! The quoted variables are for added security. :)
2023-07-30 22:22:08 +02:00
purple
7a32ee9bab Fix "unmatched }" on admin routes. 2023-07-30 21:11:46 +02:00
purple
c87989d366 Routes wouldn't build correctly, this is now fixed. 2023-07-30 21:02:48 +02:00
purple
486dad1804 Add begin and end string to admin routes, improve extension removal. 2023-07-30 18:22:10 +02:00
purple
6f734f4cca Begin work on -remove command. 2023-07-30 13:28:03 +02:00
purple
0328d36cf1 Add ahwxorg to contributors and move dependency checking to -install and installation script.
Thank you ahwxorg for contributing to Blueprint!
2023-07-30 12:13:53 +02:00
Ahwxorg
6b5ce812f0
feat(blueprint.sh): add checks to see if dependencies are installed 2023-07-30 09:46:15 +02:00
purple
560c9a1fc0 Improve installation instructions and check for the correct NodeJS version. 2023-07-29 21:56:05 +02:00
purple
a1c6d39687 Update README.md and build panel upon installation.
Yarn is now required and Byte will be worked on later.
2023-07-29 12:29:18 +02:00
purple
d4089ac475 Import Byte into blueprint.sh
Byte is probably not going to be released this update, I'm sorry. I need to think about how to implement it in Blueprint, I have a lot of ideas, just don't know where to start.
2023-07-29 11:02:49 +02:00
purple
9cf0883299 Say hello to Byte, only remove placeholder files if needed and fix recovering blueprint.sh after failed upgrade. 2023-07-28 22:12:59 +02:00
purple
4d670f53be Rebuild panel on extension installation if required. 2023-07-28 18:57:04 +02:00
purple
0b8cfd9d77 Move client css to /resources/scripts 2023-07-28 18:24:22 +02:00
purple
84dee8772c Add dashboard_css. 2023-07-28 14:04:46 +02:00
purple
a939916ffc Copy paste extension placeholder image from .blueprint/assets instead of including all of them. 2023-07-27 11:49:15 +02:00
purple
c631da4ff9 Improve non-default folder installations. 2023-07-26 09:24:13 +02:00
purple
bb86229500 Add better support for panels installed in other locations. 2023-07-25 22:42:32 +02:00
purple
027c9d0262 Update fallback version to latest. 2023-07-24 16:03:45 +02:00
purple
08c26c0191 Add dashboard_wrapper below content. 2023-07-23 18:35:37 +02:00
purple
75d4c94351 Attempt at making dashboard_wrapper useful 2023-07-23 18:27:09 +02:00
purple
865d71ec2e Forgot to add -e to echo when adding the newline.
I'm also experimenting with making the wrapper work correctly.
2023-07-23 18:20:01 +02:00
purple
b73bd9c96b Add a linebreak before identifier:stop 2023-07-23 17:54:13 +02:00
purple
e6398f7609 Fix for "input file is output file" 2023-07-23 17:41:32 +02:00
purple
e4e131aee4 Save identifier:start contents to file instead of logging output. 2023-07-23 17:35:00 +02:00
purple
e531e0b528 Another attempt at fixing wrapper updating. 2023-07-23 17:30:49 +02:00
purple
c9ff6a9c5f Attempt at fixing updating wrappers by using perl 2023-07-23 17:03:01 +02:00
purple
10b571a0a5 Fix dashboard_wrapper and admin_wrapper backup files. 2023-07-23 16:36:52 +02:00
purple
eb5a9957bc Change datafolder ownership to www-data when installing extensions. 2023-07-23 15:23:28 +02:00
purple
9f2a0572ee Update fallback version to latest. 2023-07-23 15:02:04 +02:00
purple
4ce4dd0170 Add extension updating support for admin and dashboard wrappers. 2023-07-22 13:13:00 +02:00
purple
3726e7d963 Improve file contents parsing for extension updating. 2023-07-22 12:54:01 +02:00
purple
94b3478d8c Extension upgrading did not work as expected, this commit contains a bugfix attempt. 2023-07-22 12:50:11 +02:00
purple
ea34890e74 Implement extension upgrading.
This works by backup up all generated values upon extension installation and using them when updating extensions. This also means you won't get duplicate extension buttons in your extensions admin page. Expect a few more commits with bug fixes after this one, as I've got to test everything.
2023-07-22 12:40:00 +02:00
purple
2454c3c0d0 Fix wrong variable and add warning for updating extensions. 2023-07-21 17:32:22 +02:00
purple
90841b7e3a My whole day has been ruined due to a single variable mistake. 2023-07-21 17:11:28 +02:00
purple
920ef8d0c3 Some characters were read as regex by sed when applying extension css. 2023-07-21 17:04:29 +02:00
purple
bff8733018 Use alternative method for applying admin css. 2023-07-21 16:53:03 +02:00
purple
7f0d342af2 Modify CSS placement. 2023-07-21 16:24:26 +02:00
purple
f45879b8b8 CSS was still not applied correctly as it was handled as a folder.
.... somehow
2023-07-21 16:17:03 +02:00
purple
318f783999 Applying custom css was skipped, this is now fixed. 2023-07-21 16:00:56 +02:00
purple
aac4302c36 Only skip including css on duplicate extensions 2023-07-21 15:57:30 +02:00
purple
8191990d80 Add duplicate checking to admin_css 2023-07-21 15:11:19 +02:00
purple
f7956655dd Fix telemetry id -config option. 2023-07-20 19:50:20 +02:00
purple
98dc6601fe Add admin wrapper. Behaves similarly to dashboard wrapper. 2023-07-20 17:26:09 +02:00
purple
6146d6b655 Fix wrongly colored [INFO] in blueprint.sh 2023-07-20 15:44:08 +02:00
purple
4271aa3ee1 Skip applying routes and buttons if extension has already been installed to prevent duplicates. 2023-07-20 15:36:58 +02:00
purple
6d26574d57 Make custom installation script executable before running it. 2023-07-20 13:07:22 +02:00
purple
f4051eeda9 Add new "name" placeholder. 2023-07-20 12:26:00 +02:00
purple
ecd0997113 dashboard_wrapper is now inserted outside of <head> and modify error text for users with a unfinished installation. 2023-07-20 11:46:42 +02:00
purple
29f576dd68
Remove -exec and add -config
-config uses a new thing I recently learned setting up my Raspberry Pi. This should make everything much simpler on the backend side of things and will be more user-friendly.

I'm also thinking of adding BP_xxx error codes, but that isn't final yet, so expect changes.

Well that was it from me again, thanks for checking out Blueprint.
2023-07-16 20:22:59 +02:00
purple
dde406c580
Update fallback version 2023-07-14 11:53:59 +02:00
purple
46f96fc2e8 Fix quit_red and insert "dashboard_wrapper" 2023-07-14 11:02:59 +02:00
purple
83a365cd46 Abort upgrading if .blueprint/dev contains files. 2023-07-14 10:39:26 +02:00
purple
b96528a066 Clean up blueprint.sh and fix wrapper.blade.php editing 2023-07-14 10:34:09 +02:00
purple
c34269aba0 Fix wrong variables for dashboard_wrapper and change placeholders in wrapper.blade.php 2023-07-13 21:27:05 +02:00
purple
6f8112dc1e Fix typo on conf.yml backup 2023-07-13 21:15:13 +02:00
purple
6eade01be3 Readd automatic blueprint.sh recovery and add basic dashboard support for extensions. 2023-07-13 10:41:44 +02:00
purple
4c65acd300 Use /var/www/$FOLDER paths for placeholder removal. 2023-07-12 14:32:44 +02:00
purple
f17ff844a3 Do not clear tools/tmp folder, instead only remove README.md 2023-07-12 14:27:50 +02:00
purple
6cd4c2dcf5 Backup conf.yml after while installing extensions. 2023-07-12 14:18:43 +02:00
purple
fb0e2b313f Automatically clear tools/tmp folder upon installation. 2023-07-12 13:09:38 +02:00
purple
3afa256663 Add new assets. 2023-07-10 14:06:16 +02:00
purple
1e0848982b
Add additional comments to blueprint.sh 2023-07-09 07:47:40 +02:00
purple
33cda8c48f Use README.md folder placeholders instead of hello.txt or .hello.txt.
These files will be automatically removed upon installation.
2023-07-06 12:27:27 +02:00
purple
71d0b5e716 Remove -collect command. 2023-07-05 09:53:50 +02:00
purple
2f7f831e38 Remove "debug" and change how -collect works. 2023-07-04 14:28:19 +02:00
purple
77ba45b6e2 Add hidden "DEBUG" logs. 2023-07-04 14:19:48 +02:00
purple
f565de0b43 Remove automatic repair for now. 2023-07-04 13:38:13 +02:00
purple
7a6bd536e1 Add -collect command for debugging. 2023-07-04 13:35:02 +02:00
purple
3ff29872f3 Update some things related to logs.
Add new [INPUT] log type and collect all logs in a file for debugging.
2023-07-04 13:25:16 +02:00
purple
421e5f12a8 Get Blueprint logo from assets when installing. 2023-07-04 10:37:31 +02:00
purple
7e1a3adfda
Update fallback version. 2023-07-03 16:32:57 +02:00
purple
78e34a529a Fix -init input validation. 2023-07-03 14:46:49 +02:00
purple
45958856b1 Rewrite -init questions. 2023-07-03 14:42:01 +02:00
purple
5607082e31 Default controllers didn't generate correctly. 2023-07-03 13:48:09 +02:00
purple
e3ba909d39 Fix typo on controller.php 2023-07-03 13:06:57 +02:00
purple
b20a5fb438 Fix wrong button.blade.php path. 2023-07-03 12:48:40 +02:00
purple
52a65be67c Prefix imported variables with "conf_".
This prevents overwriting Blueprint's variables, since that could be done before.
2023-07-02 20:58:59 +02:00
purple
4f0ae21059 Add security checks to conf.yml paths. 2023-07-02 14:42:30 +02:00
purple
f5ba7d61e2
Update fallback version to latest. 2023-06-30 13:47:06 +02:00
purple
96d19b5e6f Extensions would not install correctly due to missing paths to defaults. 2023-06-29 20:32:00 +02:00
purple
9e9ae2f53d -test will no longer respond and update fallback version 2023-06-28 21:31:22 +02:00
purple
fb7dfcf054 Remove developer terminal completely and more.
Make Blueprint more secure, restore blueprint.sh if upgrading fails, fix problems with the BlueprintAdminFormRequest resulting in errors.
2023-06-28 16:57:05 +02:00
purple
e6fa4895fe Admin requests are now deprecated. Use them in your controller instead. 2023-06-28 15:48:44 +02:00
purple
8244cdda29 Change alphabet placeholders to __placeholder__ and more.
Add readFiles(path) to BlueprintExtensionLibrary.
2023-06-28 15:16:29 +02:00
purple
20df7aa031 Make sure -exec cannot do other things in blueprint.sh
and log a space if the command was a valid one
2023-06-27 21:49:11 +02:00
purple
46158e6079 Arguments parsed through shell are now checked by escapeshellarc($var).
Panel administrators will no longer have access to the shell. This includes the developer terminal turning into a Blueprint execute terminal. (something you'll probably never use anyways.)
2023-06-27 21:40:35 +02:00
purple
75907bd5df Re-do the entire .blueprint folder structure.
Changing all documentation is going to suck lmao
2023-06-27 21:08:01 +02:00
purple
986c90988e Update fallback version and improve extension flags. 2023-06-27 20:36:03 +02:00
purple
dadb4bbf58
-export is no longer experimental and add donation link to installer. 2023-06-26 14:42:31 +02:00
purple
727f31ab08 Add more comments to the installation script of blueprint.sh 2023-06-26 12:40:33 +02:00
purple
898c15872b Rewrite -export to make it work correctly.
First thing in the morning, rewrite the -export command.

It works now, I tested it before committing changes.
2023-06-24 10:55:21 +02:00
purple
38d7abb164
Telemetry would still show a curl progress bar, this should now be fixed. 2023-06-23 20:38:52 +02:00
purple
03dcc77af6
Update fallback version to latest. 2023-06-23 10:33:24 +02:00
purple
a52ec1a3c1 Fix indentation on VariableService and fix installation check.
Now the installation will be marked as installed after the installation script ends.
2023-06-20 18:08:25 +02:00
purple
9243e01498 Remove upgrade telemetry for now. 2023-06-20 17:55:58 +02:00
purple
9591ea1149 Remove telemetry dev tool. 2023-06-19 21:49:25 +02:00
purple
2834812d29 Tell the user that EOF errors are expected when upgrading. 2023-06-19 21:11:27 +02:00
purple
7c6828a8cf Add website button if extension added a website to info_website in conf.yml 2023-06-19 21:04:06 +02:00
purple
20a82b67f5 Switch to BlueprintVariableService for -exec 2023-06-18 20:29:35 +02:00
purple
6698d304ba Add telemetry test tool to blueprint.sh and fix missing dot. 2023-06-18 20:13:12 +02:00
purple
eb30597ff3 Add work-in-progress telemetry to blueprint.sh 2023-06-18 18:32:02 +02:00
purple
dfdb37b967 Add more comments to blueprint.sh and create new conf.yml option 2023-06-18 16:37:46 +02:00
purple
54ec0acc11 Explain what a couple lines are doing in blueprint.sh 2023-06-17 13:28:26 +02:00
purple
99571f859a Add advanced feature warnings, point users to GitHub issues instead of Discord for bugs and -upgrade is no longer experimental.
-reinstall is now -runinstall
2023-06-15 11:56:11 +02:00
purple
99b1f9e217 Update Discord link to ptero.shop/community 2023-06-15 11:44:33 +02:00
purple
86ac22b91b Update fallback version and add new default extension icons. 2023-06-12 17:45:03 +02:00
purple
002027d20a Make sure the old update files are removed after updating. 2023-06-12 16:35:15 +02:00
purple
33141eebad Use a different way to pull the latest Blueprint version
Also downloading the pre-release version will result in the version becoming "source"
2023-06-12 16:30:27 +02:00
purple
963b5ccb04 Remove source warning during upgrading 2023-06-12 15:56:29 +02:00
purple
7b0fddd8cc Remove -preview and upgrading to stable
It just didn't work. However, Blueprint will now show a warning to users who have upgrades instead of manually updated to save me from support tickets about why this doesn't work.
2023-06-12 15:49:55 +02:00
purple
bf518ee48c Upgrade to latest release by default
Previously upgrading would update Blueprint to the latest source files, not a stable version. This should be different now.
2023-06-12 15:21:38 +02:00
purple
a3b6475ecf
Fix extension exporting. 2023-06-11 21:30:16 +02:00
purple
5c7c20d788 Forgot to add a $identifier alias.
I forgot the most important thing in extension installation.
2023-06-11 21:12:40 +02:00
purple
c70a13eaa3 Update some error messages with newer configuration options 2023-06-11 21:03:15 +02:00
purple
b157a3bbe1 Switch to a different option structure in conf.yml
Current extensions will need to adapt to this better version of conf.yml. Older extensions won't work on this version and extensions created in older versions won't work on this one.
2023-06-11 20:58:20 +02:00
purple
b42beb457d Add new -preview command. 2023-06-10 16:09:12 +02:00
purple
7dabf64453 Remove "error" function, apply new log standards to -build and more.
- The "error" function in blueprint.sh has been removed and has been replaced with "quit_red".
- -build now uses the new logging standard as well.
- -test has been deprecated and will not work anymore.
2023-06-10 15:46:36 +02:00
purple
77717e54e4 Implement easier to read logs, improved upgrading and more.
- Logs are now easier to read with the new [INFO], [WARNING]. [FATAL] and [SUCCESS] tags.
- Improved upgrading with extra warnings, post-upgrade checks and more.
- bash_colors.sh now has the "YELLOW" color.
- Some log messages have been reworded and made easier to understand by humans.
- Fix multiple spelling mistakes and bugs.
2023-06-10 14:52:00 +02:00
purple
8a09c2f3c3
Remove extra upgrade warning 2023-06-06 21:14:53 +02:00
purple
cce0825355
Add Blueprint logo with unicode characters to installer. 2023-06-06 21:13:26 +02:00
purple
796ece70be
Update fallback version to latest and add extra upgrade warning. 2023-06-06 20:04:27 +02:00
purple
9381e69f63
Change some log colors and add a hint when installing extensions 2023-06-05 20:45:31 +02:00
purple
db971eb8f3
blueprint.sh didn't import sources correctly when running it outside the Pterodactyl directory. 2023-06-05 20:41:13 +02:00
purple
0e3427fd90
Fix bug where extensions would not install correctly.
This has to do with the new TMP location being correct but others not being updated correctly. This has been fixed now.
2023-06-05 20:34:20 +02:00
purple
e70ee534e2 Blueprint has a brand new logo and errors are red now.
Remember the Blueprint error screen? Instead of being blue, it's red now. Makes it a little bit easier to understand.

Also, the new look is here, with a brand new website as well. Great stuff!
2023-06-05 18:20:01 +02:00
purple
766e295f10
Update fallback version to DB4 2023-06-02 22:01:47 +02:00
purple
0b68d4dfc0 Switch to 4 space to 2 space indentation.
Not all files are included yet, but this at least improves readability for me.
2023-06-02 16:37:38 +02:00
purple
732b349a1b Fix typo on version placeholder check 2023-06-02 15:00:08 +02:00
purple
01188912c6 Show current version for a brief moment on /extensions/blueprint 2023-06-01 22:00:02 +02:00
purple
bf37806570 Add -upgrade for upgrading Blueprint
(experimental) This will overwrite extensions but will leave you with the latest version.
2023-06-01 21:25:15 +02:00
purple
75fc615946 Update fallback version to latest 2023-06-01 21:15:20 +02:00
purple
c853d3975b -init and -build are not experimental anymore.
-test will be replaced by -build and will not work anymore in future versions.
2023-06-01 20:41:36 +02:00
purple
09b037cb4e Migrate database after installation if extension comes with database migrations. 2023-05-31 14:34:13 +02:00
purple
232522362c
Fallback version indev-X34 is now alpha-X34 2023-05-31 08:37:00 +02:00
purple
1e6a915814
Fix problems with multiple line admin views. 2023-05-30 21:31:07 +02:00
purple
6300832ad4
Well I didn't mean to apply variables to the whole Pterodactyl filesystem.. 2023-05-30 21:01:54 +02:00
purple
fa32b82add
Placeholders are now recursive. 2023-05-30 21:00:46 +02:00
purple
f235680f97
Add new development tool to only update blueprint.sh 2023-05-30 20:52:04 +02:00
purple
aed83bffb6
Scrap root privilege checking for now 2023-05-30 20:40:45 +02:00
purple
88a47c4231
Fix running extension script without root privilages 2023-05-30 20:36:51 +02:00
purple
839e8a2366
Add new path and datapath directory 2023-05-30 19:14:25 +02:00
purple
accd112f20
Automatically add +x permissions to files in extensiondata. 2023-05-30 19:02:05 +02:00