Merge pull request #11 from DanielRTRD/patch-3

Unsubscribing

Author: neoighodaro

resources/lang/en/mail.php

@@ -12,6 +12,8 @@
         'subject' => 'Early access to :name',
         'message' => [
             'intro' => 'Thanks for requesting early access to :name! We will email you with more information when we are ready to have you try it out.',
+            'share' => 'Want to share our project with the world? Please help us reach more people by sharing on Twitter: :url',
+            'unsubscribe' => 'Unsubscribe from emails',
         ],
     ],
     'unsubscribed' => [

resources/lang/en/messages.php

@@ -16,4 +16,15 @@
     'no_spam' => 'No spam mail. We promise.',
     'welcome' => 'Welcome to :name',
     'twitter_share_text' => '.@:handle is coming soon. Request early access to be one of the first people to try it out :url #:handle',
+
+    'unsubscribe' => [
+        'title' => 'Unsubscribe from :name',
+        'description' => 'We\'re sorry to se you go. Please confirm with your email.',
+        'button' => 'Unsubscribe',
+        'alerts' => [
+            'error' => 'An error occurred. Please try again.',
+            'success' => 'You have been successfully unsubscribed.',
+        ],
+
+    ],
 ];

resources/views/unsubscribe.blade.php

@@ -0,0 +1,59 @@
+@extends('early-access::layouts.main')
+
+@section('content')
+    <div class="container flex flex-col md:flex-row items-center justify-between">
+        <div class="md:pr-5 lg:pr-10 md:w-2/5">
+            <div class="text-center md:text-left">
+                <h1 class="text-3xl lg:text-5xl text-indigo-darker font-logo font-medium uppercase leading-normal">
+                    @lang('early-access::messages.unsubscribe.title', ['name' => config('app.name')])
+                </h1>
+                <h4 class="text-base font-light leading-normal grey-soft">
+                    @lang('early-access::messages.unsubscribe.description', ['name' => config('app.name')])
+                </h4>
+            </div>
+            <div class="mt-10">
+                @if (session('success'))
+                    <div class="mb-2 p-3 rounded-lg bg-green-lightest text-sm text-green-dark font-medium"
+                         id="success-msg">
+                        @lang('early-access::messages.unsubscribe.alerts.success')
+                    </div>
+                @endif
+
+                @if ($errors->has('email') or session('error'))
+                    <div class="mb-2 p-3 rounded-lg bg-red-lightest text-sm text-grey-darker font-medium"
+                         id="error-msg">
+                        {{ $errors->has('email') ? $errors->first('email') : trans('early-access::messages.unsubscribe.alerts.error') }}
+                    </div>
+                @endif
+
+                <form action="{{ route('early-access.verify-unsubscription') }}" method="post">
+                    @method('delete')
+                    @csrf
+                    <div class="flex flex-col lg:flex-row font-light">
+                        <input required
+                               type="email"
+                               name="email"
+                               value="{{ old('email') }}"
+                               placeholder="@lang('early-access::common.email_address')"
+                               class="p-4 w-full lg:w-4/5 rounded-lg lg:rounded-r-none bg-grey-lighter focus:bg-grey-light focus:outline-none"
+                        />
+                        <button type="submit"
+                                class="mt-2 lg:mt-0 p-4 lg:px-0 w-full lg:w-2/5 rounded-lg lg:rounded-l-none bg-indigo-dark shadow-lg
+                                       lg:shadow-none text-sm text-white uppercase focus:outline-none"
+                        >
+                            @lang('early-access::messages.unsubscribe.button')<sup>&dagger;</sup>
+                        </button>
+                    </div>
+                </form>
+                <div class="mt-10">
+                    <span class="text-xs text-grey font-light tracking-wide">
+                        <sup>&dagger;</sup>@lang('early-access::messages.no_spam')
+                    </span>
+                </div>
+            </div>
+        </div>
+        <div class="mt-16 md:mt-0 md:pl-5 lg:pl-10 md:w-3/5 text-center md:text-left">
+            <img src="{{ asset('vendor/early-access/svg/placeholder.svg') }}" class="block"/>
+        </div>
+    </div>
+@endsection

routes/web.php

@@ -23,6 +23,9 @@
     Route::post($basePath, 'EarlyAccessController@subscribe')
         ->name('early-access.subscribe');
 
-    Route::delete($basePath, 'EarlyAccessController@unsubscribe')
+    Route::get("{$basePath}/unsubscribe", 'EarlyAccessController@unsubscribe')
         ->name('early-access.unsubscribe');
+
+    Route::delete("{$basePath}/unsubscribe", 'EarlyAccessController@verifyUnsubscription')
+        ->name('early-access.verify-unsubscription');
 }

src/Http/Controllers/EarlyAccessController.php

@@ -36,30 +36,42 @@ public function subscribe(Request $request)
             'name' => 'string|between:3,100',
         ]);
 
-        if (! $subscriber = Subscriber::make()->findByEmail($data['email'])) {
+        if (!$subscriber = Subscriber::make()->findByEmail($data['email'])) {
             $subscriber = Subscriber::make($data);
             $subscriber->subscribe();
         }
 
         return redirect()->route('early-access.index')->withSuccess(true);
     }
 
+    /**
+     * Show the early access page.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function unsubscribe()
+    {
+        $details = $this->getBeaconDetails();
+
+        return view('early-access::unsubscribe', compact('details'));
+    }
+
     /**
      * Unsubscribe.
      *
      * @param \Neo\EarlyAccess\Subscriber $subscriber
      * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function unsubscribe(Subscriber $subscriber, Request $request)
+    public function verifyUnsubscription(Subscriber $subscriber, Request $request)
     {
         $data = $request->validate(['email' => 'required|email']);
 
         $unsubscribed = with($subscriber->findByEmail($data['email']), function ($user) {
             return $user ? $user->unsubscribe() : false;
         });
 
-        return redirect()->route('early-access.index')->with([
+        return redirect()->route('early-access.unsubscribe')->with([
             ($unsubscribed ? 'success' : 'error') => true,
         ]);
     }

src/Notifications/UserSubscribed.php

@@ -47,6 +47,7 @@ public function toMail()
         return (new MailMessage)
             ->subject(trans('early-access::mail.subscribed.subject', ['name' => config('app.name')]))
             ->line(trans('early-access::mail.subscribed.message.intro', ['name' => config('app.name')]))
-            ->action('Share on Twitter', route('early-access.share'));
+            ->line(trans('early-access::mail.subscribed.message.share', ['url' => route('early-access.share')]))
+            ->action(trans('early-access::mail.subscribed.message.unsubscribe'), route('early-access.unsubscribe'));
     }
 }