From a68a195e1ffd255d66bf7b8af9bf5c26c2474e63 Mon Sep 17 00:00:00 2001
From: atomjoy <atomjoy.official@gmail.com>
Date: Sun, 2 Jul 2023 15:59:29 +0200
Subject: [PATCH] Update

---
 README.md                                |  11 +-
 resources/views/components/row.blade.php |   2 +-
 resources/views/components/td.blade.php  |   2 +-
 resources/views/email/default.blade.php  | 157 ++++++++++-------------
 resources/views/email/password.blade.php |  90 ++++++-------
 resources/views/email/register.blade.php |  90 ++++++-------
 6 files changed, 158 insertions(+), 194 deletions(-)

diff --git a/README.md b/README.md
index de07d7b..96d87bc 100644
--- a/README.md
+++ b/README.md
@@ -20,20 +20,19 @@ use Proton\Mail\RegisterMail;
 use Proton\Mail\PasswordMail;
 
 Route::get('/proton', function () {
-  // Set locale
-  // app()->setLocale('pl');
-
   // User (required columns: id, name, code)
-  // $user = User::first();
+  $user = User::first();
 
   // Send email sample
   Mail::to('user@laravel.com')->send(new DefaultMail());
 
   // User reset password, use null for example
-  Mail::to('user@laravel.com')->send(new PasswordMail(null, 'XXX-123'));
+  Mail::to('user@laravel.com')->send(new PasswordMail($user, '321-XXX-123'));
+  Mail::to('user@laravel.com')->locale('pl')->send(new PasswordMail($user, '321-XXX-123'));
 
   // User activation link (User model required columns: id, name, code), use null for example
-  Mail::to('user@laravel.com')->send(new RegisterMail(null));
+  Mail::to('user@laravel.com')->send(new RegisterMail($user));
+  Mail::to('user@laravel.com')->locale('pl')->send(new RegisterMail($user));
 
   // Show example email view
   return view('proton::email.default');
diff --git a/resources/views/components/row.blade.php b/resources/views/components/row.blade.php
index 6fd1cb4..01ca790 100644
--- a/resources/views/components/row.blade.php
+++ b/resources/views/components/row.blade.php
@@ -4,7 +4,7 @@
 </x-proton.row>
 --}}
 <x-proton::tr>
-	<x-proton::td colspan="100">
+	<x-proton::td class="{{ $class ?? '' }}" colspan="{{ $colspan ?? 10 }}" style="{{ $style ?? '' }}">
 		{{ $slot }}
 	</x-proton::td>
 </x-proton::tr>
\ No newline at end of file
diff --git a/resources/views/components/td.blade.php b/resources/views/components/td.blade.php
index 53354c9..386536f 100644
--- a/resources/views/components/td.blade.php
+++ b/resources/views/components/td.blade.php
@@ -7,6 +7,6 @@
 	</x-proton.td>
 </x-proton.tr>
 --}}
-<td class="proton-td {{ $class ?? '' }}" colspan="{{ $colspan ?? 10}}" style="{{ $style ?? '' }}">
+<td class="proton-td {{ $class ?? '' }}" colspan="{{ $colspan ?? 10 }}" style="{{ $style ?? '' }}">
 	{{ $slot }}
 </td>
\ No newline at end of file
diff --git a/resources/views/email/default.blade.php b/resources/views/email/default.blade.php
index e2dc02c..330d332 100644
--- a/resources/views/email/default.blade.php
+++ b/resources/views/email/default.blade.php
@@ -7,69 +7,56 @@
 		</style>
 	</x-slot:style>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::margin />
+	<x-proton::row>
+		<x-proton::margin />
 
-			<center>
-				<img src="https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png" alt="Image">
-			</center>
-
-			<h2> Welcome {{ auth()->user()?->name ?? 'Alex' }}! </h2>
-			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus <a href="">go to site</a> . Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium
-				repudiandae!</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::button url="http://localhost">
-				Confirm Email
-			</x-proton::button>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<h2> Secret code </h2>
-			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus accusantium repudiandae!</p>
-
-			<x-proton::code>
-				KLE-6677-HJS-7866
-			</x-proton::code>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<h2> About company </h2>
-			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus. Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium repudiandae!</p>
-		</x-proton::td>
-	</x-proton::tr>
+		<center>
+			<img src="https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png" alt="Image">
+		</center>
+
+		<h2> Welcome {{ auth()->user()?->name ?? 'Alex' }}! </h2>
+		<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus <a href="">go to site</a> . Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium
+			repudiandae!</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::button url="http://localhost">
+			Confirm Email
+		</x-proton::button>
+	</x-proton::row>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<h2> Current promotions </h2>
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<h2> Secret code </h2>
+		<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus accusantium repudiandae!</p>
 
