Merge branch 'main' of github.com:laravelcm/laravel.cm into main

Author: mckenziearts

app/Models/Discussion.php

@@ -78,11 +78,6 @@ class Discussion extends Model implements ReactableInterface, ReplyInterface, Su
 
     protected $removeViewsOnDelete = true;
 
-    public static function boot()
-    {
-        parent::boot();
-    }
-
     /**
      * Get the route key for the model.
      *

app/Models/User.php

@@ -202,7 +202,7 @@ public static function findOrCreateSocialUserProvider($socialUser, string $provi
 
         if (! $user) {
             $user = self::create([
-                'name' => $socialUser->getName(),
+                'name' => $socialUser->getName() ?? $socialUser->getNickName() ?? $socialUser->getId(),
                 'email' => $socialEmail,
                 'username' => $socialUser->getNickName() ?? $socialUser->getId(),
                 'github_profile' => $provider === 'github' ? $socialUser->getNickName() : null,

resources/views/components/feeds/created_article.blade.php

@@ -14,10 +14,15 @@
                 </div>
                 <div class="min-w-0 flex-1">
                     <div>
-                        <p class="text-sm text-skin-base">a créé l'article <a href="{{ route('articles.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a></p>
+                        <p class="text-sm text-skin-base">
+                            {{ __('a créé l\'article') }}
+                            <a href="{{ route('articles.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a>
+                        </p>
                     </div>
                     <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
-                        <time datetime="{{ $activity->created_at->format('Y-m-d') }}">{{ $activity->created_at->diffForHumans() }}</time>
+                        <time datetime="{{ $activity->created_at->format('Y-m-d') }}">
+                            {{ $activity->created_at->diffForHumans() }}
+                        </time>
                     </div>
                 </div>
             </div>

resources/views/components/feeds/created_discussion.blade.php

@@ -13,7 +13,10 @@
             </div>
             <div class="min-w-0 flex-1">
                 <div>
-                    <p class="text-sm text-skin-base">a démarré une conversation <a href="{{ route('discussions.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a></p>
+                    <p class="text-sm text-skin-base">
+                        {{ __('a démarré une conversation') }}
+                        <a href="{{ route('discussions.show', $activity->subject) }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->title }}</a>
+                    </p>
                 </div>
                 <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
                     <time datetime="{{ $activity->created_at->format('Y-m-d') }}">{{ $activity->created_at->diffForHumans() }}</time>

resources/views/components/feeds/created_reply.blade.php

@@ -15,17 +15,18 @@
                 <div>
                     <div>
                         <p class="text-sm text-skin-base">
-                            a répondu au sujet <a href="{{ url("/forum/{$activity->subject->replyAble->slug()}#reply-{$activity->subject->id}") }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">{{ $activity->subject->replyAble->title }}</a>
+                            {{ __('a répondu au sujet') }}
+                            <a href="{{ url("/forum/{$activity->subject->replyAble->slug()}#reply-{$activity->subject->id}") }}" class="font-medium text-skin-primary hover:text-skin-primary-hover">
+                                {{ $activity->subject->replyAble->title }}
+                            </a>
                         </p>
                     </div>
                     <div class="mt-1.5 text-sm whitespace-nowrap text-skin-muted font-sans">
                         <time datetime="{{ $activity->created_at->format('Y-m-d') }}">{{ $activity->created_at->diffForHumans() }}</time>
                     </div>
                 </div>
                 <div class="mt-2 text-sm text-skin-inverted-muted font-normal">
-                    <p>
-                        {{ $activity->subject->excerpt() }}
-                    </p>
+                    <p>{{ $activity->subject->excerpt() }}</p>
                 </div>
             </div>
         </div>

resources/views/layouts/default.blade.php

@@ -4,7 +4,7 @@
 
     <x-layouts.header class="header" />
 
-    <x-container class="py-10 max-w-7xl mx-auto px-4">
+    <x-container class="flex-1 w-full py-10 max-w-7xl mx-auto px-4">
         @yield('body')
     </x-container>
 

resources/views/layouts/master.blade.php

@@ -45,7 +45,9 @@
 </head>
 <body class="h-full font-sans antialiased bg-skin-body text-skin-base">
 
-    @yield('content')
+    <div class="min-h-screen flex flex-col justify-between">
+        @yield('content')
+    </div>
 
     @livewire('livewire-ui-modal')
     @livewire('livewire-ui-spotlight')

resources/views/livewire/user/activities.blade.php

@@ -4,7 +4,13 @@
     </h3>
     <ul role="list" class="mt-6 -mb-8">
         @forelse($activities as $activity)
-            <x-dynamic-component :component="'feeds.' . $activity->type" :activity="$activity" />
+            @if(! str_ends_with($activity->type, 'reply'))
+                <x-dynamic-component
+                    :component="'feeds.' . $activity->type"
+                    :folder="$activity->getTable()"
+                    :activity="$activity"
+                />
+            @endif
         @empty
             <x-feeds.placeholder />
         @endforelse

resources/views/user/dashboard.blade.php

@@ -5,7 +5,7 @@
 
 @section('body')
 
-    <div class="flex-1 min-w-0">
+    <div>
         <x-status-message class="mb-5" />
 
         <h2 class="text-xl font-bold leading-7 text-skin-inverted sm:text-2xl sm:truncate">

resources/views/user/discussions.blade.php

@@ -5,7 +5,7 @@
 
 @section('body')
 
-    <div class="flex-1 min-w-0">
+    <div>
         <x-status-message class="mb-5" />
 
         <x-user.breadcrumb section="Discussions" />