Merge pull request #88 from pedrolivaresanchez/feature/remove-location

feature: on change state to finished, hidden card & remove location f…
pedrolivaresanchez · Nov 6, 2024 · 52f0c6a · 52f0c6a
2 parents b26116a + 0483150
commit 52f0c6a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/src/app/casos-activos/ofertas/page.js b/src/app/casos-activos/ofertas/page.js
@@ -63,6 +63,7 @@ export default function Ofertas() {
           query.contains('help_type', [filtroData.ayuda]);
         }
 
+        query.neq('status', 'finished');
         // Ejecutar la consulta con paginación
         const { data, count, error } = await query
           .range((currentPage - 1) * itemsPerPage, currentPage * itemsPerPage - 1)
@@ -140,7 +141,7 @@ export default function Ofertas() {
             </button>
           </div>
         ) : (
-          data.map((caso) => <OfferCard caso={caso} isHref={true} key={caso.id} />)
+          data.map((caso) => <OfferCard caso={caso} towns={towns} isHref={true} key={caso.id} />)
         )}
       </div>
       <div className="flex items-center justify-center">

diff --git a/src/app/casos-activos/solicitudes/page.js b/src/app/casos-activos/solicitudes/page.js
@@ -81,7 +81,7 @@ export default function Solicitudes() {
         if (filtroData.urgencia !== 'todas') {
           query.eq('urgency', filtroData.urgencia);
         }
-
+        query.neq('status', 'finished');
         // Ejecutar la consulta con paginación
         const { data, count, error } = await query
           .range((currentPage - 1) * itemsPerPage, currentPage * itemsPerPage - 1)

diff --git a/src/app/oferta/[id]/page.js b/src/app/oferta/[id]/page.js
@@ -4,12 +4,14 @@ import { useParams } from 'next/navigation';
 import { supabase } from '@/lib/supabase/client';
 import { ArrowLeft } from 'lucide-react';
 import OfferCard from '../../../components/OfferCard';
+import { useTowns } from '../../../context/TownProvider';
 
 export default function CasoDetalle() {
   const params = useParams();
   const { id } = params;
   const [caso, setCaso] = useState(null);
   const [loading, setLoading] = useState(true);
+  const towns = useTowns();
   useEffect(() => {
     async function fetchCaso() {
       const { data, error } = await supabase.from('help_requests').select('*').eq('id', id).single();
@@ -58,7 +60,7 @@ export default function CasoDetalle() {
           Volver
         </button>
       </div>
-      <OfferCard key={caso.id} caso={caso} />
+      <OfferCard towns={towns} key={caso.id} caso={caso} />
     </div>
   );
 }
diff --git a/src/app/ofertas/page.js b/src/app/ofertas/page.js
@@ -181,6 +181,7 @@ export default function ListaSolicitudes() {
                 caso={caso}
                 button={{ text: 'Editar', link: '/ofertas/editar/' }}
                 isEdit={true}
+                towns={towns}
               />
             ))
           )}

diff --git a/src/components/OfferCard.js b/src/components/OfferCard.js
@@ -1,9 +1,15 @@
-import { Calendar, HeartHandshake, MapPin, Phone, Truck, User } from 'lucide-react';
+import { Calendar, HeartHandshake, MapPin, MapPinned, Phone, Truck, User } from 'lucide-react';
 import { useSession } from '../context/SessionProvider';
 import { tiposAyudaOptions } from '@/helpers/constants';
 import Link from 'next/link';
 
-export default function OfferCard({ caso, isHref, button = { text: 'Ver oferta', link: '/oferta/' }, isEdit = false }) {
+export default function OfferCard({
+  caso,
+  isHref,
+  towns,
+  button = { text: 'Ver oferta', link: '/oferta/' },
+  isEdit = false,
+}) {
   const session = useSession();
   return (
     <div key={caso.id} className="bg-white p-4 rounded-lg shadow-lg border-l-4 border-green-500 overflow-hidden">
@@ -24,7 +30,7 @@ export default function OfferCard({ caso, isHref, button = { text: 'Ver oferta',
         </span>
       </div>
 
-      <div className="space-y-2 mb-4">
+      <div className="space-y-2 mb-1">
         <h3 className="text-lg font-bold text-green-600">
           <div className="flex items-start gap-2">
             <HeartHandshake className="h-5 w-5 flex-shrink-0 mt-1" />
@@ -82,16 +88,24 @@ export default function OfferCard({ caso, isHref, button = { text: 'Ver oferta',
             })()}
           </>
         )}
-
-        {caso.location && (
+        {/* VOLUNTARIOS NO QUIEREN MOSTRAR SU DIRECCION */}
+        {/* {caso.location && (
           <div className="flex items-start gap-2">
             <MapPin className="h-4 w-4 text-gray-500 flex-shrink-0 mt-1" />
             <span className="break-words">
               <span className="font-semibold">Ubicación:</span> {caso.location}
             </span>
           </div>
-        )}
+        )} */}
 
+        {caso.town_id && (
+          <div className="flex items-start gap-2">
+            <MapPinned className="h-4 w-4 text-gray-500 flex-shrink-0 mt-1" />
+            <span className="break-words">
+              <span className="font-semibold">Pueblo:</span> {towns[caso.town_id - 1].name || ''}
+            </span>
+          </div>
+        )}
         <div className="flex items-start gap-2">
           <Calendar className="h-4 w-4 text-gray-500 flex-shrink-0 mt-1" />
           <span className="break-words">