From 4f85a10952c75b30f93b74fb5afefc33ec8b88f1 Mon Sep 17 00:00:00 2001
From: BSanchidrian <borja.sanchidrian@datadoghq.com>
Date: Wed, 6 Nov 2024 19:47:31 +0100
Subject: [PATCH 1/2] Add extra help types + others text field

---
 package-lock.json                             | 210 +++++++++---------
 src/app/solicitar-ayuda/page.js               |  17 ++
 src/helpers/constants.ts                      |   2 +
 .../20241106184930_add-help-types.sql         |   4 +
 4 files changed, 128 insertions(+), 105 deletions(-)
 create mode 100644 supabase/migrations/20241106184930_add-help-types.sql

diff --git a/package-lock.json b/package-lock.json
index f1c15463..6e23de8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1089,6 +1089,111 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.2.tgz",
+      "integrity": "sha512-KUpBVxIbjzFiUZhiLIpJiBoelqzQtVZbdNNsehhUn36e2YzKHphnK8eTUW1s/4aPy5kH/UTid8IuVbaOpedhpw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.2.tgz",
+      "integrity": "sha512-9J7TPEcHNAZvwxXRzOtiUvwtTD+fmuY0l7RErf8Yyc7kMpE47MIQakl+3jecmkhOoIyi/Rp+ddq7j4wG6JDskQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.2.tgz",
+      "integrity": "sha512-BjH4ZSzJIoTTZRh6rG+a/Ry4SW0HlizcPorqNBixBWc3wtQtj4Sn9FnRZe22QqrPnzoaW0ctvSz4FaH4eGKMww==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-gnu": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.2.tgz",
+      "integrity": "sha512-i3U2TcHgo26sIhcwX/Rshz6avM6nizrZPvrDVDY1bXcLH1ndjbO8zuC7RoHp0NSK7wjJMPYzm7NYL1ksSKFreA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-musl": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.2.tgz",
+      "integrity": "sha512-AMfZfSVOIR8fa+TXlAooByEF4OB00wqnms1sJ1v+iu8ivwvtPvnkwdzzFMpsK5jA2S9oNeeQ04egIWVb4QWmtQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.2.tgz",
+      "integrity": "sha512-JkXysDT0/hEY47O+Hvs8PbZAeiCQVxKfGtr4GUpNAhlG2E0Mkjibuo8ryGD29Qb5a3IOnKYNoZlh/MyKd2Nbww==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-x64-msvc": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.2.tgz",
+      "integrity": "sha512-foaUL0NqJY/dX0Pi/UcZm5zsmSk5MtP/gxx3xOPyREkMFN+CTjctPfu3QaqrQHinaKdPnMWPJDKt4VjDfTBe/Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "dev": true,
@@ -7026,111 +7131,6 @@
       "version": "0.1.5",
       "license": "MIT",
       "optional": true
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.2.tgz",
-      "integrity": "sha512-KUpBVxIbjzFiUZhiLIpJiBoelqzQtVZbdNNsehhUn36e2YzKHphnK8eTUW1s/4aPy5kH/UTid8IuVbaOpedhpw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.2.tgz",
-      "integrity": "sha512-9J7TPEcHNAZvwxXRzOtiUvwtTD+fmuY0l7RErf8Yyc7kMpE47MIQakl+3jecmkhOoIyi/Rp+ddq7j4wG6JDskQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.2.tgz",
-      "integrity": "sha512-BjH4ZSzJIoTTZRh6rG+a/Ry4SW0HlizcPorqNBixBWc3wtQtj4Sn9FnRZe22QqrPnzoaW0ctvSz4FaH4eGKMww==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.2.tgz",
-      "integrity": "sha512-i3U2TcHgo26sIhcwX/Rshz6avM6nizrZPvrDVDY1bXcLH1ndjbO8zuC7RoHp0NSK7wjJMPYzm7NYL1ksSKFreA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.2.tgz",
-      "integrity": "sha512-AMfZfSVOIR8fa+TXlAooByEF4OB00wqnms1sJ1v+iu8ivwvtPvnkwdzzFMpsK5jA2S9oNeeQ04egIWVb4QWmtQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.2.tgz",
-      "integrity": "sha512-JkXysDT0/hEY47O+Hvs8PbZAeiCQVxKfGtr4GUpNAhlG2E0Mkjibuo8ryGD29Qb5a3IOnKYNoZlh/MyKd2Nbww==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.2.tgz",
-      "integrity": "sha512-foaUL0NqJY/dX0Pi/UcZm5zsmSk5MtP/gxx3xOPyREkMFN+CTjctPfu3QaqrQHinaKdPnMWPJDKt4VjDfTBe/Q==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
     }
   }
 }
