feat: messages images and components
This commit is contained in:
parent
a75444a395
commit
b031781e43
|
|
@ -41,11 +41,17 @@ class MessageController extends Controller
|
||||||
|
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
|
|
||||||
|
$imageUrl = null;
|
||||||
|
if ($request->hasFile('image')) {
|
||||||
|
$imageUrl = $request->file('image')->store('messages/images', 'public');
|
||||||
|
}
|
||||||
|
|
||||||
$message = $conversation->messages()->create([
|
$message = $conversation->messages()->create([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'sender_name' => $user->name,
|
'sender_name' => $user->name,
|
||||||
'sender_avatar_url' => $user->avatar_url,
|
'sender_avatar_url' => $user->avatar_url,
|
||||||
'body' => $validated['body'],
|
'body' => $validated['body'] ?? null,
|
||||||
|
'image_url' => $imageUrl,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
broadcast(new \App\Events\MessageSent($message))->toOthers();
|
broadcast(new \App\Events\MessageSent($message))->toOthers();
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,8 @@ class MessageRequest extends FormRequest
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'body' => 'required|string',
|
'body' => 'nullable|string|required_without:image',
|
||||||
|
'image' => 'nullable|image|max:5120', // Max 5MB
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ namespace App\Http\Resources\Messaging;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
use App\Http\Resources\UserResource;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
|
||||||
class MessageResource extends JsonResource
|
class MessageResource extends JsonResource
|
||||||
{
|
{
|
||||||
|
|
@ -16,10 +16,12 @@ class MessageResource extends JsonResource
|
||||||
public function toArray(Request $request): array
|
public function toArray(Request $request): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
'senderId' => $this->user_id,
|
'senderId' => $this->user_id,
|
||||||
'senderName' => $this->sender_name,
|
'senderName' => $this->sender_name,
|
||||||
'senderAvatarUrl' => $this->sender_avatar_url,
|
'senderAvatarUrl' => $this->sender_avatar_url,
|
||||||
'body' => $this->body,
|
'body' => $this->body,
|
||||||
|
'imageUrl' => $this->image_url ? asset(Storage::url($this->image_url)) : null,
|
||||||
'readAt' => $this->read_at,
|
'readAt' => $this->read_at,
|
||||||
'createdAt' => $this->created_at,
|
'createdAt' => $this->created_at,
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ class Message extends Model
|
||||||
'sender_avatar_url',
|
'sender_avatar_url',
|
||||||
'conversation_id',
|
'conversation_id',
|
||||||
'body',
|
'body',
|
||||||
|
'image_url',
|
||||||
'read_at',
|
'read_at',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ services:
|
||||||
- 'host.docker.internal:host-gateway'
|
- 'host.docker.internal:host-gateway'
|
||||||
ports:
|
ports:
|
||||||
- '${APP_PORT:-8003}:80'
|
- '${APP_PORT:-8003}:80'
|
||||||
|
- '8080:8080'
|
||||||
environment:
|
environment:
|
||||||
WWWUSER: '${WWWUSER}'
|
WWWUSER: '${WWWUSER}'
|
||||||
LARAVEL_SAIL: 1
|
LARAVEL_SAIL: 1
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('messages', function (Blueprint $table) {
|
||||||
|
$table->string('image_url')->nullable()->after('body');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('messages', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('image_url');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
use Illuminate\Support\Facades\Broadcast;
|
||||||
use App\Http\Controllers\AuthController;
|
use App\Http\Controllers\AuthController;
|
||||||
use App\Http\Controllers\todoController;
|
use App\Http\Controllers\todoController;
|
||||||
Route::prefix('auth')->group(function (): void {
|
Route::prefix('auth')->group(function (): void {
|
||||||
|
|
@ -23,6 +24,7 @@ Route::middleware('auth:sanctum')->prefix('todos')->group(function (): void {
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::middleware('auth:sanctum')->group(function (): void {
|
Route::middleware('auth:sanctum')->group(function (): void {
|
||||||
|
Broadcast::routes();
|
||||||
Route::get('users', [\App\Http\Controllers\UserController::class, 'index']);
|
Route::get('users', [\App\Http\Controllers\UserController::class, 'index']);
|
||||||
Route::apiResource('conversations', \App\Http\Controllers\ConversationController::class);
|
Route::apiResource('conversations', \App\Http\Controllers\ConversationController::class);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue