Bug fixin dec 2025 (#414)

* wip

* wip

Author: gheorghelupu17

app/Http/Controllers/DonationController.php

@@ -6,7 +6,9 @@
 
 use App\Http\Requests\Donations\EuPlatescRequest;
 use App\Models\Donation;
+use App\Notifications\UserDonationReceived;
 use App\Services\EuPlatescService;
+use Illuminate\Support\Facades\Notification;
 use Inertia\Inertia;
 
 class DonationController extends Controller
@@ -30,6 +32,12 @@ public function makeDonation(Donation $donation)
 
     public function thankYou(string $uuid)
     {
+        $donation = Donation::where('uuid', $uuid)->firstOrFail();
+        \Log::info('Donation ' . $donation->id . 'was updated in DB');
+
+        Notification::route('mail', $donation->email)
+            ->notify(new UserDonationReceived($donation));
+
         return Inertia::render('Public/Donor/ThankYou');
     }
 

app/Http/Filters/ProjectDatesFilter.php

@@ -15,7 +15,7 @@ public function __invoke(Builder $query, $dates, string $property): void
         $start = Carbon::createFromFormat('Y-m-d', $dates[0])->toDateString();
         $end = Carbon::createFromFormat('Y-m-d', $dates[1])->toDateString();
 
-        $query->whereBetween('start', [$start, $end])
-            ->orWhereBetween('end', [$start, $end]);
+        $query->whereDate('start', '<=', $end)
+            ->whereDate('end', '>=', $start);
     }
 }

app/Http/Requests/Project/EditRequest.php

@@ -48,10 +48,10 @@ public function rules(): array
             'external_links.*.url' => ['required', 'url'],
             'is_national' => ['boolean', 'nullable'],
             'gallery' => ['array', 'nullable'],
-            //            TODO to check how we can validate this. Problema e ca validate nu stie sa ia mix intre File si array
-            //            'gallery.*.file' => ['nullable', 'image', 'max:5120'],
+
+            //            'gallery.*.file' => ['nullable', 'image', 'max:5120', 'min:400'],
             //            'gallery.*.id' => ['nullable', 'exists:media,id'],
-            //            'gallery.*.url' => ['nullable', 'string'],
+            //            'gallery.*.url' => ['nullable', 'url'],
             'image' => ['nullable', 'image', 'max:5120'],
         ];
     }

app/Http/Requests/Project/StoreRequest.php

@@ -47,8 +47,8 @@ public function rules(): array
 
             'is_national' => ['boolean', 'nullable'],
             'gallery' => ['array', 'nullable'],
-            'gallery.*.file' => ['nullable', 'image', 'max:5120'],
-            'preview' => ['nullable', 'image', 'max:5120'],
+            'gallery.*.file' => ['nullable', 'image', 'max:5120', 'min:500'],
+            'preview' => ['nullable', 'image', 'max:5120', 'min:500'],
         ];
     }
 

app/Jobs/CaptureAuthorizedDonationJob.php

@@ -16,6 +16,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Notification;
 
 class CaptureAuthorizedDonationJob implements ShouldQueue, ShouldBeUnique
 {
@@ -57,12 +58,8 @@ public function handle(): void
                 'status' => EuPlatescStatus::CHARGED,
                 'status_updated_at' => now(),
             ]);
