diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index a3fd3874..45702adb 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -112,10 +112,6 @@ class SetupController extends Controller 'site_name' => 'required', ]); - if ($request->has('generate_random')) { - $artisan->call('key:generate'); - $artisan->call('salt:random'); - } $artisan->call('jwt:secret', ['--no-interaction' => true]); $artisan->call('passport:keys', ['--no-interaction' => true]); @@ -157,8 +153,6 @@ class SetupController extends Controller $filesystem->put(storage_path('install.lock'), ''); - return view('setup.wizard.finish')->with([ - 'email' => $request->input('email'), - ]); + return view('setup.wizard.finish'); } } diff --git a/app/Http/View/Composers/LanguagesMenuComposer.php b/app/Http/View/Composers/LanguagesMenuComposer.php index 3bbfed92..e7b030e3 100644 --- a/app/Http/View/Composers/LanguagesMenuComposer.php +++ b/app/Http/View/Composers/LanguagesMenuComposer.php @@ -32,8 +32,10 @@ class LanguagesMenuComposer return $locale; }); + $current = 'locales.'.app()->getLocale(); $view->with([ - 'current' => config('locales.'.app()->getLocale().'.short_name'), + 'lang_short_name' => config($current.'.short_name'), + 'lang_name' => config($current.'.name'), 'langs' => $langs, ]); } diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 5203f08d..46e794c2 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -37,7 +37,10 @@ class ViewServiceProvider extends ServiceProvider ]); }); - View::composer('shared.languages', Composers\LanguagesMenuComposer::class); + View::composer( + ['shared.languages', 'errors.*'], + Composers\LanguagesMenuComposer::class + ); View::composer('shared.user-menu', Composers\UserMenuComposer::class); @@ -72,11 +75,9 @@ class ViewServiceProvider extends ServiceProvider View::composer(['errors.*', 'setup.*'], function ($view) use ($webpack) { $view->with([ 'styles' => [ - $webpack->url('setup.css'), - ], - 'scripts' => [ - $webpack->url('language-chooser.js'), + $webpack->url('spectre.css'), ], + 'scripts' => [], ]); }); diff --git a/package.json b/package.json index 815d0554..2bc49859 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "react-hot-loader": "^4.12.18", "rxjs": "^6.5.3", "skinview3d": "^1.2.1", + "spectre.css": "^0.5.8", "vue": "^2.6.11", "vue-good-table": "^2.18.1", "vue-recaptcha": "^1.2.0", diff --git a/resources/assets/src/fonts/minecraft.css b/resources/assets/src/fonts/minecraft.css new file mode 100644 index 00000000..cdfb0034 --- /dev/null +++ b/resources/assets/src/fonts/minecraft.css @@ -0,0 +1,5 @@ +@font-face { + font-family: Minecraft; + src: url('./minecraft.woff2') format('woff2'), + url('./minecraft.woff') format('woff'); +} diff --git a/resources/assets/src/scripts/language-chooser.ts b/resources/assets/src/scripts/language-chooser.ts deleted file mode 100644 index a25bf077..00000000 --- a/resources/assets/src/scripts/language-chooser.ts +++ /dev/null @@ -1,4 +0,0 @@ -const chooser = document.querySelector('#language-chooser') -chooser?.addEventListener('change', () => { - window.location.href = `?lang=${chooser.value}` -}) diff --git a/resources/assets/src/styles/setup.styl b/resources/assets/src/styles/setup.styl deleted file mode 100644 index a4abd13f..00000000 --- a/resources/assets/src/styles/setup.styl +++ /dev/null @@ -1,224 +0,0 @@ -@import 'common.styl' - -html - background #f1f1f1 - margin 0 20px - font-weight 400 - -body - background #FFF none repeat scroll 0% 0% - color #444 - font-family Ubuntu, 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif - margin 140px auto 25px - padding 20px 20px 10px - max-width 700px - box-shadow 0px 1px 3px rgba(0, 0, 0, 0.13) - -h1, h2 - border-bottom 1px solid #DEDEDE - clear both - color #666 - font-size 24px - font-weight 400 - padding 0px 0px 7px - -p - padding-bottom 2px - font-size 14px - line-height 1.5 - -#logo - margin 6px 0 14px - border-bottom none - text-align center - - a - font-family Minecraft, sans-serif - transition color 0.2s ease-in-out - font-weight 400 - font-size 50px - color #666 - height 84px - line-height 1.3em - margin -130px auto 25px - padding 0 - outline 0 - text-decoration none - overflow hidden - display block - - a:hover - color #42a5f5 - -/* Mobile phone */ -@media (max-width: 48em) - #logo a - font-size 40px - -@media (max-width: 35.5em) - #logo a - font-size 30px - -#language-chooser - float right - margin-top 4px - height 24px - -.step - margin 20px 0 15px - text-align left - padding 0 - - input - font-family Ubuntu, 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif - -.alert - font-size 16px - padding 15px - margin-top 15px - margin-bottom 20px - border 1px solid transparent - border-radius 4px - - ul - margin 0px - -.alert-warning - color #8a6d3b - background-color #fcf8e3 - border-color #faebcc - -.form-table td, .form-table th - padding 10px 20px 10px 0 - vertical-align top - font-size 14px - -td > input - font-family Ubuntu, 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif - -.form-table - border-collapse collapse - margin-top 1em - width 100% - -.form-table td - margin-bottom 9px - -.form-table th - text-align left - width 140px - -.form-table p - margin 4px 0 0 - font-size 11px - -.form-table input - line-height 20px - font-size 15px - padding 3px 5px - border 1px solid #ddd - -webkit-box-shadow inset 0 1px 2px rgba(0, 0, 0, 0.07) - box-shadow inset 0 1px 2px rgba(0, 0, 0, 0.07) - -.form-table input[type=email], .form-table input[type=password], .form-table input[type=text], .form-table input[type=url] - width 206px - -.container .button, .container .button-primary, .container .button-secondary - display inline-block - text-decoration none - font-size 13px - line-height 26px - height 28px - margin 0 - padding 0 10px 1px - cursor pointer - border-width 1px - border-style solid - -webkit-appearance none - -webkit-border-radius 3px - border-radius 3px - white-space nowrap - -webkit-box-sizing border-box - -moz-box-sizing border-box - box-sizing border-box - -.container button::-moz-focus-inner, .container input[type=reset]::-moz-focus-inner, .container input[type=button]::-moz-focus-inner, .container input[type=submit]::-moz-focus-inner - border-width 0 - border-style none - padding 0 - -.container .button-group.button-large .button, .container .button.button-large - height 30px - line-height 28px - padding 0 12px 2px - -.container .button:active, .container .button:focus - outline 0 - -.container .button.hidden - display none - -.container input[type=reset], .container input[type=reset]:active, .container input[type=reset]:focus, .container input[type=reset]:hover - background 0 0 - border none - -webkit-box-shadow none - box-shadow none - padding 0 2px 1px - width auto - -.container .button, .container .button-secondary - color #555 - border-color #ccc - background #f7f7f7 - -webkit-box-shadow 0 1px 0 #ccc - box-shadow 0 1px 0 #ccc - vertical-align top - -.container p .button - vertical-align baseline - -.container .button-secondary:focus, .container .button-secondary:hover, .container .button.focus, .container .button.hover, .container .button:focus, .container .button:hover - background #fafafa - border-color #999 - color #23282d - -.container .button-link:focus, .container .button-secondary:focus, .container .button.focus, .container .button:focus - border-color #5b9dd9 - -webkit-box-shadow 0 0 3px rgba(0, 115, 170, 0.8) - box-shadow 0 0 3px rgba(0, 115, 170, 0.8) - -.container .button-secondary:active, .container .button.active, .container .button.active:hover, .container .button:active - background #eee - border-color #999 - -webkit-box-shadow inset 0 2px 5px -3px rgba(0, 0, 0, 0.5) - box-shadow inset 0 2px 5px -3px rgba(0, 0, 0, 0.5) - -webkit-transform translateY(1px) - -ms-transform translateY(1px) - transform translateY(1px) - -.container .button.active:focus - border-color #5b9dd9 - -webkit-box-shadow inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 3px rgba(0, 115, 170, 0.8) - box-shadow inset 0 2px 5px -3px rgba(0, 0, 0, 0.5), 0 0 3px rgba(0, 115, 170, 0.8) - -.container .button-disabled, .container .button-secondary.disabled, .container .button-secondary:disabled, .container .button-secondary[disabled], .container .button.disabled, .container .button:disabled, .container .button[disabled] - color #a0a5aa !important - border-color #ddd !important - background #f7f7f7 !important - -webkit-box-shadow none !important - box-shadow none !important - text-shadow 0 1px 0 #fff !important - cursor default - -webkit-transform none !important - -ms-transform none !important - transform none !important - -.faq - display inline-block - text-decoration none - background-color #0069d9 - color #fff - padding 5px 15px - margin 20px 0 6px 0 - border-radius 3px - diff --git a/resources/assets/src/styles/spectre.css b/resources/assets/src/styles/spectre.css new file mode 100644 index 00000000..f290c6d6 --- /dev/null +++ b/resources/assets/src/styles/spectre.css @@ -0,0 +1,15 @@ +body { + height: 97vh; +} + +.hero { + align-items: center; +} + +h1 { + font-family: Minecraft; +} + +a:hover { + text-decoration: none; +} diff --git a/resources/views/errors/base.twig b/resources/views/errors/base.twig index b72f3fef..e8a3c16e 100644 --- a/resources/views/errors/base.twig +++ b/resources/views/errors/base.twig @@ -11,18 +11,20 @@ {% endfor %} - - -

- {% block subtitle %}{{ block('title') }}{% endblock %} - {{ include('errors.languages') }} -

- {% block message %}{% endblock %} - {% if auth_user().admin %} - FAQ - {% endif %} + + {{ include('errors.languages') }} +
+
+

{{ site_name }}

+
+

{% block subtitle %}{{ block('title') }}{% endblock %}

+ {% block message %}{% endblock %} +
+ {% if auth_user().admin %} + FAQ + {% endif %} +
+
{% for script in scripts %} {% endfor %} diff --git a/resources/views/errors/languages.twig b/resources/views/errors/languages.twig index b92b42d5..33cf484a 100644 --- a/resources/views/errors/languages.twig +++ b/resources/views/errors/languages.twig @@ -1,10 +1,7 @@ - + diff --git a/resources/views/setup/base.twig b/resources/views/setup/base.twig index dd25c7a3..2c7887cb 100644 --- a/resources/views/setup/base.twig +++ b/resources/views/setup/base.twig @@ -13,17 +13,21 @@ {% endfor %} - - -

- {% block subtitle %}{{ block('title') }}{% endblock %} - {{ include('errors.languages') }} -

- {% block content %}{% endblock %} + + {{ include('errors.languages') }} +
+
+

+ + Blessing Skin Server + +

