app/Events/Deadline/DeadlineCreated.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Events\Deadline;
-
-use App\Models\Deadline;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class DeadlineCreated implements ShouldBroadcast
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Deadline $deadline)
-    {
-        //
-    }
-
-    public function broadcastAs(): string
-    {
-        return 'DeadlineCreated';
-    }
-
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
-     */
-    public function broadcastOn(): array
-    {
-        return [
-            new PrivateChannel('Deadline'),
-        ];
-    }
-}

app/Events/Vote/VoteCreated.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Events\Vote;
-
-use App\Models\Vote;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class VoteCreated implements ShouldBroadcast
-{
-    use Dispatchable, InteractsWithSockets, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(
-        public Vote $vote
-    )
-    {
-        //
-    }
-
-    public function broadcastAs(): string
-    {
-        return 'VoteCreated';
-    }
-
-    /**
-     * Get the channels the event should broadcast on.
-     *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
-     */
-    public function broadcastOn(): array
-    {
-        return [
-            new PrivateChannel('Vote'),
-        ];
-    }
-}

app/Models/Deadline.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Events\Deadline\DeadlineCreated;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,13 +16,6 @@ class Deadline extends Model
         'target_chapter',
     ];
 
-    protected static function booted() :void
-    {
-        static::created(static function ($deadline) {
-            event(new DeadlineCreated($deadline));
-        });
-    }
-
     public function bookRecommendation()
     {
         return $this->belongsTo(BookRecommendation::class);

app/Models/Vote.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Events\Vote\VoteCreated;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -15,13 +14,6 @@ class Vote extends Model
         'book_recommendation_id',
     ];
 
-    protected static function booted() :void
-    {
-        static::created(static function ($vote) {
-            broadcast(new VoteCreated($vote))->toOthers();
-        });
-    }
-
     public function user()
     {
         return $this->belongsTo(User::class);

nuxt/components/Footer.vue

@@ -16,7 +16,7 @@ const config = useRuntimeConfig()
       </template>
       <template #right>
         <div class="font-mono text-xs">
-          {{ config.public.packageVersion }} - {{ config.public.gitHash !== '' ? config.public.gitHash : '0000000' }}
+          {{ config.public.packageVersion }} - {{ config.public.gitHash }}
         </div>
       </template>
     </UFooter>

nuxt/components/book-recommendations/BookRecommendationTable.vue

@@ -83,12 +83,6 @@ onMounted(() => {
       bookRecommendationStore.createRecommendationWS(e.bookRecommendation)
     })
   authStore.socketId = $echo.socketId()
-
-  $echo.private(`Vote`)
-    .listen('.VoteCreated', (e) => {
-      console.log(e)
-      bookRecommendationStore.createVoteWS(e.vote)
-    })
 })
 </script>
 

nuxt/components/deadline/DeadlineTable.vue

@@ -4,8 +4,6 @@ import ConfirmUserDeadline from '~/components/modal/ConfirmUserDeadline.vue'
 const props = defineProps<{
   bookRecommendationId: number
 }>()
-const { $echo } = useNuxtApp()
-const authStore = useAuthStore()
 
 const { refresh: deadlineRefresh, status: deadlineStatus, data: deadlines } = useFetch(() => `book-recommendations/${props.bookRecommendationId}/deadlines`)
 
@@ -42,13 +40,6 @@ const rows = computed(() => {
     }
   })
 })
-
-onMounted(() => {
-  $echo.private(`Deadline`)
-    .listen('.DeadlineCreated', (e) => {
-      deadlineRefresh()
-    })
-})
 </script>
 
 <template>

nuxt/plugins/app.ts

@@ -43,6 +43,7 @@ export default defineNuxtPlugin({
 
       // Conditionally add X-Socket-ID header if socket is connected
       if (auth.isLoggedIn && auth.socketId) {
+        console.log('auth.socketId', auth.socketId)
         const socketHeaders = {
           'X-Socket-ID': auth.socketId,
         }

nuxt/stores/book-recommendations.ts

@@ -123,17 +123,6 @@ export const useBookRecommendationStore = defineStore('bookRecommendations', ()
     })
   }
 
-  const createVoteWS = async (data: Partial<Vote>) => {
-    const index = recommendations.value.findIndex(r => r.id === data.book_recommendation_id)
-    // check if vote already exists otherwise add an empty array
-    if (index !== -1) {
-      if (!recommendations.value[index]?.votes) {
-        recommendations.value[index].votes = []
-      }
-      recommendations.value[index].votes.push(data)
-    }
-  }
-
   function resetRecommendations() {
     recommendations.value = []
   }
@@ -144,7 +133,6 @@ export const useBookRecommendationStore = defineStore('bookRecommendations', ()
     updateRecommendationWS,
     deleteRecommendationWS,
     createRecommendationWS,
-    createVoteWS,
     statusOptions,
     fetchRecommendations,
     fetchRecommendationsStatus,

routes/channels.php

@@ -9,11 +9,3 @@ Broadcast::channel('App.Models.User.{ulid}', function ($user, $ulid) {
 Broadcast::channel('BookRecommendation', function ($user) {
     return $user;
 });
-
-Broadcast::channel('Vote', function ($user) {
-    return $user;
-});
-
-Broadcast::channel('Deadline', function ($user) {
-    return $user;
-});