Skip to content

Commit

Permalink
tweaked auth views
Browse files Browse the repository at this point in the history
  • Loading branch information
@dcblogdev
dcblogdev committed Mar 29, 2024
1 parent eb45ae4 commit 71b303c
Show file tree
Hide file tree
Showing 13 changed files with 126 additions and 117 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## Laravel AdminTW

> From version 5 AdminTW is a complete project rather than a package. If you are looking for the package version, please use version 4.0.0.
> From version 5 AdminTW is a complete project rather than a package. If you are looking for the package version, please use version 4.
Laravel AdminTW is a Laravel Starter Kit | TALL admin theme.

<p align="center"><img src="https://laraveladmintw.com/images/v3/admintw.png"></p>
<p><img src="https://laraveladmintw.com/images/v3/admintw.png"></p>

AdminTw is built on top of Laravel, Livewire, and Tailwind CSS.

Expand Down
7 changes: 0 additions & 7 deletions app/Http/Controllers/Auth/RegisteredUserController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ public function store(RegisterRequest $request): RedirectResponse

event(new Registered($user));

add_user_log([
'title' => 'registered '.$user->name,
'reference_id' => $user->id,
'section' => 'Auth',
'type' => 'Register',
]);

$user->sendEmailVerificationNotification();
flash('Please check your email for a verification link.')->info();

