Skip to content

Commit 0992d4c

Browse files
michaeldyryndamichaeldyrynda
committed
Merge branch 'feat/new-design' into main
2 parents 438d543 + 0aeba7f commit 0992d4c

18 files changed

+385
-351
lines changed

‎composer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
22
"name": "laravel-frontend-presets/tailwindcss",
33
"description": "Laravel frontend preset for Tailwind CSS",
4-
"keywords": ["laravel", "preset", "tailwindcss"],
4+
"keywords": [
5+
"laravel",
6+
"preset",
7+
"tailwindcss"
8+
],
59
"license": "MIT",
610
"require": {
7-
"laravel/framework": "^7.0|^8.0",
11+
"laravel/framework": "^8.0",
812
"laravel/ui": "^2.0"
913
},
1014
"autoload": {

‎screenshots/confirm-password.png

72.5 KB
Loading

‎screenshots/dashboard.png

-8.15 KB
Loading

‎screenshots/login.png

-9.35 KB
Loading

‎screenshots/register.png

-8.06 KB
Loading

‎screenshots/reset-password.png

-9.14 KB
Loading

‎screenshots/verify.png

-7.13 KB
Loading

‎screenshots/welcome.png

-9.66 KB
Loading

‎src/TailwindCssPreset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected static function scaffoldAuth()
9999

100100
file_put_contents(
101101
base_path('routes/web.php'),
102-
"Auth::routes();\n\nRoute::get('/home', 'HomeController@index')->name('home');\n\n",
102+
"Auth::routes();\n\nRoute::get('/home', [\App\Http\Controllers\HomeController::class, 'index'])->name('home');\n\n",
103103
FILE_APPEND
104104
);
105105

‎src/tailwindcss-stubs/resources/views/auth/login.blade.php

Lines changed: 65 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,84 @@
11
@extends('layouts.app')
22

33
@section('content')
4-
<div class="container mx-auto">
5-
<div class="flex flex-wrap justify-center">
6-
<div class="w-full max-w-sm">
7-
<div class="flex flex-col break-words bg-white border-2 rounded shadow-md">
4+
<main class="sm:container sm:mx-auto sm:max-w-lg sm:mt-10">
5+
<div class="flex">
6+
<div class="w-full">
7+
<section class="flex flex-col break-words bg-white sm:border-1 sm:rounded-md sm:shadow-sm sm:shadow-lg">
88

9-
<div class="font-semibold bg-gray-200 text-gray-700 py-3 px-6 mb-0">
10-
{{ __('Login') }}
11-
</div>
9+
<header class="font-semibold bg-gray-200 text-gray-700 py-5 px-6 sm:py-6 sm:px-8 sm:rounded-t-md">
10+
{{ __('Login') }}
11+
</header>
1212

13-
<form class="w-full p-6" method="POST" action="{{ route('login') }}">
14-
@csrf
13+
<form class="w-full px-6 space-y-6 sm:px-10 sm:space-y-8" method="POST" action="{{ route('login') }}">
14+
@csrf
1515

16-
<div class="flex flex-wrap mb-6">
17-
<label for="email" class="block text-gray-700 text-sm font-bold mb-2">
18-
{{ __('E-Mail Address') }}:
19-
</label>
16+
<div class="flex flex-wrap">
17+
<label for="email" class="block text-gray-700 text-sm font-bold mb-2 sm:mb-4">
18+
{{ __('E-Mail Address') }}:
19+
</label>
2020

21-
<input id="email" type="email" class="form-input w-full @error('email') border-red-500 @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
21+
<input id="email" type="email"
22+
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
23+
value="{{ old('email') }}" required autocomplete="email" autofocus>
2224

23-
@error('email')
24-
<p class="text-red-500 text-xs italic mt-4">
25-
{{ $message }}
26-
</p>
27-
@enderror
28-
</div>
25+
@error('email')
26+
<p class="text-red-500 text-xs italic mt-4">
27+
{{ $message }}
28+
</p>
29+
@enderror
30+
</div>
2931

30-
<div class="flex flex-wrap mb-6">
31-
<label for="password" class="block text-gray-700 text-sm font-bold mb-2">
32-
{{ __('Password') }}:
33-
</label>
32+
<div class="flex flex-wrap">
33+
<label for="password" class="block text-gray-700 text-sm font-bold mb-2 sm:mb-4">
34+
{{ __('Password') }}:
35+
</label>
3436

35-
<input id="password" type="password" class="form-input w-full @error('password') border-red-500 @enderror" name="password" required>
37+
<input id="password" type="password"
38+
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
39+
required>
3640

37-
@error('password')
38-
<p class="text-red-500 text-xs italic mt-4">
39-
{{ $message }}
40-
</p>
41-
@enderror
42-
</div>
41+
@error('password')
42+
<p class="text-red-500 text-xs italic mt-4">
43+
{{ $message }}
44+
</p>
45+
@enderror
46+
</div>
4347

44-
<div class="flex mb-6">
45-
<label class="inline-flex items-center text-sm text-gray-700" for="remember">
46-
<input type="checkbox" name="remember" id="remember" class="form-checkbox" {{ old('remember') ? 'checked' : '' }}>
47-
<span class="ml-2">{{ __('Remember Me') }}</span>
48-
</label>
49-
</div>
48+
<div class="flex items-center">
49+
<label class="inline-flex items-center text-sm text-gray-700" for="remember">
50+
<input type="checkbox" name="remember" id="remember" class="form-checkbox"
51+
{{ old('remember') ? 'checked' : '' }}>
52+
<span class="ml-2">{{ __('Remember Me') }}</span>
53+
</label>
5054

51-
<div class="flex flex-wrap items-center">
52-
<button type="submit" class="bg-blue-500 hover:bg-blue-700 text-gray-100 font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline">
53-
{{ __('Login') }}
54-
</button>
55+
@if (Route::has('password.request'))
56+
<a class="text-sm text-blue-500 hover:text-blue-700 whitespace-no-wrap no-underline hover:underline ml-auto"
57+
href="{{ route('password.request') }}">
58+
{{ __('Forgot Your Password?') }}
59+
</a>
60+
@endif
61+
</div>
5562

56-
@if (Route::has('password.request'))
57-
<a class="text-sm text-blue-500 hover:text-blue-700 whitespace-no-wrap no-underline ml-auto" href="{{ route('password.request') }}">
58-
{{ __('Forgot Your Password?') }}
59-
</a>
60-
@endif
63+
<div class="flex flex-wrap">
64+
<button type="submit"
65+
class="w-full select-none font-bold whitespace-no-wrap p-3 rounded-lg text-base leading-normal no-underline text-gray-100 bg-blue-500 hover:bg-blue-700 sm:py-4">
66+
{{ __('Login') }}
67+
</button>
6168

62-
@if (Route::has('register'))
63-
<p class="w-full text-xs text-center text-gray-700 mt-8 -mb-4">
64-
{{ __("Don't have an account?") }}
65-
<a class="text-blue-500 hover:text-blue-700 no-underline" href="{{ route('register') }}">
66-
{{ __('Register') }}
67-
</a>
68-
</p>
69-
@endif
70-
</div>
71-
</form>
69+
@if (Route::has('register'))
70+
<p class="w-full text-xs text-center text-gray-700 my-6 sm:text-sm sm:my-8">
71+
{{ __("Don't have an account?") }}
72+
<a class="text-blue-500 hover:text-blue-700 no-underline hover:underline" href="{{ route('register') }}">
73+
{{ __('Register') }}
74+
</a>
75+
</p>
76+
@endif
77+
</div>
78+
</form>
7279

73-
</div>
74-
</div>
80+
</section>
7581
</div>
7682
</div>
83+
</main>
7784
@endsection

‎src/tailwindcss-stubs/resources/views/auth/passwords/confirm.blade.php

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
@extends('layouts.app')
22

33
@section('content')
4-
<div class="container mx-auto">
5-
<div class="flex flex-wrap justify-center">
6-
<div class="w-full max-w-sm">
7-
<div class="flex flex-col break-words bg-white border-2 rounded shadow-md">
8-
9-
<div class="font-semibold bg-gray-200 text-gray-700 py-3 px-6 mb-0">
10-
{{ __('Confirm Password') }}
4+
<main class="sm:container sm:mx-auto sm:max-w-lg sm:mt-10">
5+
<div class="flex">
6+
<div class="w-full">
7+
<section class="flex flex-col break-words bg-white sm:border-1 sm:rounded-md sm:shadow-sm sm:shadow-lg">
8+
9+
<header class="font-semibold bg-gray-200 text-gray-700 py-5 px-6 sm:py-6 sm:px-8 sm:rounded-t-md">
10+
{{ __('Confirm Password') }}
11+
</header>
12+
13+
<form class="w-full px-6 space-y-6 sm:px-10 sm:space-y-8" method="POST" action="{{ route('password.confirm') }}">
14+
@csrf
15+
16+
<p class="leading-normal text-gray-500">
17+
{{ __('Please confirm your password before continuing.') }}
18+
</p>
19+
20+
<div class="flex flex-wrap">
21+
<label for="password" class="block text-gray-700 text-sm font-bold mb-2 sm:mb-4">
22+
{{ __('Password') }}:
23+
</label>
24+
25+
<input id="password" type="password"
26+
class="form-input w-full @error('password') border-red-500 @enderror" name="password"
27+
required autocomplete="new-password">
28+
29+
@error('password')
30+
<p class="text-red-500 text-xs italic mt-4">
31+
{{ $message }}
32+
</p>
33+
@enderror
1134
</div>
1235

13-
<form class="w-full p-6" method="POST" action="{{ route('password.confirm') }}">
14-
@csrf
15-
16-
<p class="leading-normal">
17-
{{ __('Please confirm your password before continuing.') }}
18-
</p>
36+
<div class="flex flex-wrap justify-center items-center space-y-6 pb-6 sm:pb-10 sm:space-y-0 sm:justify-between">
37+
<button type="submit"
38+
class="w-full select-none font-bold whitespace-no-wrap p-3 rounded-lg text-base leading-normal no-underline text-gray-100 bg-blue-500 hover:bg-blue-700 sm:w-auto sm:px-4 sm:order-1">
39+
{{ __('Confirm Password') }}
40+
</button>
41+
42+
@if (Route::has('password.request'))
43+
<a class="mt-4 text-xs text-blue-500 hover:text-blue-700 whitespace-no-wrap no-underline hover:underline sm:text-sm sm:order-0 sm:m-0"
44+
href="{{ route('password.request') }}">
45+
{{ __('Forgot Your Password?') }}
46+
</a>
47+
@endif
48+
</div>
49+
</form>
1950

20-
<div class="flex flex-wrap my-6">
21-
<label for="password" class="block text-gray-700 text-sm font-bold mb-2">
22-
{{ __('Password') }}:
23-
</label>
24-
25-
<input id="password" type="password" class="form-input w-full @error('password') border-red-500 @enderror" name="password" required autocomplete="new-password">
26-
27-
@error('password')
28-
<p class="text-red-500 text-xs italic mt-4">
29-
{{ $message }}
30-
</p>
31-
@enderror
32-
</div>
33-
34-
<div class="flex flex-wrap items-center">
35-
<button type="submit" class="bg-blue-500 hover:bg-blue-700 text-gray-100 font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline">
36-
{{ __('Confirm Password') }}
37-
</button>
38-
39-
@if (Route::has('password.request'))
40-
<a class="text-sm text-blue-500 hover:text-blue-700 whitespace-no-wrap no-underline ml-auto" href="{{ route('password.request') }}">
41-
{{ __('Forgot Your Password?') }}
42-
</a>
43-
@endif
44-
</div>
45-
</form>
46-
47-
</div>
48-
</div>
51+
</section>
4952
</div>
5053
</div>
54+
</main>
5155
@endsection

‎src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
11
@extends('layouts.app')
22

33
@section('content')
4-
<div class="container mx-auto">
5-
<div class="flex flex-wrap justify-center">
6-
<div class="w-full max-w-sm">
7-
8-
@if (session('status'))
9-
<div class="text-sm border border-t-8 rounded text-green-700 border-green-600 bg-green-100 px-3 py-4 mb-4" role="alert">
10-
{{ session('status') }}
4+
<main class="sm:container sm:mx-auto sm:max-w-lg sm:mt-10">
5+
<div class="flex">
6+
<div class="w-full">
7+
8+
@if (session('status'))
9+
<div class="text-sm text-green-700 bg-green-100 px-5 py-6 sm:rounded sm:border sm:border-green-400 sm:mb-6"
10+
role="alert">
11+
{{ session('status') }}
12+
</div>
13+
@endif
14+
15+
<section class="flex flex-col break-words bg-white sm:border-1 sm:rounded-md sm:shadow-sm sm:shadow-lg">
16+
<header class="font-semibold bg-gray-200 text-gray-700 py-5 px-6 sm:py-6 sm:px-8 sm:rounded-t-md">
17+
{{ __('Reset Password') }}
18+
</header>
19+
20+
<form class="w-full px-6 space-y-6 sm:px-10 sm:space-y-8" method="POST" action="{{ route('password.email') }}">
21+
@csrf
22+
23+
<div class="flex flex-wrap">
24+
<label for="email" class="block text-gray-700 text-sm font-bold mb-2 sm:mb-4">
25+
{{ __('E-Mail Address') }}:
26+
</label>
27+
28+
<input id="email" type="email"
29+
class="form-input w-full @error('email') border-red-500 @enderror" name="email"
30+
value="{{ old('email') }}" required autocomplete="email" autofocus>
31+
32+
@error('email')
33+
<p class="text-red-500 text-xs italic mt-4">
34+
{{ $message }}
35+
</p>
36+
@enderror
1137
</div>
12-
@endif
13-
14-
<div class="flex flex-col break-words bg-white border-2 rounded shadow-md">
1538

16-
<div class="font-semibold bg-gray-200 text-gray-700 py-3 px-6 mb-0">
17-
{{ __('Reset Password') }}
39+
<div class="flex flex-wrap justify-center items-center space-y-6 pb-6 sm:pb-10 sm:space-y-0 sm:justify-between">
40+
<button type="submit"
41+
class="w-full select-none font-bold whitespace-no-wrap p-3 rounded-lg text-base leading-normal no-underline text-gray-100 bg-blue-500 hover:bg-blue-700 sm:w-auto sm:px-4 sm:order-1">
42+
{{ __('Send Password Reset Link') }}
43+
</button>
44+
45+
<p class="mt-4 text-xs text-blue-500 hover:text-blue-700 whitespace-no-wrap no-underline hover:underline sm:text-sm sm:order-0 sm:m-0">
46+
<a class="text-blue-500 hover:text-blue-700 no-underline" href="{{ route('login') }}">
47+
{{ __('Back to login') }}
48+
</a>
49+
</p>
1850
</div>
19-
20-
<form class="w-full p-6" method="POST" action="{{ route('password.email') }}">
21-
@csrf
22-
23-
<div class="flex flex-wrap mb-6">
24-
<label for="email" class="block text-gray-700 text-sm font-bold mb-2">
25-
{{ __('E-Mail Address') }}:
26-
</label>
27-
28-
<input id="email" type="email" class="form-input w-full @error('email') border-red-500 @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
29-
30-
@error('email')
31-
<p class="text-red-500 text-xs italic mt-4">
32-
{{ $message }}
33-
</p>
34-
@enderror
35-
</div>
36-
37-
<div class="flex flex-wrap">
38-
<button type="submit" class="bg-blue-500 hover:bg-blue-700 text-gray-100 font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline">
39-
{{ __('Send Password Reset Link') }}
40-
</button>
41-
42-
<p class="w-full text-xs text-center text-gray-700 mt-8 -mb-4">
43-
<a class="text-blue-500 hover:text-blue-700 no-underline" href="{{ route('login') }}">
44-
{{ __('Back to login') }}
45-
</a>
46-
</p>
47-
</div>
48-
</form>
49-
</div>
50-
</div>
51+
</form>
52+
</section>
5153
</div>
5254
</div>
55+
</main>
5356
@endsection

0 commit comments

Comments
 (0)