Merge pull request #9 from andela-sachungo/develop

Added alerts

app/Http/Controllers/Auth/SocialAuthController.php

@@ -38,6 +38,8 @@ public function handleProviderCallback($provider)
         $authUser = $this->findOrCreateUser($user);
         Auth::login($authUser, true);
 
+        flash('Welcome', 'Thank you for logging in and/or signing up!');
+
         return redirect()->route('dashboard');
     }
 

app/Http/Controllers/CategoryController.php

@@ -13,33 +13,7 @@ class CategoryController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('auth', [
-            'except' => [
-                'getVideosByCategory',
-                ],
-            ]);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    /*public function index()
-    {
-        $categories = Categories::all();
-
-        return view('categories.index')->with('categories', $categories);
-    }*/
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        return view('categories.create');
+        $this->middleware('auth');
     }
 
     /**
@@ -55,7 +29,7 @@ public function store(CategoriesRequest $request)
             'title' => $request->title,
         ]);
 
-        // FLASH MESSAGE
+        flash()->success('Category Added', 'You have created a new category!');
 
         return redirect()->back();
     }
@@ -87,7 +61,8 @@ public function update(CategoriesRequest $request, $id)
             'title' => $request->title,
             ]);
 
-        // FLASH MESSAGE
+        flash()->success('Update successful!', 'The category has been updated.');
+
         return redirect()->route('own.categories');
     }
 
@@ -103,11 +78,14 @@ public function destroy($id)
         if ($category) {
             Categories::destroy($id);
 
+            flash()->success('Deleted', 'The category has been deleted!');
+
             return redirect()->back();
         }
 
-        // REDIRECT WITH MESSAGE CATEGORY NOT FOUND
-        return redirect()->route('dashboard');
+        flash()->error('Not Found', 'The category do not exist!');
+
+        return redirect()->route('own.categories');
     }
 
     /**

app/Http/Controllers/HomeController.php

@@ -14,7 +14,9 @@ class HomeController extends Controller
     public function login()
     {
         if (auth()->user()) {
-            return view('dashboard.index');
+            flash('Logged In', 'You are already logged in');
+
+            return redirect()->route('dashboard');
         }
 
         return view('auth.login');

app/Http/Controllers/ProfileController.php

@@ -44,7 +44,8 @@ public function update(ProfileRequest $request, $id)
                 'email' => $request->email,
             ]);
 
-        // FLASH MESSAGE
+        flash()->success('Profile Updated', 'You have updated your profile!');
+
         return redirect()->route('dashboard');
     }
 

app/Http/Controllers/VideoController.php

@@ -70,9 +70,9 @@ public function store(VideoRequest $request)
             'description' => $request->description,
             ]);
 
-        // FLASH MESSAGE
+        flash()->success('Success!', 'You have uploaded a video');
 
-        return redirect()->route('dashboard');
+        return redirect()->route('own.videos');
     }
 
     /**
@@ -120,7 +120,8 @@ public function update(VideoRequest $request, $id)
             'description' => $request->description,
             ]);
 
-        // FLASH MESSAGE
+        flash()->success('Video Updated', 'You have updated a video!');
+
         return redirect()->route('own.videos');
     }
 
@@ -135,11 +136,13 @@ public function destroy($id)
         $video = Videos::find($id);
         if ($video) {
             Videos::destroy($id);
+            flash()->success('Deleted', 'The video has been deleted!');
 
-            return redirect()->route('dashboard');
+            return redirect()->route('own.videos');
         }
 
-        // REDIRECT WITH MESSAGE VIDEO NOT FOUND
+        flash()->error('Not Found', 'The video do not exist!');
+
         return redirect()->route('dashboard');
     }
 

app/Http/Flash.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Soma\Http;
+
+class Flash
+{
+    /**
+     * Create a flash message.
+     *
+     * @param  string  $title
+     * @param  string  $message
+     * @param  string  $key
+     * @return void
+     */
+    public function createFlash($title, $message, $type, $key = 'flash_message')
+    {
+        // Flash is HTTP specific hence no need to inject the Session::store()
+        session()->flash($key, [
+                'title' => $title,
+                'message' => $message,
+                'type' => $type,
+        ]);
+    }
+
+    /**
+     * Create an info  flash message.
+     *
+     * @param  string  $title
+     * @param  string  $message
+     * @return void
+     */
+    public function info($title, $message)
+    {
+        return $this->createFlash($title, $message, 'info');
+    }
+
+    /**
+     * Create a success flash message.
+     *
+     * @param  string  $title
+     * @param  string  $message
+     * @return void
+     */
+    public function success($title, $message)
+    {
+        return $this->createFlash($title, $message, 'success');
+    }
+
+    /**
+     * Create an error  flash message.
+     *
+     * @param  string  $title
+     * @param  string  $message
+     * @return void
+     */
+    public function error($title, $message)
+    {
+        return $this->createFlash($title, $message, 'error');
+    }
+}

app/Http/routes.php

@@ -69,7 +69,7 @@
 Route::resource(
     'category',
     'CategoryController',
-    ['except' => ['show', 'index']]
+    ['except' => ['show', 'index', 'create']]
 );
 
 // Profile route

app/helpers.php

@@ -1 +1,21 @@
+<?php
+/**
+ * A global helper function for creating flash messages using sweet alert.
+ *
+ * The app helper function grabs the Flash instance from the container.
+ * If the flash() function is called with no arguments, return the other
+ * methods in the Flash class, e.g., success(), else return the info
+ * method.
+ *
+ * @return void
+ */
+function flash($title = null, $message = null)
+{
+    $flash = app('Soma\Http\Flash');
 
+    if (func_num_args() == 0) {
+        return $flash;
+    }
+
+    return $flash->info($title, $message);
+}