Merge pull request #45 from Kovah/dev

v0.0.13
Kovah · Apr 24, 2019 · 4cf81aa · 4cf81aa
2 parents abf2fb5 + cf2bc5b
commit 4cf81aa
Show file tree

Hide file tree

Showing 25 changed files with 2,119 additions and 2,585 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -78,7 +78,9 @@ module.exports = grunt => {
         sourceMap: false
       },
       files: {
-        '<%= paths.dist.css %>/app.css': '<%= paths.assets %>/sass/app.scss'
+        '<%= paths.dist.css %>/loader.css': '<%= paths.assets %>/sass/loader.scss',
+        '<%= paths.dist.css %>/app.css': '<%= paths.assets %>/sass/app.scss',
+        '<%= paths.dist.css %>/app-dark.css': '<%= paths.assets %>/sass/app-dark.scss'
       }
     }
   });
@@ -111,7 +113,7 @@ module.exports = grunt => {
 
   // Tasks
   grunt.registerTask('build', [
-    //'browserify',
+    'browserify',
     'concat',
     'sass',
     'postcss',

diff --git a/app/Http/Controllers/App/DashboardController.php b/app/Http/Controllers/App/DashboardController.php
@@ -3,7 +3,9 @@
 namespace App\Http\Controllers\App;
 
 use App\Http\Controllers\Controller;
+use App\Models\Category;
 use App\Models\Link;
+use App\Models\Tag;
 
 class DashboardController extends Controller
 {
@@ -16,10 +18,17 @@ public function index()
     {
         $recent_links = Link::byUser(auth()->user()->id)
             ->orderBy('created_at', 'DESC')
-            ->limit(10)
+            ->limit(5)
             ->get();
 
+        $stats = [
+            'total_links' => Link::count(),
+            'total_categories' => Category::count(),
+            'total_tags' => Tag::count(),
+        ];
+
         return view('dashboard')
-            ->with('recent_links', $recent_links);
+            ->with('recent_links', $recent_links)
+            ->with('stats', $stats);
     }
 }