diff --git a/.env.example b/.env.example index 7b75dc8..9097a7c 100644 --- a/.env.example +++ b/.env.example @@ -21,10 +21,10 @@ LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug DB_CONNECTION=sqlite -# DB_HOST=127.0.0.1 -# DB_PORT=3306 -# DB_DATABASE=laravel -# DB_USERNAME=root +DB_HOST=127.0.0.1 +# DB_PORT=5432 +# DB_DATABASE= +# DB_USERNAME= # DB_PASSWORD= SESSION_DRIVER=database @@ -33,9 +33,9 @@ SESSION_ENCRYPT=false SESSION_PATH=/ SESSION_DOMAIN=null -BROADCAST_CONNECTION=log +BROADCAST_CONNECTION=reverb FILESYSTEM_DISK=local -QUEUE_CONNECTION=database +QUEUE_CONNECTION=sync CACHE_STORE=database CACHE_PREFIX= @@ -51,7 +51,7 @@ MAIL_MAILER=log MAIL_HOST=127.0.0.1 MAIL_PORT=2525 MAIL_USERNAME=null -MAIL_PASSWORD=null +MAIL_PASSWORD= MAIL_ENCRYPTION=null MAIL_FROM_ADDRESS="hello@example.com" MAIL_FROM_NAME="${APP_NAME}" @@ -62,7 +62,18 @@ AWS_DEFAULT_REGION=us-east-1 AWS_BUCKET= AWS_USE_PATH_STYLE_ENDPOINT=false +REVERB_APP_KEY= +REVERB_APP_SECRET= +REVERB_APP_ID= +REVERB_HOST=127.0.0.1 +REVERB_PORT=8080 +REVERB_SCHEME= + VITE_APP_NAME="${APP_NAME}" +VITE_REVERB_APP_KEY="${REVERB_APP_KEY}" +VITE_REVERB_HOST="${REVERB_HOST}" +VITE_REVERB_PORT="${REVERB_PORT}" +VITE_REVERB_SCHEME="${REVERB_SCHEME}" # google oauth2 GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= diff --git a/app/Events/ConfirmDonation.php b/app/Events/ConfirmDonation.php index d25697a..6320703 100644 --- a/app/Events/ConfirmDonation.php +++ b/app/Events/ConfirmDonation.php @@ -17,7 +17,7 @@ class ConfirmDonation implements ShouldBroadcast /** * Create a new event instance. */ - public $donation; + protected $donation; public function __construct(Donation $donation) { @@ -33,4 +33,13 @@ public function broadcastOn(): Channel { return new PrivateChannel('donation.'.$this->donation->id); } + + public function broadcastWith(): array + { + return [ + 'id' => $this->donation->id, + 'status' => $this->donation->Status, + 'confirmed_at' => $this->donation->Confirmed_at->toIso8601String(), + ]; + } } diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index e7b1765..d08d8fd 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -142,9 +142,9 @@ public function update($id, Request $request) $imageName = md5($requestImage->getClientOriginalName().strtotime('now')).'.'.$extension; - $requestImage->move(public_path('img/campaigns'), $imageName); + $imagePath = $requestImage->storeAs('campaigns', $imageName, 'public'); - $campaign->Image = $imageName; + $campaign->Image = $imagePath; } $campaign->save(); diff --git a/app/Http/Controllers/DonationController.php b/app/Http/Controllers/DonationController.php index 0cd8648..d19fc56 100644 --- a/app/Http/Controllers/DonationController.php +++ b/app/Http/Controllers/DonationController.php @@ -112,7 +112,7 @@ public function confirm($id) $campaign->meta = $meta; $campaign->save(); - ConfirmDonation::dispatch($donation); + event(new ConfirmDonation($donation)); return redirect()->route('campaign.show', $campaign->id)->with('Success', 'Doação confirmada com sucesso.'); } diff --git a/resources/views/campaigns/edit.blade.php b/resources/views/campaigns/edit.blade.php index d15fd8c..75d9d46 100644 --- a/resources/views/campaigns/edit.blade.php +++ b/resources/views/campaigns/edit.blade.php @@ -56,7 +56,7 @@ class="w-full mt-2 h-36 px-3 py-2 resize-none appearance-none bg-white dark:bg-n

{{ $message }}

@enderror - +
@@ -77,10 +77,10 @@ class="block w-full px-3 py-2 text-sm text-gray-900 dark:text-gray-100 border bo

Imagem Atual:

{{-- Ajuste no caminho da imagem: use asset() para storage se for o caso, ou img/campaigns --}} - Imagem atual da campanha: {{ $campaign->Title }} + Imagem atual da campanha: {{ $campaign->Title }}
@endif - +
{{-- Aumentado padding top para espaçamento --}}