+
+

{% block subtitle %}{{ block('title') }}{% endblock %}

+
+ {% block content %}{% endblock %} +
+
{% for script in scripts %} {% endfor %} diff --git a/resources/views/setup/locked.twig b/resources/views/setup/locked.twig index 5763ca84..6d81f75c 100644 --- a/resources/views/setup/locked.twig +++ b/resources/views/setup/locked.twig @@ -4,8 +4,8 @@ {% block content %}

{{ trans('setup.locked.text') }}

-

- +

+ {{ trans('setup.locked.button') }}

diff --git a/resources/views/setup/updates/success.twig b/resources/views/setup/updates/success.twig index 8c988b54..2dfaeed8 100644 --- a/resources/views/setup/updates/success.twig +++ b/resources/views/setup/updates/success.twig @@ -8,8 +8,8 @@

{{ trans('setup.updates.success.text', {version: config('app.version')}) }}

-

- +

+ {{ trans('setup.updates.welcome.button') }}

diff --git a/resources/views/setup/updates/welcome.twig b/resources/views/setup/updates/welcome.twig index 97ba61dd..e10fdadb 100644 --- a/resources/views/setup/updates/welcome.twig +++ b/resources/views/setup/updates/welcome.twig @@ -8,8 +8,8 @@

{{ trans('setup.updates.welcome.text', {version: config('app.version')})|nl2br }}

-

- +

+ {{ trans('setup.updates.welcome.button') }}

diff --git a/resources/views/setup/wizard/database.twig b/resources/views/setup/wizard/database.twig index 235e2166..5fb0e7da 100644 --- a/resources/views/setup/wizard/database.twig +++ b/resources/views/setup/wizard/database.twig @@ -11,26 +11,33 @@ novalidate="novalidate" > {{ csrf_field() }} - - -
- + + + - - - + - - + - - + - - + - - + - + + + + + + + +
+ - - - - - - + + + +
- +
+
- +
+
- +
+
- +
+
- +
+ -

{{ trans('setup.wizard.database.db-notice') }}
- +

{{ trans('setup.wizard.database.db-notice') }}

+ -

{{ trans('setup.wizard.database.prefix-notice') }}

{{ trans('setup.wizard.database.prefix-notice') }}

{% if errors.any %} -