Skip to content

Commit

Permalink
fix edit button on project admin page
Browse files Browse the repository at this point in the history
  • Loading branch information
gheorghelupu17 committed Nov 1, 2024
1 parent d531d33 commit 90dbdb9
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 31 deletions.
1 change: 0 additions & 1 deletion app/Concerns/Enums/Comparable.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ trait Comparable
*/
public function is(mixed $enum): bool
{

if ($enum instanceof static) {
return $this->value === $enum->value;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ protected function setUp(): void
if (! $media) {
return '-';
}
return new HtmlString(\sprintf(

return new HtmlString(sprintf(
'<a href="%s" target="_blank">%s</a>',
$media->getTemporaryUrl(now()->addMinutes(30)),
$media->file_name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace App\Filament\Resources\ProjectResource\Widgets;

use App\Filament\Resources\ProjectResource;
use App\Filament\Resources\ProjectResource\Actions\Tables\Projects\RejectProjectAction;
use App\Models\Project;
use Filament\Tables\Actions\EditAction;
Expand Down Expand Up @@ -58,6 +59,7 @@ protected function getTableActions(): array
->iconButton()
->url($this->getTableRecordUrlUsing()),
EditAction::make()
->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record]))
->iconButton(),
RejectProjectAction::make()
->iconButton(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ protected function getTableActions(): array
ViewAction::make()->label(__('project.actions.view'))
->iconButton()
->url($this->getTableRecordUrlUsing()),
EditAction::make()
EditAction::make('edit')
->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record]))
->iconButton(),
ApproveProjectAction::make()
->iconButton(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace App\Filament\Resources\ProjectResource\Widgets;

use App\Filament\Resources\ProjectResource;
use App\Filament\Resources\ProjectResource\Actions\Tables\Projects\ApproveProjectAction;
use App\Models\Project;
use Filament\Tables\Actions\EditAction;
Expand Down Expand Up @@ -55,6 +56,7 @@ protected function getTableActions(): array
->iconButton()
->url($this->getTableRecordUrlUsing()),
EditAction::make()
->url(fn (Project $record) => ProjectResource::getUrl('edit', ['record' => $record]))
->iconButton(),
ApproveProjectAction::make()
->iconButton(),
Expand Down
12 changes: 6 additions & 6 deletions app/Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public function update(Request $request): RedirectResponse
'password' => [
'required',
Password::min(8)
->mixedCase()
->letters()
->numbers()
->symbols()
->uncompromised(),
'confirmed'
->mixedCase()
->letters()
->numbers()
->symbols()
->uncompromised(),
'confirmed',
],
]);

Expand Down
10 changes: 5 additions & 5 deletions app/Http/Controllers/Dashboard/WelcomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ public function store(Request $request, User $user): RedirectResponse
$attributes = $request->validate([
'password' => ['required', 'confirmed',
Password::min(8)
->mixedCase()
->letters()
->numbers()
->symbols()
->uncompromised(),],
->mixedCase()
->letters()
->numbers()
->symbols()
->uncompromised(), ],
]);

$user->setPassword($attributes['password']);
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/DonationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ public function euPlatescCallback(EuPlatescRequest $request, Donation $donation)

(new EuPlatescService($donation->organization_id))->processIpn($donation, $validatedData);

echo "OK";//IMPORTANT to print OK
echo 'OK'; //IMPORTANT to print OK
}
}
1 change: 0 additions & 1 deletion app/Http/Controllers/NewsletterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

class NewsletterController extends Controller
{

public function __invoke(Request $request)
{
$attributes = $request->validate([
Expand Down
24 changes: 13 additions & 11 deletions app/Http/Requests/Donations/EuPlatescRequest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

namespace App\Http\Requests\Donations;

use Illuminate\Foundation\Http\FormRequest;
Expand All @@ -23,17 +25,17 @@ public function authorize(): bool
public function rules(): array
{
return [
'amount' => ['required', 'decimal:2'],
'curr' => ['required', 'string'],
'amount' => ['required', 'decimal:2'],
'curr' => ['required', 'string'],
'invoice_id' => ['required', 'string'],
'ep_id' => ['required', 'string'],
'merch_id' => ['required', 'string'],
'action' => ['required', 'numeric', Rule::in(0, 1)],
'message' => ['required', 'string'],
'approval' => ['required', 'string'],
'timestamp' => ['required', 'date_format:YmdHis'],
'nonce' => ['required', 'string'],
'fp_hash' => ['required', 'string'],
'ep_id' => ['required', 'string'],
'merch_id' => ['required', 'string'],
'action' => ['required', 'numeric', Rule::in(0, 1)],
'message' => ['required', 'string'],
'approval' => ['required', 'string'],
'timestamp' => ['required', 'date_format:YmdHis'],
'nonce' => ['required', 'string'],
'fp_hash' => ['required', 'string'],
'sec_status' => ['nullable', 'numeric'],
'rrn' => ['nullable', 'numeric'],
'mcard' => ['nullable', 'numeric'],
Expand All @@ -45,7 +47,7 @@ public function rules(): array
'card_holder' => ['nullable', 'string'],
'email' => ['nullable', 'string'],
'rtype' => ['nullable', 'string'],
'cce' => ['nullable', 'string']
'cce' => ['nullable', 'string'],
];
}
}
1 change: 0 additions & 1 deletion app/Http/Resources/GalaProject/ShowResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,4 @@ public function toArray(Request $request): array

];
}

}
1 change: 0 additions & 1 deletion database/factories/GalaFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use App\Models\County;
use App\Models\Gala;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use Illuminate\Database\Eloquent\Factories\Factory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<?php

declare(strict_types=1);

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
return new class extends Migration
{
/**
* Run the migrations.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
Expand All @@ -22,7 +24,6 @@ public function up(): void
public function down(): void
{
Schema::table('gala_projects', function (Blueprint $table) {

});
}
};

0 comments on commit 90dbdb9

Please sign in to comment.