-            \Log::info('Donation ' . $this->donation->id . 'was updated in DB');
-            $userInstanceOfDonner = new User([
-                'email' => $this->donation->email,
-                'name' => $this->donation->first_name . ' ' . $this->donation->last_name,
-            ]);
-            \Notification::send($userInstanceOfDonner, new UserDonationReceived($this->donation));
+            Notification::route('mail', $this->donation->email)
+                ->notify(new UserDonationReceived($this->donation));
             \Log::info('Notification was sent to ' . $this->donation->email);
             $organizationsUsers = $this->donation->load('organization')
                 ->organization->load('users')->users->filter(function ($user) {

app/Notifications/Ngo/DonationReceived.php

@@ -39,7 +39,7 @@ public function toMail(object $notifiable): MailMessage
         return (new MailMessage)
             ->greeting('Salut,')
             ->subject('Ai primit o donație pentru proiectul tău listat pe Bursa Binelui')
-            ->line('Proiectul organizației tale listat pe Bursa Binelui a primit o donație. Poți să vizualizezi detaliile tranzacțiilor intrând în contul tău pe platforma Bursa Binelui!')
+            ->line('Proiectul organizației tale listat pe Bursa Binelui a fost inițializată o donație. Poți să vizualizezi detaliile tranzacțiilor intrând în contul tău pe platforma Bursa Binelui!')
             ->line('Îţi mulțumim,')
             ->salutation('Echipa Bursa Binelui');
     }

resources/js/Components/Gallery.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :id="galleryID" class="grid gap-2 mt-10 sm:grid-cols-2 lg:grid-cols-4 my-gallery">
+    <div :id="galleryID" class="grid gap-2 mt-10 sm:grid-cols-1 lg:grid-cols-4 my-gallery">
         <a
             v-for="(image, key) in images"
             :key="key"
@@ -9,7 +9,7 @@
             target="_blank"
             rel="noreferrer"
         >
-            <img :src="image.thumbnail" alt="" />
+            <img :src="image.thumbnail" alt="" class="w-full h-auto" />
         </a>
     </div>
 </template>

resources/js/Layouts/DashboardLayout.vue

@@ -7,7 +7,8 @@
         <OrganizationStatus />
 
         <div class="flex items-start flex-1 gap-y-10">
-            <div class="p-4 mt-1 overflow-y-auto bg-white border-r border-gray-200 lg:w-72 shrink-0">
+            <!-- Desktop sidebar -->
+            <div class="hidden md:block p-4 mt-1 overflow-y-auto bg-white border-r border-gray-200 lg:w-72 shrink-0">
                 <nav>
                     <ul class="space-y-1">
                         <li v-for="item in navigation" :key="item.name">
@@ -57,15 +58,84 @@
                 </nav>
             </div>
 
-            <div class="grid items-start flex-1 p-9" :class="gridClass">
+            <!-- Main content -->
+            <div class="grid items-start flex-1 p-9 pb-24 md:pb-9" :class="gridClass">
                 <slot />
             </div>
         </div>
 
+        <!-- Mobile bottom nav -->
+        <div class="md:hidden fixed inset-x-0 bottom-0 z-50">
+            <!-- Dropdown / sheet pentru submenu -->
+            <transition
+                enter-active-class="transition duration-150 ease-out"
+                enter-from-class="opacity-0 translate-y-2"
+                enter-to-class="opacity-100 translate-y-0"
+                leave-active-class="transition duration-150 ease-in"
+                leave-from-class="opacity-100 translate-y-0"
+                leave-to-class="opacity-0 translate-y-2"
+            >
+                <div v-if="openSubMenuItem" class="px-3 pb-2">
+                    <div class="bg-white border border-gray-200 rounded-2xl shadow-lg overflow-hidden">
+                        <div class="flex items-center justify-between px-4 py-3 border-b border-gray-100">
+                            <div class="text-sm font-semibold text-gray-800">
+                                {{ openSubMenuItem.name }}
+                            </div>
+                            <button type="button" class="text-sm font-medium text-gray-500" @click="closeSubMenu">
+                                Închide
+                            </button>
+                        </div>
+
+                        <div class="p-2">
+                            <Link
+                                v-for="sub in openSubMenuItem.subMenu"
+                                :key="sub.name"
+                                :href="sub.route"
+                                class="flex items-center gap-3 px-3 py-2 rounded-xl text-sm font-medium"
+                                :class="isActive(sub) ? 'bg-primary-50 text-primary-600' : 'text-gray-700'"
+                                @click="closeSubMenu"
+                            >
+                                <component
+                                    :is="sub.icon"
+                                    class="h-5 w-5"
+                                    :class="isActive(sub) ? 'text-primary-600' : 'text-gray-500'"
+                                    aria-hidden="true"
+                                />
+                                {{ $t(sub.name) }}
+                            </Link>
+                        </div>
+                    </div>
+                </div>
+            </transition>
+
+            <!-- Bara de jos -->
+            <div class="bg-white border-t border-gray-200 pb-[env(safe-area-inset-bottom)]">
+                <nav class="grid grid-cols-5">
+                    <button
+                        v-for="item in mobileNavigation"
+                        :key="item.name"
+                        type="button"
+                        class="flex flex-col items-center justify-center gap-1 py-2"
+                        :class="isActive(item) ? 'text-primary-600' : 'text-gray-600'"
+                        @click="onMobileNavClick(item)"
+                    >
+                        <component
+                            :is="item.icon"
+                            class="h-6 w-6"
+                            :class="isActive(item) ? 'text-primary-600' : 'text-gray-500'"
+                            aria-hidden="true"
+                        />
+                        <span class="text-[11px] leading-none font-medium truncate max-w-[72px]">
+                            {{ item.name }}
+                        </span>
+                    </button>
+                </nav>
+            </div>
+        </div>
+
         <Footer class="mt-16" />
     </div>
 </template>
-
 <script setup>
 import Navbar from '@/Components/Navbar.vue';
 import Footer from '@/Components/Footer.vue';
@@ -88,13 +158,15 @@ import {
 } from '@heroicons/vue/outline';
 import OrganizationStatus from '@/Components/OrganizationStatus.vue';
 import { trans } from 'laravel-vue-i18n';
+import { computed, ref } from 'vue';
 
 const props = defineProps({
     gridClass: {
         type: String,
         default: 'gap-8',
     },
 });
+const openSubMenuName = ref(null);
 
 const navigation = [
     {
@@ -165,6 +237,30 @@ const navigation = [
     },
 ];
 
+const openSubMenuItem = computed(() => {
+    if (!openSubMenuName.value) return null;
+    return navigation.find((x) => x.name === openSubMenuName.value && x.subMenu?.length);
+});
+
+const closeSubMenu = () => {
+    openSubMenuName.value = null;
+};
+
+const mobileNavigation = computed(() => {
+    const wanted = ['Panou de control', 'Toate proiectele', 'Voluntari', 'Donații ONG', 'Tickets'];
+    return navigation.filter((x) => wanted.includes(x.name));
+});
+
+const onMobileNavClick = (item) => {
+    if (item.subMenu?.length) {
+        openSubMenuName.value = openSubMenuName.value === item.name ? null : item.name;
+        return;
+    }
+
+    closeSubMenu();
+    window.location.href = item.route;
+};
+
 const isActive = (item) => {
     if (typeof window === 'undefined') {
         return false;