Change flash message feature to noty.js

Remove laracasts/flash package

app/Http/Controllers/Invoices/DraftsController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers\Invoices;
 
+use Illuminate\Http\Request;
 use App\Entities\Projects\Project;
 use App\Http\Controllers\Controller;
+use App\Services\InvoiceDrafts\Item;
 use App\Services\InvoiceDrafts\InvoiceDraft;
 use App\Services\InvoiceDrafts\InvoiceDraftCollection;
-use App\Services\InvoiceDrafts\Item;
-use Illuminate\Http\Request;
 
 /**
  * Invoice Drafts Controller.
@@ -143,7 +143,7 @@ class DraftsController extends Controller
         $draft = $this->draftCollection->updateDraftAttributes($draftKey, $invoiceData);
 
         if ($draft->getItemsCount() == 0) {
-            flash(trans('invoice.item_list_empty'), 'warning')->important();
+            flash(trans('invoice.item_list_empty'), 'warning');
 
             return redirect()->route('invoice-drafts.show', [$draftKey]);
         }
@@ -160,7 +160,7 @@ class DraftsController extends Controller
 
         $invoice = $draft->store();
         $draft->destroy();
-        flash(trans('invoice.created', ['number' => $invoice->number]), 'success')->important();
+        flash(trans('invoice.created', ['number' => $invoice->number]), 'success');
 
         return redirect()->route('invoices.show', $invoice->number);
     }

app/helpers.php

@@ -200,3 +200,21 @@ function monthDateArray($year, $month)
 
     return $dates;
 }
+
+/**
+ * Function helper to add flash notification.
+ *
+ * @param null|string $message The flashed message.
+ * @param string      $level   Level/type of message
+ *
+ * @return void
+ */
+function flash($message = null, $level = 'info')
+{
+    $session = app('session');
+
+    if (!is_null($message)) {
+        $session->flash('flash_notification.message', $message);
+        $session->flash('flash_notification.level', $level);
+    }
+}

composer.json

@@ -8,7 +8,6 @@
         "php": ">=7.0.0",
         "backup-manager/laravel": "^1.2",
         "guzzlehttp/guzzle": "^6.3",
-        "laracasts/flash": "~2",
         "laracasts/presenter": "^0.2.1",
         "laravel/framework": "5.5.*",
         "luthfi/formfield": "^0.2.7",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "fbbbce942b136e9658949c3791b65695",
+    "content-hash": "ce794c0f3010842685536b7dc4c2b7f2",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -541,49 +541,6 @@
             "time": "2017-03-20T17:10:46+00:00"
         },
         {
-            "name": "laracasts/flash",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laracasts/flash.git",
-                "reference": "03eec812fd6ae948664ff51b4320785f6d15ee5d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laracasts/flash/zipball/03eec812fd6ae948664ff51b4320785f6d15ee5d",
-                "reference": "03eec812fd6ae948664ff51b4320785f6d15ee5d",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "~5.0",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "dev-master"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Laracasts\\Flash": "src/"
-                },
-                "files": [
-                    "src/Laracasts/Flash/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jeffrey Way",
-                    "email": "jeffrey@laracasts.com"
-                }
-            ],
-            "description": "Easy flash notifications",
-            "time": "2016-07-11T20:46:02+00:00"
-        },
-        {
             "name": "laracasts/presenter",
             "version": "0.2.1",
             "source": {

config/app.php

@@ -173,8 +173,6 @@ return [
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
-        Laracasts\Flash\FlashServiceProvider::class,
     ],
 
     /*

resources/views/auth/login.blade.php

@@ -3,7 +3,7 @@
 @section('title', __('auth.login'))
 
 @section('content')
-@include('flash::message')
+
 <div class="login-panel col-md-4 col-md-offset-4 text-center">
     {!! appLogoImage() !!}
     <h3>{{ config('app.name') }}</h3>

resources/views/layouts/app.blade.php

@@ -18,7 +18,6 @@
         @include('layouts.partials.sidebar')
 
         <div id="page-wrapper">
-            @include('flash::message')
             <div class="container-fluid">
                 @yield('content')
             </div>
@@ -31,6 +30,7 @@
 
     {!! Html::script(url('assets/js/jquery.js')) !!}
     {!! Html::script(url('assets/js/bootstrap.min.js')) !!}
+    @include('layouts.partials.noty')
     {!! Html::script(url('assets/js/plugins/metisMenu/metisMenu.min.js')) !!}
     @yield('ext_js')
     {!! Html::script(url('assets/js/sb-admin-2.js')) !!}

resources/views/layouts/guest.blade.php

@@ -22,6 +22,7 @@
 
     {!! Html::script(url('assets/js/jquery.js')) !!}
     {!! Html::script(url('assets/js/bootstrap.min.js')) !!}
+    @include('layouts.partials.noty')
     @yield('ext_js')
 
     <script type="text/javascript">

resources/views/layouts/partials/noty.blade.php

@@ -0,0 +1,17 @@
+@if(Session::has('flash_notification.message'))
+@php
+    $level = Session::get('flash_notification.level');
+    if ($level == 'info') {
+        $level = 'information';
+    }
+@endphp
+<script src="{{ asset('assets/js/plugins/noty.js') }}"></script>
+<script>
+    noty({
+        type: '{{ $level }}',
+        layout: 'bottomRight',
+        text: '{{ Session::get('flash_notification.message') }}',
+        timeout: 3000
+    });
+</script>
+@endif

resources/views/vendor/flash/message.blade.php

@@ -1,10 +0,0 @@
-@if (Session::has('flash_notification.message'))
-    @if (Session::has('flash_notification.overlay'))
-        @include('flash::modal', ['modalClass' => 'flash-modal', 'title' => Session::get('flash_notification.title'), 'body' => Session::get('flash_notification.message')])
-    @else
-        <div class="alert alert-{{ Session::get('flash_notification.level') }} notifier text-center">
-            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-            {{ Session::get('flash_notification.message') }}
-        </div>
-    @endif
-@endif

resources/views/vendor/flash/modal.blade.php

@@ -1,19 +0,0 @@
-<div id="flash-overlay-modal" class="modal fade {{ $modalClass or '' }}">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-
-                <h4 class="modal-title">{{ $title }}</h4>
-            </div>
-
-            <div class="modal-body">
-                <p>{{ $body }}</p>
-            </div>
-
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>