Skip to content

fix/websockets-delay #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GuilhermmeDev merged 2 commits into from
Dec 3, 2025
Merged

fix/websockets-delay #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e3e83d
fix: websockets delay
GuilhermmeDev Dec 3, 2025
621d4fa
ci: apply pint style fixes
GuilhermmeDev Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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=
Expand All @@ -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}"
Expand All @@ -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=
Expand Down
11 changes: 10 additions & 1 deletion app/Events/ConfirmDonation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ConfirmDonation implements ShouldBroadcast
/**
* Create a new event instance.
*/
public $donation;
protected $donation;

public function __construct(Donation $donation)
{
Expand All @@ -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(),
];
}
}
4 changes: 2 additions & 2 deletions app/Http/Controllers/CampaignController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/DonationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
}
Expand Down
8 changes: 4 additions & 4 deletions resources/views/campaigns/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class="w-full mt-2 h-36 px-3 py-2 resize-none appearance-none bg-white dark:bg-n
<p style="color: red; font-size: 0.8rem; margin-top: 0.2rem;">{{ $message }}</p>
@enderror
</div>

<div class="mt-4">
<label for="Image" class="block text-sm font-medium text-gray-700 dark:text-gray-300">Imagem da Campanha <span class="text-xs text-gray-500 dark:text-gray-400">(Opcional: envie apenas se quiser alterar a atual)</span></label>
<div class="mt-1">
Expand All @@ -77,10 +77,10 @@ class="block w-full px-3 py-2 text-sm text-gray-900 dark:text-gray-100 border bo
<div class="mt-4">
<p class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Imagem Atual:</p>
{{-- Ajuste no caminho da imagem: use asset() para storage se for o caso, ou img/campaigns --}}
<img src="{{asset('img/campaigns/' . $campaign->Image)}}" class="rounded-md w-full object-cover" alt="Imagem atual da campanha: {{ $campaign->Title }}" style="max-height: 200px;">
<img src="{{asset('storage/' . $campaign->Image)}}" class="rounded-md w-full object-cover" alt="Imagem atual da campanha: {{ $campaign->Title }}" style="max-height: 200px;">
</div>
@endif

<div class="pt-6"> {{-- Aumentado padding top para espaçamento --}}
<button
type="submit"
Expand All @@ -94,4 +94,4 @@ class="w-full px-4 py-2 text-white font-medium bg-[#5FCB69] hover:bg-[#357E3C] a
</div>
</section>
</body>
</html>
</html>
14 changes: 7 additions & 7 deletions resources/views/donations/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@
@vite(['resources/css/app.css', 'resources/js/app.js'])
</head>
<body class="bg-white dark:bg-[#1E1E21] text-[#1E1E21] dark:text-[#E0E0E0] flex flex-col items-center min-h-screen">

@include('layouts.secondary_navbar')

<main class="container mx-auto max-w-full flex flex-col md:flex-row gap-8 p-6 items-center md:items-start justify-center">

<section class="flex-1 text-left max-w-lg md:max-w-2xl w-full">
<h1 class="text-2xl font-bold text-[#2AB036] mb-3">Campanha: {{$donation->campaign->Title}}</h1>

<p class="text-lg font-semibold text-[#1E1E21] dark:text-[#E0E0E0] mb-1">ID {{$donation->id}}</p>

<p class="font-semibold mb-2">Descrição</p>

<textarea class="w-full min-h-[120px] p-3 rounded-md border border-[#73737F] bg-white dark:bg-[#1E1E21] dark:border-[#73737F] text-md resize-none mb-4" readonly>{{$donation->Description ? $donation->Description : 'Sem descrição informada'}}
</textarea>

<form action="/donation/{{$donation->id}}" method="post" class="mt-2 text-center md:text-left">
@csrf
@method('DELETE')
<button
class="w-full max-w-xs px-4 py-2 rounded-md bg-[#2AB036] text-white font-medium transition hover:bg-[#228c2b]"
<button
class="w-full max-w-xs px-4 py-2 rounded-md bg-[#2AB036] text-white font-medium transition hover:bg-[#228c2b]"
type="submit">
Cancelar doação
</button>
Expand Down