Merge pull request #279 from bvipul/develop

Mailables and New Flash function

Author: bvipul

.env.example

@@ -1,4 +1,5 @@
 APP_NAME="Laravel Admin Panel"
+APP_SHORT_NAME="LAP"
 APP_ENV=local
 APP_KEY=base64:O+TrollIDwasHEREtMG9kBc+/Q32exQLusNVhnq558w=
 APP_DEBUG=true

app/Exceptions/GeneralException.php

@@ -9,4 +9,29 @@
  */
 class GeneralException extends Exception
 {
+    /**
+     * message.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * dontHide.
+     *
+     * @var bool
+     */
+    public $dontHide;
+
+    /**
+     * Constructor function.
+     *
+     * @param string $message
+     * @param bool   $dontHide
+     */
+    public function __construct($message, $dontHide = false)
+    {
+        $this->message = $message;
+        $this->dontHide = $dontHide;
+    }
 }

app/Exceptions/Handler.php

@@ -53,7 +53,6 @@ public function report(Exception $exception)
      */
     public function render($request, Exception $exception)
     {
-        //dd($exception);
         if (strpos($request->url(), '/api/') !== false) {
             \Log::debug('API Request Exception - '.$request->url().' - '.$exception->getMessage().(!empty($request->all()) ? ' - '.json_encode($request->except(['password'])) : ''));
 
@@ -112,6 +111,8 @@ public function render($request, Exception $exception)
          * All instances of GeneralException redirect back with a flash message to show a bootstrap alert-error
          */
         if ($exception instanceof GeneralException) {
+            session()->flash('dontHide', $exception->dontHide);
+
             return redirect()->back()->withInput()->withFlashDanger($exception->getMessage());
         }
 

app/Http/Controllers/Api/V1/PagesController.php

@@ -31,7 +31,7 @@ public function index(Request $request)
     {
         $limit = $request->get('paginate') ? $request->get('paginate') : 25;
         $orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
-        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
+        $sortBy = $request->get('sortBy') ? $request->get('sortBy') : config('module.pages.table', 'pages').'created_at';
 
         return PagesResource::collection(
             $this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)

app/Http/Controllers/Frontend/Auth/LoginController.php

@@ -21,7 +21,7 @@ class LoginController extends Controller
     use AuthenticatesUsers;
 
     /**
-     * @var CMSPagesRepository
+     * @var \App\Http\Utilities\PushNotification
      */
     protected $notification;
 
@@ -74,7 +74,7 @@ protected function authenticated(Request $request, $user)
         if (!$user->isConfirmed()) {
             access()->logout();
 
-            throw new GeneralException(trans('exceptions.frontend.auth.confirmation.resend', ['user_id' => $user->id]));
+            throw new GeneralException(trans('exceptions.frontend.auth.confirmation.resend', ['user_id' => $user->id]), true);
         } elseif (!$user->isActive()) {
             access()->logout();
 

app/Http/Controllers/Frontend/Auth/ResetPasswordController.php

@@ -95,11 +95,12 @@ protected function validationErrorMessages()
     /**
      * Get the response for a successful password reset.
      *
-     * @param string $response
+     * @param \Illuminate\Http\Request $request
+     * @param string                   $response
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetResponse($response)
+    protected function sendResetResponse($request, $response)
     {
         return redirect()->route(homeRoute())->withFlashSuccess(trans($response));
     }

app/Listeners/Frontend/Auth/UserEventListener.php

@@ -34,21 +34,6 @@ public function onRegistered($event)
         \Log::info('User Registered: '.$event->user->full_name);
     }
 
-    /**
-     * @param $event
-     */
-    /*public function onRegistered($event)
-    {
-        \Log::info('User Registered: '.$event->user->first_name);
-
-        // Send email to the user
-        $options = [
-                'data'                => $event->user,
-                'email_template_type' => 1,
-            ];
-        createNotification('', 1, 2, $options);
-    }*/
-
     /**
      * @param $event
      */

app/Models/Access/User/Traits/Attribute/UserAttribute.php

@@ -147,23 +147,22 @@ public function getStatusButtonAttribute($class)
             switch ($this->status) {
                 case 0:
                     if (access()->allow('activate-user')) {
-                        $name = $class == '' ? 'Active' : '';
+                        $name = $class == '' ? 'Activate' : '';
 
                         return '<a class="'.$class.'" href="'.route('admin.access.user.mark', [$this, 1]).'"><i class="fa fa-check-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.activate').'"></i>'.$name.'</a>';
                     }
-                // No break
+                    break;
 
                 case 1:
                     if (access()->allow('deactivate-user')) {
-                        $name = ($class == '') ? 'Deactive' : '';
+                        $name = ($class == '') ? 'Deactivate' : '';
 
                         return '<a class="'.$class.'" href="'.route('admin.access.user.mark', [$this, 0]).'"><i class="fa fa-square" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.backend.access.users.deactivate').'"></i>'.$name.'</a>';
                     }
-                // No break
+                    break;
 
                 default:
                     return '';
-                // No break
             }
         }
 

app/Notifications/Frontend/Auth/UserChangedPassword.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Notifications\Frontend\Auth;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+/**
+ * Class UserChangedPassword.
+ */
+class UserChangedPassword extends Notification
+{
+    use Queueable;
+
+    /**
+     * @var
+     */
+    protected $password;
+
+    /**
+     * UserChangedPassword constructor.
+     *
+     * @param $password
+     */
+    public function __construct($password)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param mixed $notifiable
+     *
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param \App\Models\Access\User\User $user
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($user)
+    {
+        return (new MailMessage())
+            ->view('emails.changed-password', ['password' => $this->password]);
+    }
+}

app/Notifications/Frontend/Auth/UserNeedsConfirmation.php

@@ -52,6 +52,6 @@ public function toMail($user)
         $confirmation_url = route('frontend.auth.account.confirm', $user->confirmation_code);
 
         return (new MailMessage())
-            ->view('emails.template', ['confirmation_url' => $confirmation_url]);
+            ->view('emails.user-confirmation', ['confirmation_url' => $confirmation_url]);
     }
 }