Merge pull request #27 from laravelcm/user-dashboard

User dashboard

Author: mckenziearts

app/Http/Controllers/User/DashboardController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+
+class DashboardController extends Controller
+{
+    public function dashboard()
+    {
+        return view('user.dashboard', [
+            'user' => $user = Auth::user(),
+            'articles' => $user->articles()
+                ->orderByDesc('submitted_at')
+                ->orderByDesc('created_at')
+                ->paginate(5),
+        ]);
+    }
+
+    public function threads()
+    {
+        return view('user.threads', [
+            'user' => $user = Auth::user(),
+            'threads' => $user->threads()
+                ->recent()
+                ->paginate(5),
+        ]);
+    }
+
+    public function discussions()
+    {
+        return view('user.discussions', [
+            'user' => $user = Auth::user(),
+            'discussions' => $user->discussions()
+                ->orderByDesc('created_at')
+                ->paginate(5),
+        ]);
+    }
+}

app/Http/Controllers/User/SettingController.php

@@ -34,6 +34,7 @@ public function update(UpdateProfileRequest $request)
             'bio' => trim(strip_tags($request->bio)),
             'twitter_profile' => $request->twitter_profile,
             'github_profile' => $request->github_profile,
+            'linkedin_profile' => $request->linkedin_profile,
             'phone_number' => $request->phone_number,
             'location' => $request->location,
             'website' => $request->website,

app/Http/Livewire/Articles/Create.php

@@ -70,11 +70,11 @@ public function store()
 
         if ($this->submitted) {
             // Envoi du mail a l'admin pour la validation de l'article
-            session()->flash('success', 'Merci d\'avoir soumis votre article. Vous aurez des nouvelles que lorsque nous accepterons votre article.');
+            session()->flash('status', 'Merci d\'avoir soumis votre article. Vous aurez des nouvelles que lorsque nous accepterons votre article.');
         }
 
         $user->hasRole('user') ?
-            $this->redirect('/articles/me') :
+            $this->redirectRoute('dashboard') :
             $this->redirectRoute('articles.show', $article);
     }
 

app/Models/Discussion.php

@@ -121,12 +121,12 @@ public function excerpt(int $limit = 110): string
 
     public function isPinned(): bool
     {
-        return (bool) $this->is_pinned;
+        return $this->is_pinned;
     }
 
     public function isLocked(): bool
     {
-        return (bool) $this->locked;
+        return $this->locked;
     }
 
     public function getCountAllRepliesWithChildAttribute(): int

app/Models/User.php

@@ -12,6 +12,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\Permission\Traits\HasRoles;
@@ -42,6 +43,7 @@ class User extends Authenticatable implements MustVerifyEmail, HasMedia
         'phone_number',
         'github_profile',
         'twitter_profile',
+        'linkedin_profile',
         'website',
         'last_login_at',
         'last_login_ip',
@@ -219,6 +221,16 @@ public function twitter(): ?string
         return $this->twitter_profile;
     }
 
+    public function hasTwitterAccount(): bool
+    {
+        return ! empty($this->twitter());
+    }
+
+    public function linkedin(): ?string
+    {
+        return $this->linkedin_profile;
+    }
+
     public function scopeModerators(Builder $query): Builder
     {
         return $query->whereHas('roles', function ($query) {
@@ -286,19 +298,34 @@ public function routeNotificationForSlack($notification): string
         return env('SLACK_WEBHOOK_URL', '');
     }
 
-    public function countReplies(): int
+    public function replies(): Collection
     {
-        return $this->replyAble()->count();
+        return $this->replyAble;
     }
 
-    public function replies(): Collection
+    public function countReplies(): int
     {
-        return $this->replyAble;
+        return Cache::remember('replies_count', now()->addHours(2), fn () => $this->replyAble()->count());
     }
 
     public function countSolutions(): int
     {
-        return $this->replyAble()->isSolution()->count();
+        return Cache::remember('solutions_count', now()->addHours(2), fn () => $this->replyAble()->isSolution()->count());
+    }
+
+    public function countArticles(): int
+    {
+        return Cache::remember('articles_count', now()->addHours(2), fn () => $this->articles()->approved()->count());
+    }
+
+    public function countDiscussions(): int
+    {
+        return Cache::remember('discussions_count', now()->addHours(2), fn () => $this->discussions()->count());
+    }
+
+    public function countThreads(): int
+    {
+        return Cache::remember('threads_count', now()->addHours(2), fn () => $this->threads()->count());
     }
 
     public function scopeMostSolutions(Builder $query, int $inLastDays = null)
@@ -339,6 +366,7 @@ public function scopeMostSubmissionsInLastDays(Builder $query, int $days)
     public function scopeWithCounts(Builder $query)
     {
         return $query->withCount([
+            'articles as articles_count',
             'threads as threads_count',
             'replyAble as replies_count',
             'replyAble as solutions_count' => function (Builder $query) {

database/migrations/2021_11_29_114833_add_linkedin_profile_column_to_users_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLinkedinProfileColumnToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('linkedin_profile')
+                ->after('twitter_profile')
+                ->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('linkedin_profile');
+        });
+    }
+}

package.json

@@ -24,6 +24,7 @@
     "prettier-standard": "^16.4.1"
   },
   "dependencies": {
+    "@alpinejs/intersect": "^3.6.1",
     "@headlessui/react": "^1.4.2",
     "@heroicons/react": "^1.0.5",
     "@tailwindcss/aspect-ratio": "^0.2.0",

public/css/app.css

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=6e9d959a77c0ed56a844",
-    "/css/app.css": "/css/app.css?id=a4b94cf149d9afd5d3e5"
+    "/js/app.js": "/js/app.js?id=7d557689434ab2f122d8",
+    "/css/app.css": "/css/app.css?id=fe258fa62dce97e1cd59"
 }