Expand Down
21 changes: 11 additions & 10 deletions resources/views/auth/confirm-password.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@section('title', __('Confirm Password'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Confirm Password'))

<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
{{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
</div>
<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
{{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
</div>

@include('errors.messages')
@include('errors.messages')

<x-form action="{{ route('password.confirm') }}">
<x-form.input type="password" :label="__('Password')" name="password" />
<x-form.submit>{{ __('Confirm') }}</x-form.submit>
</x-form>
</x-auth-card>
<x-form action="{{ route('password.confirm') }}">
<x-form.input type="password" :label="__('Password')" name="password" />
<x-form.submit class="justify-center w-full btn btn-primary">{{ __('Confirm') }}</x-form.submit>
</x-form>

</x-auth-card>
</x-guest-layout>
21 changes: 11 additions & 10 deletions resources/views/auth/forgot-password.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@section('title', __('Forgot Password'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Forgot Password'))

<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
{{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
</div>
<div class="my-4 text-sm text-gray-600 dark:text-gray-400">
{{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
</div>

@include('errors.messages')
@include('errors.messages')

<x-form action="{{ route('password.email') }}">
<x-form.input type="email" :label="__('Email')" name="email">{{ old('email') }}</x-form.input>
<x-form.submit>{{ __('Email Password Reset Link') }}</x-form.submit>
</x-form>
</x-auth-card>
<x-form action="{{ route('password.email') }}">
<x-form.input type="email" :label="__('Email')" name="email">{{ old('email') }}</x-form.input>
<x-form.submit class="justify-center w-full btn btn-primary">{{ __('Email Password Reset Link') }}</x-form.submit>
</x-form>

</x-auth-card>
</x-guest-layout>
22 changes: 12 additions & 10 deletions resources/views/auth/join.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
@section('title', __('Join'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Join'))

@include('errors.success')
@include('errors.success')

<p>{{ $user->invite->name }} {{ __('has invited you to join') }} {{ config('app.name') }}.</p>

<p>{{ $user->invite->name }} {{ __('has invited you to join') }} {{ config('app.name') }}.</p>
<x-form action="{{ route('join.update', ['id' => $user->id]) }}" method="put">

<x-form action="{{ route('join.update', ['id' => $user->id]) }}" method="put">
<x-form.input type="text" :label="__('Name')" name="name">{{ $user->name }}</x-form.input>
<x-form.input type="text" :label="__('Email')" disabled>{{ $user->email }}</x-form.input>
<x-form.input type="password" :label="__('Password')" name='newPassword'></x-form.input>
<x-form.input type="password" :label="__('Confirm Password')" name='confirmPassword'></x-form.input>

<x-form.input type="text" :label="__('Name')" name="name">{{ $user->name }}</x-form.input>
<x-form.input type="text" :label="__('Email')" disabled>{{ $user->email }}</x-form.input>
<x-form.input type="password" :label="__('Password')" name='newPassword'></x-form.input>
<x-form.input type="password" :label="__('Confirm Password')" name='confirmPassword'></x-form.input>
<x-button>{{ __('Save Password') }}</x-button>

<x-button>{{ __('Save Password') }}</x-button>
</x-form>

</x-form>
</x-auth-card>
</x-guest-layout>
33 changes: 17 additions & 16 deletions resources/views/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
@section('title', __('Login'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Login'))

<x-form action="{{ route('login') }}">
<x-form action="{{ route('login') }}">

@include('errors.messages')
@include('errors.messages')

<x-form.input name="email" :label="__('Email')">{{ old('email') }}</x-form.input>
<x-form.input name="password" :label="__('Password')" type="password" />
<x-form.input name="email" :label="__('Email')">{{ old('email') }}</x-form.input>
<x-form.input name="password" :label="__('Password')" type="password" />

<div class="flex justify-between">
<p><a href="{{ route('password.request') }}">{{ __('Forgot your password?') }}</a></p>
@if (Route::has('register'))
<p><a href="{{ route('register') }}">{{ __('Register') }}</a></p>
@endif
</div>
<div class="flex justify-between">
<p><a href="{{ route('password.request') }}">{{ __('Forgot your password?') }}</a></p>
@if (Route::has('register'))
<p><a href="{{ route('register') }}">{{ __('Register') }}</a></p>
@endif
</div>

<p>
<x-form.submit class="justify-center w-full btn btn-primary">Login</x-form.submit>
</p>
<p>
<x-form.submit class="justify-center w-full btn btn-primary">Login</x-form.submit>
</p>

</x-form>
</x-auth-card>
</x-form>

</x-auth-card>
</x-guest-layout>
28 changes: 16 additions & 12 deletions resources/views/auth/register.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
@section('title', __('Register'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Register'))

@include('errors.messages')
@include('errors.messages')

<x-form action="{{ route('register') }}">
<x-form.input type="text" :label="__('Name')" name="name">{{ old('name') }}</x-form.input>
<x-form.input type="email" :label="__('Email')" name="email">{{ old('email') }}</x-form.input>
<x-form.input type="password" :label="__('Password')" name='password'></x-form.input>
<x-form.input type="password" :label="__('Confirm Password')" name='confirmPassword'></x-form.input>

<div class="flex items-center justify-end mt-4">
<p><a href="{{ route('login') }}" class="pt-2 mr-5 underline">{{ __('Already registered?') }}</a></p>
<x-form.submit>{{ __('Register') }}</x-form.submit>
</div>

</x-form>

<x-form action="{{ route('register') }}">
<x-form.input type="text" :label="__('Name')" name="name">{{ old('name') }}</x-form.input>
<x-form.input type="email" :label="__('Email')" name="email">{{ old('email') }}</x-form.input>
<x-form.input type="password" :label="__('Password')" name='password'></x-form.input>
<x-form.input type="password" :label="__('Confirm Password')" name='confirmPassword'></x-form.input>
<div class="flex items-center justify-end mt-4">
<p><a href="{{ route('login') }}" class="pt-2 mr-5 underline">{{ __('Already registered?') }}</a></p>
<x-form.submit>{{ __('Register') }}</x-form.submit>
</div>
</x-form>
</x-auth-card>
</x-guest-layout>
20 changes: 11 additions & 9 deletions resources/views/auth/reset-password.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
@section('title', __('Reset Password'))

<x-guest-layout>
<x-auth-card>
@section('title', __('Reset Password'))

<x-form action="{{ route('password.store') }}">
<x-form action="{{ route('password.store') }}">

@include('errors.messages')

@include('errors.messages')
<input type="hidden" name="token" value="{{ $request->route('token') }}" />
<x-form.input name="email" :label="__('Email')">{{ $request->input('email') }}</x-form.input>
<x-form.input type="password" name="password" :label="__('Password')" />
<x-form.input type="password" name='password_confirmation' :label="__('Confirm Password')" />
<x-form.submit>{{ __('Reset Password') }}</x-form.submit>

<input type="hidden" name="token" value="{{ $request->route('token') }}" />
<x-form.input name="email" :label="__('Email')">{{ $request->input('email') }}</x-form.input>
<x-form.input type="password" name="password" :label="__('Password')" />
<x-form.input type="password" name='password_confirmation' :label="__('Confirm Password')" />
<x-form.submit>{{ __('Reset Password') }}</x-form.submit>
</x-form>

</x-form>
</x-auth-card>
</x-guest-layout>
21 changes: 11 additions & 10 deletions resources/views/auth/twofa.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
@section('title', __('2FA'))

<x-guest-layout>
<x-auth-card>
@section('title', __('2FA'))

<p>{{ __('Please open your authenticator mobile app and enter the code below') }}.</p>
<p>{{ __('Please open your authenticator mobile app and enter the code below') }}.</p>

<x-form action="{{ route('admin.2fa.update') }}">

<x-form action="{{ route('admin.2fa.update') }}">
<x-form.input name="code" :label="__('Code')">{{ old('code') }}</x-form.input>

<x-form.input name="code" :label="__('Code')">{{ old('code') }}</x-form.input>
<p><button class="justify-center w-full btn btn-primary">{{ __('Verify Code') }}</button></p>

<p><button class="justify-center w-full btn btn-primary">{{ __('Verify Code') }}</button></p>
</x-form>

</x-form>
<x-form action="{{ route('logout') }}">
<p><button type="submit" class="float-right">{{ __('Logout') }}</button></p>
</x-form>

<x-form action="{{ route('logout') }}">
<p><button type="submit" class="float-right">{{ __('Logout') }}</button>
</p>
</x-form>
</x-auth-card>
</x-guest-layout>
24 changes: 13 additions & 11 deletions resources/views/auth/twofasetup.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
@section('title', '2FA')

<x-guest-layout>
@section('title', '2FA')
<x-auth-card>
<p>{{ __('Please open your authenticator mobile app and enter the code below') }}.</p>

<p>{{ __('Authenticator apps generate random codes that you can use to sign in. They do not have access to your password or account information') }}.</p>
<p>{{ __('We recommend using 1Password') }}.</p>
<p>{{ __('Authenticator apps generate random codes that you can use to sign in. They do not have access to your password or account information') }}.</p>
<p>{{ __('We recommend using 1Password') }}.</p>

<p><img src='{{ $inlineUrl }}'></p>

<p><img src='{{ $inlineUrl }}'></p>
<p>{{ __('Scan bar code in your authenticator app or manually enter this key') }} {{ $secretKey }}</p>

<p>{{ __('Scan bar code in your authenticator app or manually enter this key') }} {{ $secretKey }}</p>
<x-form action="{{ route('admin.2fa-setup.update') }}">

<x-form action="{{ route('admin.2fa-setup.update') }}">
<x-form.input name="secretKey" type="hidden">{{ $secretKey }}</x-form.input>

<x-form.input name="secretKey" type="hidden">{{ $secretKey }}</x-form.input>
<x-form.input name="code" :label="__('Code')">{{ old('code') }}</x-form.input>

<x-form.input name="code" :label="__('Code')">{{ old('code') }}</x-form.input>
<p><button class="justify-center w-full btn btn-primary">{{ __('Verify Code') }}</button></p>

<p><button class="justify-center w-full btn btn-primary">{{ __('Verify Code') }}</button></p>
<p><a href="{{ route('logout') }}" class="float-right">{{ __('Logout') }}</a></p>

<p><a href="{{ route('logout') }}" class="float-right">{{ __('Logout') }}</a></p>
</x-form>

</x-form>
</x-auth-card>
</x-guest-layout>
34 changes: 18 additions & 16 deletions resources/views/auth/verify-email.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<x-guest-layout>
@section('title', __('Verify Email'))

@section('title', __('Verify Email'))
<x-guest-layout>
<x-auth-card>

<div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
{{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }}
</div>

@if (session('status') == 'verification-link-sent')
<div class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
{{ __('A new verification link has been sent to the email address you provided during registration.') }}
</div>
@endif

<div class="mt-4 flex items-center justify-between">
<x-form action="{{ route('verification.send') }}">
<x-form.submit>{{ __('Resend Verification Email') }}</x-form.submit>
</x-form>
@if (session('status') === 'verification-link-sent')
<div class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
{{ __('A new verification link has been sent to the email address you provided during registration.') }}
</div>
@endif

<div class="mt-4 flex items-center justify-between">
<x-form action="{{ route('verification.send') }}">
<x-form.submit>{{ __('Resend Verification Email') }}</x-form.submit>
</x-form>

<x-form action="{{ route('logout') }}">
<x-form.submit>{{ __('Log Out') }}</x-form.submit>
</x-form>
</div>

<x-form action="{{ route('logout') }}">
<x-form.submit>{{ __('Log Out') }}</x-form.submit>
</x-form>
</div>
</x-auth-card>
</x-guest-layout>
2 changes: 1 addition & 1 deletion resources/views/layouts/guest.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>@yield('title') - {{ config('app.name', 'Laravel') }}</title>
@vite(['resources/sass/app.scss', 'resources/js/app.js'])
</head>
<body class="font-sans text-gray-900 antialiased">
<body class="dark font-sans text-gray-900 antialiased">
<div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
<div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg">
{{ $slot }}
Expand Down
6 changes: 3 additions & 3 deletions resources/views/welcome.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<main class="mx-auto max-w-screen-xl px-4 sm:mt-12 sm:px-6 md:mt-15 mb-10">
<div class="text-center">

<h2 class="text-4xl tracking-tight leading-10 font-extrabold text-gray-900 sm:text-5xl sm:leading-none md:text-6xl">
<span class="text-blue-500">{{ config('app.name') }}</span>
</h2>
<h1 class="text-6xl">
{{ config('app.name') }}
</h1>

</div>
</main>
Expand Down

0 comments on commit 71b303c

Please sign in to comment.