-	<x-proton::tr>
-		<x-proton::td colspan="3" style="padding-right: 10px;">
+		<x-proton::code>
+			KLE-6677-HJS-7866
+		</x-proton::code>
+	</x-proton::row>
+
+	<x-proton::row>
+		<h2> About company </h2>
+		<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus. Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium repudiandae!</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<h2> Current promotions </h2>
+	</x-proton::row>
+
+	<x-proton::row2>
+		<x-slot:slot1>
 			<img src="https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png" alt="Image">
 			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus. Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium repudiandae!</p>
-		</x-proton::td>
-
-		<x-proton::td colspan="3" style="padding-left: 10px;">
+		</x-slot:slot1>
+		<x-slot:slot2>
 			<img src="https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png" alt="Image">
 			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Vitae, architecto minus. Placeat sapiente perspiciatis illum corporis earum obcaecati illo mollitia inventore voluptatibus, ipsa, quasi quaerat dolorem commodi labore accusantium repudiandae!</p>
-		</x-proton::td>
-	</x-proton::tr>
+		</x-slot:slot2>
+	</x-proton::row2>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<h2> Gallery </h2>
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<h2> Gallery </h2>
+	</x-proton::row>
 
 	<x-proton::row2>
 		<x-slot:slot1>
@@ -97,11 +84,9 @@
 		</x-slot:slot2>
 	</x-proton::row2>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<h2> Links </h2>
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<h2> Links </h2>
+	</x-proton::row>
 
 	<x-proton::row3>
 		<x-slot:slot1>
@@ -121,32 +106,28 @@
 		</x-slot:slot3>
 	</x-proton::row3>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<br />
-			<h3> Regards </h3>
-			<p>Alex, <br /> Have a nice day!</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::divider />
-
-			<center>
-				<span class="proton-rights"> © @lang('proton.rights') </span>
-			</center>
-
-			<br />
-
-			<x-proton::flex>
-				<x-proton::social name="twitter" />
-				<x-proton::social name="tiktok" />
-				<x-proton::social name="facebook" />
-				<x-proton::social name="instagram" />
-			</x-proton::flex>
-
-			<x-proton::margin />
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<br />
+		<h3> Regards </h3>
+		<p>Alex, <br /> Have a nice day!</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::divider />
+
+		<center>
+			<span class="proton-rights"> © @lang('proton.rights') </span>
+		</center>
+
+		<br />
+
+		<x-proton::flex>
+			<x-proton::social name="twitter" />
+			<x-proton::social name="tiktok" />
+			<x-proton::social name="facebook" />
+			<x-proton::social name="instagram" />
+		</x-proton::flex>
+
+		<x-proton::margin />
+	</x-proton::row>
 </x-proton::email>
\ No newline at end of file
diff --git a/resources/views/email/password.blade.php b/resources/views/email/password.blade.php
index 669b66b..01371f4 100644
--- a/resources/views/email/password.blade.php
+++ b/resources/views/email/password.blade.php
@@ -7,53 +7,45 @@
 		</style>
 	</x-slot:style>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::margin />
