Merge pull request #10 from andela-sachungo/develop

(feature) Fixed the UI and added an about page
sachungo · Jan 15, 2016 · a7ca254 · a7ca254
2 parents 6c78635 + 94c2808
commit a7ca254
Show file tree

Hide file tree

Showing 25 changed files with 581 additions and 434 deletions.
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -59,10 +59,14 @@ protected function validator(array $data)
      */
     protected function create(array $data)
     {
-        return User::create([
+        $user = User::create([
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => bcrypt($data['password']),
         ]);
+
+        flash()->success('Welcome to soma-tech!', 'Thank you for being a member.');
+
+        return $user;
     }
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -41,4 +41,14 @@ public function dashboard()
     {
         return view('dashboard.index');
     }
+
+    /**
+     * Return the about view.
+     *
+     * @return view
+     */
+    public function about()
+    {
+        return view('about.about');
+    }
 }
diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php
@@ -20,10 +20,10 @@ public function __construct()
             'except' => [
                 'index',
                 'show',
+                'getVideosByCategory',
                 ],
             ]);
         $this->getCategories = Categories::all();
-        $this->user = auth()->user();
     }
 
     /**
@@ -64,7 +64,7 @@ public function store(VideoRequest $request)
         $link = $this->youtubeEmbedLink($request->youtube_link);
 
         $category->videos()->create([
-            'user_id' => $this->user->id,
+            'user_id' => auth()->user()->id,
             'youtube_link' => $link,
             'title' => $request->title,
             'description' => $request->description,

diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -16,6 +16,12 @@
     'as' => 'homepage',
 ]);
 
+// about page route
+Route::get('about', [
+    'uses' => 'HomeController@about',
+    'as' => 'aboutpage',
+]);
+
 // Authentication routes...
 Route::get('auth/login', [
     'uses' => 'HomeController@login',

diff --git a/build/logs/clover.xml b/build/logs/clover.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1452627258">
-  <project timestamp="1452627258">
+<coverage generated="1452839789">
+  <project timestamp="1452839789">
     <package name="Soma">
       <file name="/home/homestead/soma-tech/app/Categories.php">
         <class name="Categories" namespace="Soma">
@@ -85,7 +85,7 @@
       </file>
       <file name="/home/homestead/soma-tech/app/Http/Controllers/HomeController.php">
         <class name="HomeController" namespace="Soma\Http\Controllers">
-          <metrics methods="3" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="9" coveredelements="9"/>
+          <metrics methods="4" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="11" coveredelements="11"/>
         </class>
         <line num="14" type="method" name="login" crap="2" count="3"/>
         <line num="16" type="stmt" count="3"/>
@@ -96,7 +96,9 @@
         <line num="32" type="stmt" count="2"/>
         <line num="40" type="method" name="dashboard" crap="1" count="6"/>
         <line num="42" type="stmt" count="6"/>
-        <metrics loc="44" ncloc="29" classes="1" methods="3" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="9" coveredelements="9"/>
+        <line num="50" type="method" name="about" crap="1" count="1"/>
+        <line num="52" type="stmt" count="1"/>
+        <metrics loc="54" ncloc="34" classes="1" methods="4" coveredmethods="4" conditionals="0" coveredconditionals="0" statements="7" coveredstatements="7" elements="11" coveredelements="11"/>
       </file>
       <file name="/home/homestead/soma-tech/app/Http/Controllers/ProfileController.php">
         <class name="ProfileController" namespace="Soma\Http\Controllers">
@@ -208,17 +210,17 @@
         <class name="Flash" namespace="Soma\Http">
           <metrics methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="13" coveredelements="11"/>
         </class>
-        <line num="15" type="method" name="createFlash" crap="1" count="8"/>
-        <line num="18" type="stmt" count="8"/>
-        <line num="19" type="stmt" count="8"/>
-        <line num="20" type="stmt" count="8"/>
-        <line num="21" type="stmt" count="8"/>
-        <line num="22" type="stmt" count="8"/>
-        <line num="23" type="stmt" count="8"/>
+        <line num="15" type="method" name="createFlash" crap="1" count="9"/>
+        <line num="18" type="stmt" count="9"/>
+        <line num="19" type="stmt" count="9"/>
+        <line num="20" type="stmt" count="9"/>
+        <line num="21" type="stmt" count="9"/>
+        <line num="22" type="stmt" count="9"/>
+        <line num="23" type="stmt" count="9"/>
         <line num="32" type="method" name="info" crap="1" count="1"/>
         <line num="34" type="stmt" count="1"/>
-        <line num="44" type="method" name="success" crap="1" count="7"/>
-        <line num="46" type="stmt" count="7"/>
+        <line num="44" type="method" name="success" crap="1" count="8"/>
+        <line num="46" type="stmt" count="8"/>
         <line num="56" type="method" name="error" crap="2" count="0"/>
         <line num="58" type="stmt" count="0"/>
         <metrics loc="60" ncloc="29" classes="1" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="8" elements="13" coveredelements="11"/>
@@ -275,62 +277,66 @@
       </file>
     </package>
     <file name="/home/homestead/soma-tech/app/Http/routes.php">
-      <line num="14" type="stmt" count="22"/>
-      <line num="15" type="stmt" count="22"/>
-      <line num="16" type="stmt" count="22"/>
-      <line num="17" type="stmt" count="22"/>
-      <line num="20" type="stmt" count="22"/>
-      <line num="21" type="stmt" count="22"/>
-      <line num="22" type="stmt" count="22"/>
-      <line num="23" type="stmt" count="22"/>
-      <line num="25" type="stmt" count="22"/>
-      <line num="28" type="stmt" count="22"/>
-      <line num="29" type="stmt" count="22"/>
-      <line num="30" type="stmt" count="22"/>
-      <line num="31" type="stmt" count="22"/>
-      <line num="34" type="stmt" count="22"/>
-      <line num="35" type="stmt" count="22"/>
-      <line num="36" type="stmt" count="22"/>
-      <line num="37" type="stmt" count="22"/>
-      <line num="39" type="stmt" count="22"/>
-      <line num="42" type="stmt" count="22"/>
-      <line num="43" type="stmt" count="22"/>
-      <line num="44" type="stmt" count="22"/>
-      <line num="45" type="stmt" count="22"/>
-      <line num="47" type="stmt" count="22"/>
-      <line num="50" type="stmt" count="22"/>
-      <line num="51" type="stmt" count="22"/>
-      <line num="52" type="stmt" count="22"/>
-      <line num="53" type="stmt" count="22"/>
-      <line num="54" type="stmt" count="22"/>
-      <line num="57" type="stmt" count="22"/>
-      <line num="58" type="stmt" count="22"/>
-      <line num="59" type="stmt" count="22"/>
-      <line num="60" type="stmt" count="22"/>
-      <line num="62" type="stmt" count="22"/>
-      <line num="65" type="stmt" count="22"/>
-      <line num="66" type="stmt" count="22"/>
-      <line num="67" type="stmt" count="22"/>
-      <line num="68" type="stmt" count="22"/>
-      <line num="69" type="stmt" count="22"/>
-      <line num="70" type="stmt" count="22"/>
-      <line num="71" type="stmt" count="22"/>
-      <line num="72" type="stmt" count="22"/>
-      <line num="73" type="stmt" count="22"/>
-      <line num="76" type="stmt" count="22"/>
-      <line num="77" type="stmt" count="22"/>
-      <line num="78" type="stmt" count="22"/>
-      <line num="80" type="stmt" count="22"/>
-      <line num="82" type="stmt" count="22"/>
-      <line num="85" type="stmt" count="22"/>
-      <line num="86" type="stmt" count="22"/>
-      <line num="87" type="stmt" count="22"/>
-      <line num="88" type="stmt" count="22"/>
-      <line num="91" type="stmt" count="22"/>
-      <line num="92" type="stmt" count="22"/>
-      <line num="93" type="stmt" count="22"/>
-      <line num="94" type="stmt" count="22"/>
-      <metrics loc="94" ncloc="62" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="55" coveredstatements="55" elements="55" coveredelements="55"/>
+      <line num="14" type="stmt" count="23"/>
+      <line num="15" type="stmt" count="23"/>
+      <line num="16" type="stmt" count="23"/>
+      <line num="17" type="stmt" count="23"/>
+      <line num="20" type="stmt" count="23"/>
+      <line num="21" type="stmt" count="23"/>
+      <line num="22" type="stmt" count="23"/>
+      <line num="23" type="stmt" count="23"/>
+      <line num="26" type="stmt" count="23"/>
+      <line num="27" type="stmt" count="23"/>
+      <line num="28" type="stmt" count="23"/>
+      <line num="29" type="stmt" count="23"/>
+      <line num="31" type="stmt" count="23"/>
+      <line num="34" type="stmt" count="23"/>
+      <line num="35" type="stmt" count="23"/>
+      <line num="36" type="stmt" count="23"/>
+      <line num="37" type="stmt" count="23"/>
+      <line num="40" type="stmt" count="23"/>
+      <line num="41" type="stmt" count="23"/>
+      <line num="42" type="stmt" count="23"/>
+      <line num="43" type="stmt" count="23"/>
+      <line num="45" type="stmt" count="23"/>
+      <line num="48" type="stmt" count="23"/>
+      <line num="49" type="stmt" count="23"/>
+      <line num="50" type="stmt" count="23"/>
+      <line num="51" type="stmt" count="23"/>
+      <line num="53" type="stmt" count="23"/>
+      <line num="56" type="stmt" count="23"/>
+      <line num="57" type="stmt" count="23"/>
+      <line num="58" type="stmt" count="23"/>
+      <line num="59" type="stmt" count="23"/>
+      <line num="60" type="stmt" count="23"/>
+      <line num="63" type="stmt" count="23"/>
+      <line num="64" type="stmt" count="23"/>
+      <line num="65" type="stmt" count="23"/>
+      <line num="66" type="stmt" count="23"/>
+      <line num="68" type="stmt" count="23"/>
+      <line num="71" type="stmt" count="23"/>
+      <line num="72" type="stmt" count="23"/>
+      <line num="73" type="stmt" count="23"/>
+      <line num="74" type="stmt" count="23"/>
+      <line num="75" type="stmt" count="23"/>
+      <line num="76" type="stmt" count="23"/>
+      <line num="77" type="stmt" count="23"/>
+      <line num="78" type="stmt" count="23"/>
+      <line num="79" type="stmt" count="23"/>
+      <line num="82" type="stmt" count="23"/>
+      <line num="83" type="stmt" count="23"/>
+      <line num="84" type="stmt" count="23"/>
+      <line num="86" type="stmt" count="23"/>
+      <line num="88" type="stmt" count="23"/>
+      <line num="91" type="stmt" count="23"/>
+      <line num="92" type="stmt" count="23"/>
+      <line num="93" type="stmt" count="23"/>
+      <line num="94" type="stmt" count="23"/>
+      <line num="97" type="stmt" count="23"/>
+      <line num="98" type="stmt" count="23"/>
+      <line num="99" type="stmt" count="23"/>
+      <line num="100" type="stmt" count="23"/>
+      <metrics loc="100" ncloc="66" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="59" coveredstatements="59" elements="59" coveredelements="59"/>
     </file>
     <package name="Soma\Jobs">
       <file name="/home/homestead/soma-tech/app/Jobs/Job.php">
@@ -363,51 +369,51 @@
         <class name="AppServiceProvider" namespace="Soma\Providers">
           <metrics methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
         </class>
-        <line num="14" type="method" name="boot" crap="1" count="22"/>
-        <line num="17" type="stmt" count="22"/>
-        <line num="24" type="method" name="register" crap="1" count="22"/>
-        <line num="27" type="stmt" count="22"/>
+        <line num="14" type="method" name="boot" crap="1" count="23"/>
+        <line num="17" type="stmt" count="23"/>
+        <line num="24" type="method" name="register" crap="1" count="23"/>
+        <line num="27" type="stmt" count="23"/>
         <metrics loc="28" ncloc="14" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="4" coveredelements="4"/>
       </file>
       <file name="/home/homestead/soma-tech/app/Providers/AuthServiceProvider.php">
         <class name="AuthServiceProvider" namespace="Soma\Providers">
           <metrics methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
         </class>
-        <line num="31" type="method" name="boot" crap="1" count="22"/>
-        <line num="33" type="stmt" count="22"/>
-        <line num="36" type="stmt" count="22"/>
+        <line num="31" type="method" name="boot" crap="1" count="23"/>
+        <line num="33" type="stmt" count="23"/>
+        <line num="36" type="stmt" count="23"/>
         <metrics loc="37" ncloc="24" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
       </file>
       <file name="/home/homestead/soma-tech/app/Providers/EventServiceProvider.php">
         <class name="EventServiceProvider" namespace="Soma\Providers">
           <metrics methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
         </class>
-        <line num="27" type="method" name="boot" crap="1" count="22"/>
-        <line num="29" type="stmt" count="22"/>
-        <line num="32" type="stmt" count="22"/>
+        <line num="27" type="method" name="boot" crap="1" count="23"/>
+        <line num="29" type="stmt" count="23"/>
+        <line num="32" type="stmt" count="23"/>
         <metrics loc="33" ncloc="20" classes="1" methods="1" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="2" elements="3" coveredelements="3"/>
       </file>
       <file name="/home/homestead/soma-tech/app/Providers/RouteServiceProvider.php">
         <class name="RouteServiceProvider" namespace="Soma\Providers">
           <metrics methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="4" coveredstatements="4" elements="6" coveredelements="6"/>
         </class>
-        <line num="25" type="method" name="boot" crap="1" count="22"/>
-        <line num="29" type="stmt" count="22"/>
-        <line num="30" type="stmt" count="22"/>
-        <line num="40" type="method" name="anonymous function" crap="1" count="22"/>
-        <line num="41" type="stmt" count="22"/>
-        <line num="42" type="stmt" count="22"/>
-        <line num="43" type="stmt" count="22"/>
+        <line num="25" type="method" name="boot" crap="1" count="23"/>
+        <line num="29" type="stmt" count="23"/>
+        <line num="30" type="stmt" count="23"/>
+        <line num="40" type="method" name="anonymous function" crap="1" count="23"/>
+        <line num="41" type="stmt" count="23"/>
+        <line num="42" type="stmt" count="23"/>
+        <line num="43" type="stmt" count="23"/>
         <metrics loc="44" ncloc="23" classes="1" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="5" elements="7" coveredelements="7"/>
       </file>
     </package>
     <file name="/home/homestead/soma-tech/app/helpers.php">
-      <line num="14" type="stmt" count="8"/>
-      <line num="16" type="stmt" count="8"/>
-      <line num="17" type="stmt" count="7"/>
+      <line num="14" type="stmt" count="9"/>
+      <line num="16" type="stmt" count="9"/>
+      <line num="17" type="stmt" count="8"/>
       <line num="20" type="stmt" count="1"/>
       <metrics loc="21" ncloc="11" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="4" coveredstatements="4" elements="4" coveredelements="4"/>
     </file>
-    <metrics files="24" loc="1097" ncloc="704" classes="22" methods="47" coveredmethods="41" conditionals="0" coveredconditionals="0" statements="206" coveredstatements="188" elements="253" coveredelements="229"/>
+    <metrics files="24" loc="1113" ncloc="713" classes="22" methods="48" coveredmethods="42" conditionals="0" coveredconditionals="0" statements="211" coveredstatements="193" elements="259" coveredelements="235"/>
   </project>
 </coverage>
diff --git a/composer.json b/composer.json
@@ -8,14 +8,14 @@
         "php": ">=5.5.9",
         "laravel/framework": "5.1.*",
         "laravel/socialite": "^2.0",
-        "laravelcollective/html": "5.1.*"
+        "laravelcollective/html": "5.1.*",
+        "satooshi/php-coveralls": "^1.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~4.0",
-        "phpspec/phpspec": "~2.1",
-        "satooshi/php-coveralls": "^0.7.0"
+        "phpspec/phpspec": "~2.1"
     },
     "autoload": {
         "classmap": [