Fix video feedback front feedback (#276)

* Fix registration ngo, add ro lang for validation * Fix load dashboard on front user * fix project view * Fix article on home page
code4romania · Aug 29, 2023 · ddc555f · ddc555f
1 parent 7bb618b
commit ddc555f
Show file tree

Hide file tree

Showing 27 changed files with 1,411 additions and 64 deletions.
diff --git a/app/Concerns/MustSetInitialPassword.php b/app/Concerns/MustSetInitialPassword.php
@@ -22,7 +22,10 @@ protected static function bootMustSetInitialPassword(): void
 
         static::created(function (self $user) {
             if (! app()->runningInConsole()) {
-                $user->sendWelcomeNotification();
+                if (!empty($user->created_by))
+                {
+                    $user->sendWelcomeNotification();
+                }
             }
         });
     }

diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Resources/UserResource/Pages/CreateUser.php
@@ -51,4 +51,9 @@ public  function form(Form $form): Form
 
             ]);
     }
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        $data['created_by'] = auth()->id();
+        return $data;
+    }
 }
diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -35,12 +35,10 @@ public function store(LoginRequest $request): RedirectResponse
         $request->authenticate();
 
         $request->session()->regenerate();
-
-        $redirect = RouteServiceProvider::ONG;
-        match ($request->get('from', '')) {
-            'championship-page' => $redirect = RouteServiceProvider::CHAMPIONSHIP,
-            'ong' => $redirect = RouteServiceProvider::ONG,
-            default => $redirect = RouteServiceProvider::HOME,
+        $redirect = RouteServiceProvider::HOME;
+        $redirect = match ($request->get('from', '')) {
+            'championship-page' => RouteServiceProvider::CHAMPIONSHIP,
+            default => $redirect ,
         };
 
         return redirect()->intended($redirect);

diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -16,6 +16,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -66,7 +67,10 @@ public function store(RegistrationRequest $request): RedirectResponse
                 $ong = $data['ong'];
                 $organization = Organization::create($ong);
                 $organization->addMediaFromRequest('ong.logo')->toMediaCollection('organizationFilesLogo');
-                $organization->addMediaFromRequest('ong.statute')->toMediaCollection('organizationFilesStatute');
+                if ($request->hasFile('ong.statute'))
+                {
+                    $organization->addMediaFromRequest('ong.statute')->toMediaCollection('organizationFilesStatute');
+                }
                 $organization->activityDomains()->attach($ong['activity_domains_ids']);
                 $organization->counties()->attach($ong['counties_ids']);
                 $adminUsers = User::whereRole(UserRole::bb_admin)->get();
@@ -78,7 +82,8 @@ public function store(RegistrationRequest $request): RedirectResponse
 
             return redirect()->route('register')->with('success_message', ['message' => 'Contul a fost creat', 'usrid' => $user['id']]);
         } catch(\Throwable $th) {
-            return redirect()->back()->with('error_message', 'Contul nu a fost creat');
+            Log::log('error', $th->getMessage());
+            return redirect()->back()->with('error_message', __('auth.failed'));
         }
     }
 

diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\PageResource;
+use Illuminate\Http\RedirectResponse;
+use Inertia\Inertia;
+use Inertia\Response;
+
+class DashboardController extends Controller
+{
+    public function __invoke(): Response|RedirectResponse
+    {
+        if (auth()->user()->isNgoAdmin()) {
+            return redirect()->route('admin.ong.edit');
+        }
+        if (auth()->user()->isDonor()) {
+            $profile = [
+                'description' => '<p>Mulțumim că ești alături de noi. Prin participarea ta activă la această inițiativă, ne arăți că ești preocupat de problemele sociale și că vrei să faci o diferență pozitivă în lumea în care trăim, iar contribuția ta este extrem de valoroasă.</p>
+                <p>Prin distribuirea informațiilor despre proiectele de pe Bursa Binelui și încurajând prietenii și familia să se alăture, devii un promotor important al inițiativei noastre.</p>
+                <p>Fiecare pas pe care îl facem împreună contează și, împreună, putem face o diferență semnificativă.</p>',
+                'donations_place' => '5%',
+                'donations_status' => [
+                    'Ai donat către mai mult de 5 organizații',
+                    'Volunariezi la 3 organizații',
+                    'Ești abonat la newsletterul de bine',
+                    'Ai distribuit de multiple ori informații utile',
+                ],
+            ];
+
+            return Inertia::render('Donor/Dashboard', [
+                'profile' => $profile,
+                'badges' => auth()->user()->badges
+                    ->map(fn ($badge) => $badge->only('image', 'title', 'description')),
+            ]);
+        }
+        abort(403, 'You are not authorized to access this page.');
+    }
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -4,42 +4,15 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Article;
 use App\Models\Project;
 use Inertia\Inertia;
 
 class HomeController extends Controller
 {
     public function index()
     {
-        $articles = [
-            [
-                'id' => 1,
-                'img' => '/images/project_img.png',
-                'author' => 'Ion Popescu',
-                'name' => 'Importanța educației remediare în România în timpul pandemiei',
-                'team' => 'Echipa BCR',
-                'content' => 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Architecto accusantium praesentium eius, ut atque fuga culpa, similique sequi cum eos quis dolorum.',
-                'date' => '15.02.2022',
-            ],
-            [
-                'id' => 2,
-                'img' => '/images/project_img.png',
-                'author' => 'Ion Popescu',
-                'name' => 'Importanța educației remediare în România în timpul pandemiei',
-                'team' => 'Echipa BCR',
-                'content' => 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Architecto accusantium praesentium eius, ut atque fuga culpa, similique sequi cum eos quis dolorum.',
-                'date' => '15.02.2022',
-            ],
-            [
-                'id' => 3,
-                'img' => '/images/project_img.png',
-                'author' => 'Ion Popescu',
-                'name' => 'Importanța educației remediare în România în timpul pandemiei',
-                'team' => 'Echipa BCR',
-                'content' => 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Architecto accusantium praesentium eius, ut atque fuga culpa, similique sequi cum eos quis dolorum.',
-                'date' => '15.02.2022',
-            ],
-        ];
+        $articles = Article::latest()->take(3)->get();
 
         $bcr_projects = Project::publish()->paginate(9)->withQueryString();
         $donate_projects = Project::publish()->paginate(9)->withQueryString();

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
@@ -51,10 +51,6 @@ public function index(Request $request)
 
     public function item(Project $project)
     {
-        if ($project->status !== ProjectStatus::approved) {
-            $this->authorize('view', $project);
-        }
-
         return Inertia::render('Public/Projects/Project', [
             'project' => $project,
         ]);

diff --git a/app/Http/Requests/RegistrationRequest.php b/app/Http/Requests/RegistrationRequest.php
@@ -35,20 +35,27 @@ public function rules(): array
             $rules['ong'] = ['array', 'required'];
             $rules['ong.name'] = ['string', 'required'];
             $rules['ong.description'] = ['string', 'required'];
-            $rules['ong.logo'] = ['file', 'required'];
-            $rules['ong.statute'] = ['file', 'required'];
+            $rules['ong.logo'] = ['required', 'file'];
+            $rules['ong.statute'] = ['required', 'file'];
             $rules['ong.street_address'] = ['string', 'required'];
             $rules['ong.cif'] = ['string', 'required'];
-            $rules['ong.contact_email'] = ['email', 'required'];
+            $rules['ong.contact_email'] = ['required', 'email'];
             $rules['ong.contact_phone'] = ['string', 'required'];
             $rules['ong.contact_person'] = ['string', 'required'];
             $rules['ong.activity_domains_ids'] = ['array', 'required'];
             $rules['ong.counties_ids'] = ['array', 'required'];
             $rules['ong.volunteer'] = ['boolean'];
-            $rules['ong.why_volunteer'] = ['string'];
-            $rules['ong.website'] = ['string'];
+            $rules['ong.why_volunteer'] = ['string','nullable'];
+            $rules['ong.website'] = ['string','nullable'];
         }
 
         return $rules;
     }
+    public function messages(): array
+    {
+        return [
+            'ong.activity_domains_ids' => __('custom_validation.activity_domains_ids'),
+            'ong.counties_ids' => __('custom_validation.counties_ids'),
+        ];
+    }
 }
diff --git a/composer.json b/composer.json
@@ -30,6 +30,7 @@
         "doctrine/dbal": "^3.6",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.23",
+        "laravel-lang/common": "^4.0",
         "laravel/breeze": "^1.23",
         "laravel/pint": "^1.11",
         "laravel/sail": "^1.23",