-
-			<center>
-				<img src="{{ config('proton.password_image_url', 'https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png') }}" alt="Image">
-			</center>
-
-			<h2>@lang('proton.password.welcome') {{ $user?->name ?? 'User' }}!</h2>
-			<p>@lang('proton.password.message')</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::code>
-				{{ $password ?? 'INVALIDPASS'}}
-			</x-proton::code>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<h3>@lang('proton.password.regards_title')</h3>
-			<strong>{{ $user?->name ?? '' }}</strong>
-			<p>@lang('proton.password.regards_text')</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::divider />
-
-			<center>
-				<span class="proton-rights"> © @lang('proton.rights') </span>
-			</center>
-
-			<br />
-
-			<x-proton::flex>
-				<x-proton::social name="twitter" />
-				<x-proton::social name="tiktok" />
-				<x-proton::social name="facebook" />
-				<x-proton::social name="instagram" />
-			</x-proton::flex>
-
-			<x-proton::margin />
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<x-proton::margin />
+
+		<center>
+			<img src="{{ config('proton.password_image_url', 'https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png') }}" alt="Image">
+		</center>
+
+		<h2>@lang('proton.password.welcome') {{ $user?->name ?? 'User' }}!</h2>
+		<p>@lang('proton.password.message')</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::code>
+			{{ $password ?? 'INVALIDPASS'}}
+		</x-proton::code>
+	</x-proton::row>
+
+	<x-proton::row>
+		<h3>@lang('proton.password.regards_title')</h3>
+		<strong>{{ $user?->name ?? '' }}</strong>
+		<p>@lang('proton.password.regards_text')</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::divider />
+
+		<center>
+			<span class="proton-rights"> © @lang('proton.rights') </span>
+		</center>
+
+		<br />
+
+		<x-proton::flex>
+			<x-proton::social name="twitter" />
+			<x-proton::social name="tiktok" />
+			<x-proton::social name="facebook" />
+			<x-proton::social name="instagram" />
+		</x-proton::flex>
+
+		<x-proton::margin />
+	</x-proton::row>
 </x-proton::email>
\ No newline at end of file
diff --git a/resources/views/email/register.blade.php b/resources/views/email/register.blade.php
index 96bb0c1..afb5216 100644
--- a/resources/views/email/register.blade.php
+++ b/resources/views/email/register.blade.php
@@ -7,53 +7,45 @@
 		</style>
 	</x-slot:style>
 
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::margin />
-
-			<center>
-				<img src="{{ config('proton.register_image_url', 'https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png') }}" alt="Image">
-			</center>
-
-			<h2>@lang('proton.register.welcome') {{ $user?->name ?? 'User' }}!</h2>
-			<p>@lang('proton.register.message')</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::button url="{{ request()->getSchemeAndHttpHost() }}/activate/{{ $user?->id ?? '0' }}/{{ $user?->code ?? 'nocode' }}?locale={{ app()->getLocale() }}">
-				@lang('proton.register.button')
-			</x-proton::button>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<h3>@lang('proton.register.regards_title')</h3>
-			<strong>{{ $user?->name ?? '' }}</strong>
-			<p>@lang('proton.register.regards_text')</p>
-		</x-proton::td>
-	</x-proton::tr>
-
-	<x-proton::tr>
-		<x-proton::td>
-			<x-proton::divider />
-
-			<center>
-				<span class="proton-rights"> © @lang('proton.rights') </span>
-			</center>
-
-			<br />
-
-			<x-proton::flex>
-				<x-proton::social name="twitter" />
-				<x-proton::social name="tiktok" />
-				<x-proton::social name="facebook" />
-				<x-proton::social name="instagram" />
-			</x-proton::flex>
-
-			<x-proton::margin />
-		</x-proton::td>
-	</x-proton::tr>
+	<x-proton::row>
+		<x-proton::margin />
+
+		<center>
+			<img src="{{ config('proton.register_image_url', 'https://raw.githubusercontent.com/atomjoy/proton/main/public/proton-default.png') }}" alt="Image">
+		</center>
+
+		<h2>@lang('proton.register.welcome') {{ $user?->name ?? 'User' }}!</h2>
+		<p>@lang('proton.register.message')</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::button url="{{ request()->getSchemeAndHttpHost() }}/activate/{{ $user?->id ?? '0' }}/{{ $user?->code ?? 'nocode' }}?locale={{ app()->getLocale() }}">
+			@lang('proton.register.button')
+		</x-proton::button>
+	</x-proton::row>
+
+	<x-proton::row>
+		<h3>@lang('proton.register.regards_title')</h3>
+		<strong>{{ $user?->name ?? '' }}</strong>
+		<p>@lang('proton.register.regards_text')</p>
+	</x-proton::row>
+
+	<x-proton::row>
+		<x-proton::divider />
+
+		<center>
+			<span class="proton-rights"> © @lang('proton.rights') </span>
+		</center>
+
+		<br />
+
+		<x-proton::flex>
+			<x-proton::social name="twitter" />
+			<x-proton::social name="tiktok" />
+			<x-proton::social name="facebook" />
+			<x-proton::social name="instagram" />
+		</x-proton::flex>
+
+		<x-proton::margin />
+	</x-proton::row>
 </x-proton::email>
\ No newline at end of file