fix pct 1 din file

code4romania · Oct 18, 2023 · 20b8aa3 · 20b8aa3
1 parent 1f61ac5
commit 20b8aa3
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 26 deletions.
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -24,6 +24,7 @@ public function getActivityDomains(): array
             return ActivityDomain::query()
                 ->addSelect('id as value')
                 ->addSelect('name as label')
+                ->orderBy('label', 'asc')
                 ->get()
                 ->toArray();
         });
@@ -46,6 +47,7 @@ public function getProjectCategories(): array
             return ProjectCategory::query()
                 ->addSelect('id as value')
                 ->addSelect('name as label')
+                ->orderBy('label', 'asc')
                 ->get()
                 ->toArray();
         });

diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php
@@ -20,7 +20,7 @@ public function rules(): array
         return [
             'name' => ['string', 'max:255'],
             'email' => ['email', 'max:255', Rule::unique(User::class)->ignore($this->user()->id)],
-            'phone' => ['string', 'max:255'],
+            'phone' => ['nullable','string', 'max:255'],
         ];
     }
 }
diff --git a/app/Http/Requests/RegistrationRequest.php b/app/Http/Requests/RegistrationRequest.php
@@ -32,11 +32,11 @@ public function rules(): array
                 'ngo.name' => ['required', 'string'],
                 'ngo.description' => ['required', 'string', 'max:1000'],
                 'ngo.logo' => ['required', 'image'],
-                'ngo.statute' => ['required', 'file'],
+                'ngo.statute' => ['required', 'file', 'mimes:pdf'],
                 'ngo.street_address' => ['required', 'string'],
                 'ngo.cif' => ['required', 'string', 'unique:organizations,cif', new ValidCIF],
                 'ngo.contact_email' => ['required', 'email'],
-                'ngo.contact_phone' => ['required', 'string'],
+                'ngo.contact_phone' => ['nullable', 'string'],
                 'ngo.contact_person' => ['required', 'string'],
                 'ngo.domains' => ['required', 'array'],
                 'ngo.counties' => ['required', 'array'],

diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
@@ -159,7 +159,7 @@
                     error['ngo.contact_person'] ||
                     error['ngo.contact_phone'] ||
                     error['ngo.contact_email'] ||
-                    error['ngo.webiste']
+                    error['ngo.website']
                 ) {
                     current.value = 3;
                 } else if (error['ngo.volunteer'] || error['ngo.cif'] || error['ngo.why_volunteer']) {

diff --git a/resources/js/Pages/Auth/Registration/Step4.vue b/resources/js/Pages/Auth/Registration/Step4.vue
@@ -77,7 +77,7 @@
             :isRequired="true"
             color="gray-700"
             hasAutocomplete="organization_website_label"
-            :error="form.errors['ngo.webiste']"
+            :error="form.errors['ngo.website']"
         />
 
         <div v-if="'organization' == form.type" class="flex items-center justify-between mt-6 gap-x-4">

diff --git a/resources/js/Pages/Profile/Edit.vue b/resources/js/Pages/Profile/Edit.vue
@@ -6,15 +6,20 @@
         </div>
 
         <div class="container">
+            <div class="flex justify-center">
             <UpdateProfileInformationForm
                 :must-verify-email="mustVerifyEmail"
                 :status="status"
-                class="max-w-xl"
+                class="w-1/2"
             />
+            </div>
 
             <div class="w-full my-4 border-t border-gray-300"></div>
 
-            <UpdatePasswordForm class="max-w-xl" />
+            <div class="flex justify-center">
+
+                <UpdatePasswordForm class="w-1/2" />
+            </div>
         </div>
     </PageLayout>
 </template>

diff --git a/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue b/resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <section>
+    <section >
         <header class="flex items-center gap-4 mt-12">
             <SvgLoader name="user" class="fill-white" />
             <h2 class="text-2xl font-bold text-gray-900">{{ $t('account_settings') }}</h2>
@@ -33,7 +33,6 @@
                 type="number"
                 pattern="[0-9]{10}"
                 v-model="form.phone"
-                :isRequired="true"
                 :error="form.errors.phone"
                 :min="0"
                 :maxlength="10"

diff --git a/routes/auth.php b/routes/auth.php
@@ -11,6 +11,7 @@
 use App\Http\Controllers\Auth\PasswordResetLinkController;
 use App\Http\Controllers\Auth\RegisteredUserController;
 use App\Http\Controllers\Auth\VerifyEmailController;
+use App\Http\Controllers\DonorController;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware('guest')->group(function () {
@@ -40,6 +41,8 @@
 
     Route::get('confirm-password', [ConfirmablePasswordController::class, 'show'])->name('password.confirm');
     Route::post('confirm-password', [ConfirmablePasswordController::class, 'store']);
+    Route::get('donatiile-mele', [DonorController::class, 'donations'])->name('donor.donations');
+    Route::get('donor-dashboard', [DonorController::class, 'index'])->name('donor.index');
 
     Route::put('password', [PasswordController::class, 'update'])->name('password.update');
 });
diff --git a/routes/donor.php b/routes/donor.php
diff --git a/routes/web.php b/routes/web.php
@@ -50,8 +50,6 @@
 
 require __DIR__ . '/regional.php';
 
-require __DIR__ . '/donor.php';
-
 Route::get('/evolutia-faptelor-bune', EvolutionController::class)->name('evolution');
 
 Route::group([