From 7fd224b44a3107e24437082cadb7040e3333947e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 16 May 2023 09:05:38 +0200 Subject: [PATCH] init lang + login/register page --- lang/en.json | 15 ++++++ resources/views/auth/login.blade.php | 53 ++++++++++--------- resources/views/auth/register.blade.php | 49 +++++++++-------- .../views/components/layout-simple.blade.php | 32 +++++++++++ resources/views/components/layout.blade.php | 6 +-- 5 files changed, 105 insertions(+), 50 deletions(-) create mode 100644 lang/en.json create mode 100644 resources/views/components/layout-simple.blade.php diff --git a/lang/en.json b/lang/en.json new file mode 100644 index 000000000..c690f3fb6 --- /dev/null +++ b/lang/en.json @@ -0,0 +1,15 @@ +{ + "auth.login": "Login", + "auth.logout": "Logout", + "auth.register": "Register", + "auth.registration_disabled": "Registration is disabled.", + "auth.reset_password": "Reset Password", + "auth.failed": "These credentials do not match our records.", + "auth.failed.password": "The provided password is incorrect.", + "auth.failed.email": "We can't find a user with that e-mail address.", + "auth.throttle": "Too many login attempts. Please try again in :seconds seconds.", + "input.name": "Name", + "input.email": "Email", + "input.password": "Password", + "input.password.again": "Password Again" +} diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index df63a074c..cde952445 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,27 +1,30 @@ - -
v{{ config('version') }}
- Login - @if ($is_registration_enabled) - Register - @else - Registration disabled - @endif -
-
- @csrf - - - Login -
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
  • - @endforeach -
+ +
+
+
+
+ @csrf + + + {{ __('auth.login') }} +
+ @if ($errors->any()) +
+
    +
  • {{ __('auth.failed') }}
  • +
+
+ @endif
- @endif + @if ($is_registration_enabled) + + + + @else +
{{ __('auth.registration_disabled') }}
+ @endif +
- +
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 8a8ab42d4..dba776362 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,23 +1,28 @@ - -
v{{ config('version') }}
- Login - Register -
- @csrf - - - - - Register -
- @if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
  • - @endforeach -
+ +
+
+
+ @csrf + + + + + {{ __('auth.register') }} +
+ @if ($errors->any()) +
+
    +
  • {{ __('auth.failed') }}
  • +
+
+ @endif + + +
- @endif - +
+
diff --git a/resources/views/components/layout-simple.blade.php b/resources/views/components/layout-simple.blade.php new file mode 100644 index 000000000..8c6472474 --- /dev/null +++ b/resources/views/components/layout-simple.blade.php @@ -0,0 +1,32 @@ + + + + + + + + + @env('local') + Coolify - localhost + @endenv + @env('production') + {{ $title ?? 'Coolify' }} + @endenv + + @vite(['resources/js/app.js', 'resources/css/app.css']) + + + + +
+ {{ $slot }} +
+ v{{ config('version') }} + + + diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index da3cf8b3d..54fc23500 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -23,8 +23,7 @@ - v{{ config('version') }} + @livewireScripts @auth @@ -33,7 +32,8 @@
{{ $slot }}
- + v{{ config('version') }} @auth