diff --git a/src/app/solicitar-ayuda/page.js b/src/app/solicitar-ayuda/page.js
index d075a07d..a6ba8316 100644
--- a/src/app/solicitar-ayuda/page.js
+++ b/src/app/solicitar-ayuda/page.js
@@ -22,6 +22,7 @@ export default function SolicitarAyuda() {
     ubicacion: '',
     coordinates: null,
     tiposAyuda: [],
+    otraAyuda: '',
     numeroPersonas: '',
     descripcion: '',
     urgencia: 'alta',
@@ -93,6 +94,7 @@ export default function SolicitarAyuda() {
         latitude: formData.coordinates ? parseFloat(formData.coordinates.lat) : null,
         longitude: formData.coordinates ? parseFloat(formData.coordinates.lng) : null,
         help_type: formData.tiposAyuda,
+        other_help: formData.otraAyuda,
         description: formData.descripcion,
         urgency: formData.urgencia,
         number_of_people: parseInt(formData.numeroPersonas) || 1,
@@ -118,6 +120,7 @@ export default function SolicitarAyuda() {
         ubicacion: '',
         coordinates: null,
         tiposAyuda: [],
+        otraAyuda: '',
         numeroPersonas: '',
         descripcion: '',
         urgencia: 'alta',
@@ -294,6 +297,20 @@ export default function SolicitarAyuda() {
             </div>
           </div>
 
+          {formData.tiposAyuda.includes('otros') && (
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">¿Qué tipo de ayuda?</label>
+              <textarea
+                name="otraAyuda"
+                value={formData.otraAyuda}
+                onChange={handleChange}
+                className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+                rows="3"
+                placeholder="Especifica qué tipo de ayuda..."
+              />
+            </div>
+          )}
+
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Número de personas</label>
             <input
diff --git a/src/helpers/constants.ts b/src/helpers/constants.ts
index 431ddc2f..f89eded4 100644
--- a/src/helpers/constants.ts
+++ b/src/helpers/constants.ts
@@ -7,6 +7,8 @@ export const tiposAyudaOptions = {
   medica: 'Asistencia médica',
   psicologico: 'Apoyo psicológico',
   logistico: 'Apoyo logístico',
+  reparto: 'Labores de reparto de alimentos a domicilio',
+  donaciones: 'Labores de organización de donaciones',
   otros: 'Ayuda general',
 };
 
diff --git a/supabase/migrations/20241106184930_add-help-types.sql b/supabase/migrations/20241106184930_add-help-types.sql
new file mode 100644
index 00000000..5938295b
--- /dev/null
+++ b/supabase/migrations/20241106184930_add-help-types.sql
@@ -0,0 +1,4 @@
+ALTER TYPE "public"."help_type_enum" ADD VALUE 'reparto';
+ALTER TYPE "public"."help_type_enum" ADD VALUE 'donaciones';
+
+ALTER TABLE "public"."help_requests" ADD COLUMN "other_help" text DEFAULT NULL;
\ No newline at end of file

From 22c98bf8ae90c4f7d13055166812be1c334aeb56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Borja=20Sanchidri=C3=A1n?= <b.sanchidrianmonge@gmail.com>
Date: Wed, 6 Nov 2024 22:16:56 +0100
Subject: [PATCH 2/2] Fix

---
 src/app/solicitar-ayuda/page.js | 17 -----------------
 src/components/OfferHelp.js     | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app/solicitar-ayuda/page.js b/src/app/solicitar-ayuda/page.js
index a6ba8316..d075a07d 100644
--- a/src/app/solicitar-ayuda/page.js
+++ b/src/app/solicitar-ayuda/page.js
@@ -22,7 +22,6 @@ export default function SolicitarAyuda() {
     ubicacion: '',
     coordinates: null,
     tiposAyuda: [],
-    otraAyuda: '',
     numeroPersonas: '',
     descripcion: '',
     urgencia: 'alta',
@@ -94,7 +93,6 @@ export default function SolicitarAyuda() {
         latitude: formData.coordinates ? parseFloat(formData.coordinates.lat) : null,
         longitude: formData.coordinates ? parseFloat(formData.coordinates.lng) : null,
         help_type: formData.tiposAyuda,
-        other_help: formData.otraAyuda,
         description: formData.descripcion,
         urgency: formData.urgencia,
         number_of_people: parseInt(formData.numeroPersonas) || 1,
@@ -120,7 +118,6 @@ export default function SolicitarAyuda() {
         ubicacion: '',
         coordinates: null,
         tiposAyuda: [],
-        otraAyuda: '',
         numeroPersonas: '',
         descripcion: '',
         urgencia: 'alta',
@@ -297,20 +294,6 @@ export default function SolicitarAyuda() {
             </div>
           </div>
 
-          {formData.tiposAyuda.includes('otros') && (
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">¿Qué tipo de ayuda?</label>
-              <textarea
-                name="otraAyuda"
-                value={formData.otraAyuda}
-                onChange={handleChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-                rows="3"
-                placeholder="Especifica qué tipo de ayuda..."
-              />
-            </div>
-          )}
-
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Número de personas</label>
             <input
diff --git a/src/components/OfferHelp.js b/src/components/OfferHelp.js
index f003e7aa..cf55eaf3 100644
--- a/src/components/OfferHelp.js
+++ b/src/components/OfferHelp.js
@@ -35,6 +35,7 @@ export default function OfferHelp({
     email: data.additional_info?.email || session?.user?.user_metadata?.email || '',
     ubicacion: data.location || '',
     tiposAyuda: data.help_type || [],
+    otraAyuda: data.other_help || '',
     vehiculo: data.resources?.vehicle || '',
     disponibilidad: data.resources?.availability || [],
     radio: data.resources?.radius || 1,
@@ -118,6 +119,7 @@ export default function OfferHelp({
         latitude: formData.coordinates ? parseFloat(formData.coordinates.lat) : null,
         longitude: formData.coordinates ? parseFloat(formData.coordinates.lng) : null,
         help_type: formData.tiposAyuda,
+        other_help: formData.otraAyuda,
         town_id: formData.pueblo,
         status: formData.status,
       };
@@ -142,6 +144,7 @@ export default function OfferHelp({
         email: '',
         ubicacion: '',
         tiposAyuda: [],
+        otraAyuda: '',
         vehiculo: '',
         disponibilidad: [],
         radio: 1,
@@ -287,6 +290,20 @@ export default function OfferHelp({
           </div>
         </div>
 
+        {formData.tiposAyuda.includes('otros') && (
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">¿Qué tipo de ayuda?</label>
+            <textarea
+              name="otraAyuda"
+              value={formData.otraAyuda}
+              onChange={(e) => setFormData({ ...formData, otraAyuda: e.target.value })}
+              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+              rows="3"
+              placeholder="Especifica qué tipo de ayuda..."
+            />
+          </div>
+        )}
+
         {/* Vehículo */}
         <div>
           <label className="block text-sm font-medium text-gray-700 mb-1">Vehículo disponible</label>