diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json index c509c31a7..2dbf143c2 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "webpatser/laravel-uuid": "^2.0", "prologue/alerts": "^0.4.0", "s1lentium/iptools": "^1.0", - "edvinaskrucas/settings": "^2.0" + "edvinaskrucas/settings": "^2.0", + "igaster/laravel-theme": "^1.1" }, "require-dev": { "fzaninotto/faker": "~1.4", diff --git a/config/app.php b/config/app.php index 8e3a4f945..a02ea5215 100644 --- a/config/app.php +++ b/config/app.php @@ -154,6 +154,7 @@ return [ */ Barryvdh\Debugbar\ServiceProvider::class, PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class, + igaster\laravelTheme\themeServiceProvider::class, Prologue\Alerts\AlertsServiceProvider::class, Krucas\Settings\Providers\SettingsServiceProvider::class @@ -208,6 +209,7 @@ return [ 'Settings' => Krucas\Settings\Facades\Settings::class, 'Session' => Illuminate\Support\Facades\Session::class, 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Theme' => igaster\laravelTheme\Facades\Theme::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Uuid' => Webpatser\Uuid\Uuid::class, 'Validator' => Illuminate\Support\Facades\Validator::class, diff --git a/config/themes.php b/config/themes.php new file mode 100644 index 000000000..35d45b63c --- /dev/null +++ b/config/themes.php @@ -0,0 +1,16 @@ + true, + 'themes_path' => realpath(base_path('resources/themes')), + 'asset_not_found' => 'LOG_ERROR', + 'active' => 'default', + + 'themes' => [ + 'default' => [ + 'extends' => null, + 'views-path' => 'default', + 'asset-path' => 'themes/default', + ], + ], +]; \ No newline at end of file diff --git a/public/css/animate.css b/public/themes/default/css/animate.css similarity index 100% rename from public/css/animate.css rename to public/themes/default/css/animate.css diff --git a/public/css/bootstrap.css b/public/themes/default/css/bootstrap.css similarity index 100% rename from public/css/bootstrap.css rename to public/themes/default/css/bootstrap.css diff --git a/public/css/fontawesome/font-awesome.min.css b/public/themes/default/css/fontawesome/font-awesome.min.css similarity index 100% rename from public/css/fontawesome/font-awesome.min.css rename to public/themes/default/css/fontawesome/font-awesome.min.css diff --git a/public/css/fontawesome/fonts/FontAwesome.otf b/public/themes/default/css/fontawesome/fonts/FontAwesome.otf similarity index 100% rename from public/css/fontawesome/fonts/FontAwesome.otf rename to public/themes/default/css/fontawesome/fonts/FontAwesome.otf diff --git a/public/css/fontawesome/fonts/fontawesome-webfont.eot b/public/themes/default/css/fontawesome/fonts/fontawesome-webfont.eot similarity index 100% rename from public/css/fontawesome/fonts/fontawesome-webfont.eot rename to public/themes/default/css/fontawesome/fonts/fontawesome-webfont.eot diff --git a/public/css/fontawesome/fonts/fontawesome-webfont.svg b/public/themes/default/css/fontawesome/fonts/fontawesome-webfont.svg similarity index 100% rename from public/css/fontawesome/fonts/fontawesome-webfont.svg rename to public/themes/default/css/fontawesome/fonts/fontawesome-webfont.svg diff --git a/public/css/fontawesome/fonts/fontawesome-webfont.ttf b/public/themes/default/css/fontawesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/css/fontawesome/fonts/fontawesome-webfont.ttf rename to public/themes/default/css/fontawesome/fonts/fontawesome-webfont.ttf diff --git a/public/css/fontawesome/fonts/fontawesome-webfont.woff b/public/themes/default/css/fontawesome/fonts/fontawesome-webfont.woff similarity index 100% rename from public/css/fontawesome/fonts/fontawesome-webfont.woff rename to public/themes/default/css/fontawesome/fonts/fontawesome-webfont.woff diff --git a/public/css/pterodactyl.css b/public/themes/default/css/pterodactyl.css similarity index 100% rename from public/css/pterodactyl.css rename to public/themes/default/css/pterodactyl.css diff --git a/public/css/selectize.contacts.css b/public/themes/default/css/selectize.contacts.css similarity index 100% rename from public/css/selectize.contacts.css rename to public/themes/default/css/selectize.contacts.css diff --git a/public/css/selectize.css b/public/themes/default/css/selectize.css similarity index 100% rename from public/css/selectize.css rename to public/themes/default/css/selectize.css diff --git a/public/favicon.ico b/public/themes/default/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/themes/default/favicon.ico diff --git a/public/fonts/glyphicons-halflings-regular.eot b/public/themes/default/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from public/fonts/glyphicons-halflings-regular.eot rename to public/themes/default/fonts/glyphicons-halflings-regular.eot diff --git a/public/fonts/glyphicons-halflings-regular.svg b/public/themes/default/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from public/fonts/glyphicons-halflings-regular.svg rename to public/themes/default/fonts/glyphicons-halflings-regular.svg diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/themes/default/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from public/fonts/glyphicons-halflings-regular.ttf rename to public/themes/default/fonts/glyphicons-halflings-regular.ttf diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/themes/default/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff rename to public/themes/default/fonts/glyphicons-halflings-regular.woff diff --git a/public/fonts/glyphicons-halflings-regular.woff2 b/public/themes/default/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff2 rename to public/themes/default/fonts/glyphicons-halflings-regular.woff2 diff --git a/public/images/403.jpg b/public/themes/default/images/403.jpg similarity index 100% rename from public/images/403.jpg rename to public/themes/default/images/403.jpg diff --git a/public/images/404.jpg b/public/themes/default/images/404.jpg similarity index 100% rename from public/images/404.jpg rename to public/themes/default/images/404.jpg diff --git a/public/images/check-square.png b/public/themes/default/images/check-square.png similarity index 100% rename from public/images/check-square.png rename to public/themes/default/images/check-square.png diff --git a/public/images/exclamation-circle.png b/public/themes/default/images/exclamation-circle.png similarity index 100% rename from public/images/exclamation-circle.png rename to public/themes/default/images/exclamation-circle.png diff --git a/public/images/exclamation-triangle.png b/public/themes/default/images/exclamation-triangle.png similarity index 100% rename from public/images/exclamation-triangle.png rename to public/themes/default/images/exclamation-triangle.png diff --git a/public/images/info-circle.png b/public/themes/default/images/info-circle.png similarity index 100% rename from public/images/info-circle.png rename to public/themes/default/images/info-circle.png diff --git a/public/images/spinner.gif b/public/themes/default/images/spinner.gif similarity index 100% rename from public/images/spinner.gif rename to public/themes/default/images/spinner.gif diff --git a/public/js/admin.min.js b/public/themes/default/js/admin.min.js similarity index 100% rename from public/js/admin.min.js rename to public/themes/default/js/admin.min.js diff --git a/public/js/binaryjs.js b/public/themes/default/js/binaryjs.js similarity index 100% rename from public/js/binaryjs.js rename to public/themes/default/js/binaryjs.js diff --git a/public/js/bootstrap-notify.min.js b/public/themes/default/js/bootstrap-notify.min.js similarity index 100% rename from public/js/bootstrap-notify.min.js rename to public/themes/default/js/bootstrap-notify.min.js diff --git a/public/js/selectize.js b/public/themes/default/js/selectize.js similarity index 100% rename from public/js/selectize.js rename to public/themes/default/js/selectize.js diff --git a/resources/views/admin/accounts/index.blade.php b/resources/themes/default/admin/accounts/index.blade.php similarity index 100% rename from resources/views/admin/accounts/index.blade.php rename to resources/themes/default/admin/accounts/index.blade.php diff --git a/resources/views/admin/accounts/new.blade.php b/resources/themes/default/admin/accounts/new.blade.php similarity index 100% rename from resources/views/admin/accounts/new.blade.php rename to resources/themes/default/admin/accounts/new.blade.php diff --git a/resources/views/admin/accounts/view.blade.php b/resources/themes/default/admin/accounts/view.blade.php similarity index 100% rename from resources/views/admin/accounts/view.blade.php rename to resources/themes/default/admin/accounts/view.blade.php diff --git a/resources/views/admin/api/index.blade.php b/resources/themes/default/admin/api/index.blade.php similarity index 100% rename from resources/views/admin/api/index.blade.php rename to resources/themes/default/admin/api/index.blade.php diff --git a/resources/views/admin/api/new.blade.php b/resources/themes/default/admin/api/new.blade.php similarity index 100% rename from resources/views/admin/api/new.blade.php rename to resources/themes/default/admin/api/new.blade.php diff --git a/resources/views/admin/index.blade.php b/resources/themes/default/admin/index.blade.php similarity index 100% rename from resources/views/admin/index.blade.php rename to resources/themes/default/admin/index.blade.php diff --git a/resources/views/admin/locations/index.blade.php b/resources/themes/default/admin/locations/index.blade.php similarity index 100% rename from resources/views/admin/locations/index.blade.php rename to resources/themes/default/admin/locations/index.blade.php diff --git a/resources/views/admin/nodes/index.blade.php b/resources/themes/default/admin/nodes/index.blade.php similarity index 100% rename from resources/views/admin/nodes/index.blade.php rename to resources/themes/default/admin/nodes/index.blade.php diff --git a/resources/views/admin/nodes/new.blade.php b/resources/themes/default/admin/nodes/new.blade.php similarity index 100% rename from resources/views/admin/nodes/new.blade.php rename to resources/themes/default/admin/nodes/new.blade.php diff --git a/resources/views/admin/nodes/view.blade.php b/resources/themes/default/admin/nodes/view.blade.php similarity index 100% rename from resources/views/admin/nodes/view.blade.php rename to resources/themes/default/admin/nodes/view.blade.php diff --git a/resources/views/admin/servers/index.blade.php b/resources/themes/default/admin/servers/index.blade.php similarity index 100% rename from resources/views/admin/servers/index.blade.php rename to resources/themes/default/admin/servers/index.blade.php diff --git a/resources/views/admin/servers/new.blade.php b/resources/themes/default/admin/servers/new.blade.php similarity index 100% rename from resources/views/admin/servers/new.blade.php rename to resources/themes/default/admin/servers/new.blade.php diff --git a/resources/views/admin/servers/view.blade.php b/resources/themes/default/admin/servers/view.blade.php similarity index 100% rename from resources/views/admin/servers/view.blade.php rename to resources/themes/default/admin/servers/view.blade.php diff --git a/resources/views/admin/settings.blade.php b/resources/themes/default/admin/settings.blade.php similarity index 100% rename from resources/views/admin/settings.blade.php rename to resources/themes/default/admin/settings.blade.php diff --git a/resources/views/auth/login.blade.php b/resources/themes/default/auth/login.blade.php similarity index 100% rename from resources/views/auth/login.blade.php rename to resources/themes/default/auth/login.blade.php diff --git a/resources/views/auth/password.blade.php b/resources/themes/default/auth/password.blade.php similarity index 100% rename from resources/views/auth/password.blade.php rename to resources/themes/default/auth/password.blade.php diff --git a/resources/views/auth/reset.blade.php b/resources/themes/default/auth/reset.blade.php similarity index 100% rename from resources/views/auth/reset.blade.php rename to resources/themes/default/auth/reset.blade.php diff --git a/resources/views/base/account.blade.php b/resources/themes/default/base/account.blade.php similarity index 100% rename from resources/views/base/account.blade.php rename to resources/themes/default/base/account.blade.php diff --git a/resources/views/base/index.blade.php b/resources/themes/default/base/index.blade.php similarity index 100% rename from resources/views/base/index.blade.php rename to resources/themes/default/base/index.blade.php diff --git a/resources/views/base/totp.blade.php b/resources/themes/default/base/totp.blade.php similarity index 100% rename from resources/views/base/totp.blade.php rename to resources/themes/default/base/totp.blade.php diff --git a/resources/views/emails/added-subuser.blade.php b/resources/themes/default/emails/added-subuser.blade.php similarity index 100% rename from resources/views/emails/added-subuser.blade.php rename to resources/themes/default/emails/added-subuser.blade.php diff --git a/resources/views/emails/new-account.blade.php b/resources/themes/default/emails/new-account.blade.php similarity index 100% rename from resources/views/emails/new-account.blade.php rename to resources/themes/default/emails/new-account.blade.php diff --git a/resources/views/emails/new_password.blade.php b/resources/themes/default/emails/new_password.blade.php similarity index 100% rename from resources/views/emails/new_password.blade.php rename to resources/themes/default/emails/new_password.blade.php diff --git a/resources/views/emails/password.blade.php b/resources/themes/default/emails/password.blade.php similarity index 100% rename from resources/views/emails/password.blade.php rename to resources/themes/default/emails/password.blade.php diff --git a/resources/views/errors/403.blade.php b/resources/themes/default/errors/403.blade.php similarity index 100% rename from resources/views/errors/403.blade.php rename to resources/themes/default/errors/403.blade.php diff --git a/resources/views/errors/404.blade.php b/resources/themes/default/errors/404.blade.php similarity index 100% rename from resources/views/errors/404.blade.php rename to resources/themes/default/errors/404.blade.php diff --git a/resources/views/errors/503.blade.php b/resources/themes/default/errors/503.blade.php similarity index 100% rename from resources/views/errors/503.blade.php rename to resources/themes/default/errors/503.blade.php diff --git a/resources/views/errors/installing.blade.php b/resources/themes/default/errors/installing.blade.php similarity index 100% rename from resources/views/errors/installing.blade.php rename to resources/themes/default/errors/installing.blade.php diff --git a/resources/views/layouts/admin.blade.php b/resources/themes/default/layouts/admin.blade.php similarity index 100% rename from resources/views/layouts/admin.blade.php rename to resources/themes/default/layouts/admin.blade.php diff --git a/resources/views/layouts/master.blade.php b/resources/themes/default/layouts/master.blade.php similarity index 100% rename from resources/views/layouts/master.blade.php rename to resources/themes/default/layouts/master.blade.php diff --git a/resources/views/server/files/add.blade.php b/resources/themes/default/server/files/add.blade.php similarity index 100% rename from resources/views/server/files/add.blade.php rename to resources/themes/default/server/files/add.blade.php diff --git a/resources/views/server/files/edit.blade.php b/resources/themes/default/server/files/edit.blade.php similarity index 100% rename from resources/views/server/files/edit.blade.php rename to resources/themes/default/server/files/edit.blade.php diff --git a/resources/views/server/files/index.blade.php b/resources/themes/default/server/files/index.blade.php similarity index 100% rename from resources/views/server/files/index.blade.php rename to resources/themes/default/server/files/index.blade.php diff --git a/resources/views/server/files/list.blade.php b/resources/themes/default/server/files/list.blade.php similarity index 100% rename from resources/views/server/files/list.blade.php rename to resources/themes/default/server/files/list.blade.php diff --git a/resources/views/server/index.blade.php b/resources/themes/default/server/index.blade.php similarity index 100% rename from resources/views/server/index.blade.php rename to resources/themes/default/server/index.blade.php diff --git a/resources/views/server/js/minecraft/eula.blade.php b/resources/themes/default/server/js/minecraft/eula.blade.php similarity index 100% rename from resources/views/server/js/minecraft/eula.blade.php rename to resources/themes/default/server/js/minecraft/eula.blade.php diff --git a/resources/views/server/settings.blade.php b/resources/themes/default/server/settings.blade.php similarity index 100% rename from resources/views/server/settings.blade.php rename to resources/themes/default/server/settings.blade.php diff --git a/resources/views/server/users/index.blade.php b/resources/themes/default/server/users/index.blade.php similarity index 100% rename from resources/views/server/users/index.blade.php rename to resources/themes/default/server/users/index.blade.php diff --git a/resources/views/server/users/new.blade.php b/resources/themes/default/server/users/new.blade.php similarity index 100% rename from resources/views/server/users/new.blade.php rename to resources/themes/default/server/users/new.blade.php diff --git a/resources/views/server/users/view.blade.php b/resources/themes/default/server/users/view.blade.php similarity index 100% rename from resources/views/server/users/view.blade.php rename to resources/themes/default/server/users/view.blade.php diff --git a/resources/views/vendor/.gitkeep b/resources/themes/default/vendor/.gitkeep similarity index 100% rename from resources/views/vendor/.gitkeep rename to resources/themes/default/vendor/.gitkeep diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755