feat: add pharmacy-product linking system

- Add pharmacy_products table (PostgreSQL + SQLite)
- Add public route GET /api/products/:source/:id/pharmacies
- Add admin CRUD routes for pharmacy-product links
- Add cascade delete when pharmacy is removed
- Update ProductView to show linked pharmacies
- Create PharmacyProductLink admin component
- Add 'Vincular Producto a Farmacia' tab in AdminView

.gitea/workflows/docker.yaml

@@ -7,7 +7,29 @@ on:
     - main
 
 jobs:
+  detect-changes:
+    name: Detect Changes
+    runs-on: ubuntu-latest
+    outputs:
+      backend: ${{ steps.filter.outputs.backend }}
+      frontend: ${{ steps.filter.outputs.frontend }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          backend:
+            - 'apps/backend/**'
+            - 'packages/**'
+          frontend:
+            - 'apps/frontend/**'
+            - 'packages/**'
+
   test-backend:
+    name: Backend Tests
+    needs: detect-changes
+    if: needs.detect-changes.outputs.backend == 'true'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -22,6 +44,9 @@ jobs:
       run: npm test --workspace=farma-clic-backend -- --ci
 
   test-frontend:
+    name: Frontend Tests
+    needs: detect-changes
+    if: needs.detect-changes.outputs.frontend == 'true'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -36,7 +61,12 @@ jobs:
       run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
 
   build-backend:
-    needs: [ test-backend, test-frontend ]
+    name: Build Backend
+    needs: [ detect-changes, test-backend ]
+    if: |
+      always() &&
+      needs.detect-changes.outputs.backend == 'true' &&
+      (needs.test-backend.result == 'success' || needs.test-backend.result == 'skipped')
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -57,7 +87,12 @@ jobs:
           git.hacecalor.net/ichitux/farmafinder-backend:${{ gitea.sha }}
 
   build-frontend:
-    needs: [ test-backend, test-frontend ]
+    name: Build Frontend
+    needs: [ detect-changes, test-frontend ]
+    if: |
+      always() &&
+      needs.detect-changes.outputs.frontend == 'true' &&
+      (needs.test-frontend.result == 'success' || needs.test-frontend.result == 'skipped')
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -77,7 +112,13 @@ jobs:
           git.hacecalor.net/ichitux/farmafinder-frontend:${{ gitea.sha }}
 
   deploy:
-    needs: [ build-backend, build-frontend ]
+    name: Deploy
+    needs: [ detect-changes, build-backend, build-frontend ]
+    if: |
+      always() &&
+      (needs.build-backend.result == 'success' || needs.build-backend.result == 'skipped') &&
+      (needs.build-frontend.result == 'success' || needs.build-frontend.result == 'skipped') &&
+      (needs.detect-changes.outputs.backend == 'true' || needs.detect-changes.outputs.frontend == 'true')
     runs-on: ubuntu-latest
     steps:
     - name: SSH to remote server
@@ -89,5 +130,7 @@ jobs:
         port: ${{ secrets.PORT }}
         script: |
           cd /docker/FarmaFinder
+          git pull
           docker compose pull
+          docker compose down --remove-orphans
           docker compose up -d

.gitea/workflows/test-branches.yaml

@@ -6,8 +6,33 @@ on:
     - 'main'
 
 jobs:
+  detect-changes:
+    name: Detect Changes
+    runs-on: ubuntu-latest
+    outputs:
+      backend: ${{ steps.filter.outputs.backend }}
+      frontend: ${{ steps.filter.outputs.frontend }}
+      frontend-mobile: ${{ steps.filter.outputs.frontend-mobile }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@v3
+      id: filter
+      with:
+        filters: |
+          backend:
+            - 'apps/backend/**'
+            - 'packages/**'
+          frontend:
+            - 'apps/frontend/**'
+            - 'packages/**'
+          frontend-mobile:
+            - 'apps/frontend-mobile/**'
+            - 'packages/**'
+
   test-backend:
     name: Backend Tests
+    needs: detect-changes
+    if: needs.detect-changes.outputs.backend == 'true'
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Code
@@ -27,6 +52,8 @@ jobs:
 
   test-frontend:
     name: Frontend Tests
+    needs: detect-changes
+    if: needs.detect-changes.outputs.frontend == 'true'
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Code
@@ -43,3 +70,25 @@ jobs:
 
     - name: Run Frontend Tests
       run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
+
+  test-frontend-mobile:
+    name: Frontend Mobile Tests
+    needs: detect-changes
+    if: needs.detect-changes.outputs.frontend-mobile == 'true'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '24'
+        cache: 'npm'
+
+    - name: Install Dependencies
+      run: npm ci
+
+    - name: Run Frontend Mobile Tests
+      run: npm test --workspace=frontend-mobile -- --ci
+      continue-on-error: true

.mimocode/.cron-lock

@@ -0,0 +1 @@
+{"pid":596137,"startedAt":1783946773113}

.mimocode/mimocode.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://mimo.xiaomi.com/mimocode/config.json",
+  "mcp": {
+    "n8n": {
+      "type": "remote",
+      "url": "https://n8n.hacecalor.net/mcp-server/http",
+      "headers": {
+        "Authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJjNDE1ODI4Yy00ZWU0LTQ1MjEtOGQ3Mi0xODZmYWNjNGU4ZmEiLCJpc3MiOiJuOG4iLCJhdWQiOiJtY3Atc2VydmVyLWFwaSIsImp0aSI6ImU1YzUyNjIxLTExZDAtNDM4MC04YmRjLTlhMmQ2MDA1OGU4OSIsImlhdCI6MTc4Mzk0NjY3Mn0._0LG3CJJjUg7-g1kvMjME5nBjIEWkrfEeAZrhDxpfC4"
+      }
+    }
+  }
+}

.mimocode/plans/1783593202807-swift-garden.md

@@ -0,0 +1,141 @@
+# Plan: Dark Mode para FarmaFinder Mobile
+
+## Objetivo
+Añadir soporte de modo oscuro a la app móvil con:
+- Detección automática del modo oscuro del sistema
+- Toggle manual en la pantalla de perfil (Configuración)
+- Persistencia de la preferencia del usuario
+
+## Arquitectura
+
+### 1. Theme Store (Zustand + AsyncStorage)
+**Nuevo archivo: `store/themeStore.ts`**
+
+- Estado: `mode: 'light' | 'dark' | 'system'`
+- Persistencia con `@react-native-async-storage/async-storage`
+- Acciones: `setMode()`, `init()` (carga del storage al arrancar)
+- Por defecto: `'system'` (respeta el dispositivo)
+
+### 2. Hook `useThemeColor`
+**Nuevo archivo: `hooks/useThemeColor.ts`**
+
+- Usa `useColorScheme()` de React Native para detectar el color del sistema
+- Combina con el `mode` del themeStore para determinar el tema efectivo
+- Retorna el objeto `colors` apropiado (light o dark)
+- Los componentes consumirán este hook en vez de importar `colors` directamente
+
+### 3. Paleta de colores oscura
+**Modificar: `constants/theme.ts`**
+
+Añadir exportación `darkColors` con la paleta oscura:
+
+| Token | Light (actual) | Dark (nuevo) |
+|---|---|---|
+| `background` | `#fbfbfb` | `#121212` |
+| `card` | `#ffffff` | `#1e1e1e` |
+| `surfaceLow` | `#f2f4f5` | `#2a2a2a` |
+| `surface` | `#eceeef` | `#333333` |
+| `surfaceHigh` | `#e6e8e9` | `#3a3a3a` |
+| `border` | `#c0c9bb` | `#3a3a3a` |
+| `separator` | `#c0c9bb` | `#3a3a3a` |
+| `text` | `#111417` | `#f0f0f0` |
+| `textSecondary` | `#41493e` | `#a0a0a0` |
+| `textInverse` | `#ffffff` | `#111417` |
+| `primaryContainer` | `#cfead0` | `#1a3a1c` |
+| `onPrimaryContainer` | `#0d2b12` | `#cfead0` |
+| `secondaryContainer` | `#dbe7ff` | `#1a2a4a` |
+| `tertiaryContainer` | `#efe7ff` | `#2a1a4a` |
+| `dangerContainer` | `#feecec` | `#3a1a1a` |
+| `accentWarm` | `#f5a97a` | `#f5a97a` (sin cambio) |
+| `primary`, `secondary`, `tertiary`, `scanButton`, `success`, `danger`, `warning` | (sin cambios) | (sin cambios) |
+
+### 4. Provider wrapper
+**Nuevo archivo: `components/ThemeProvider.tsx`**
+
+- Lee el `mode` del themeStore y el `useColorScheme()` del sistema
+- Calcula el tema efectivo (`light` o `dark`)
+- Provee `colors` y `isDark` vía React Context
+- Carga la preferencia guardada en AsyncStorage al montar
+
+### 5. Integración en Root Layout
+**Modificar: `app/_layout.tsx`**
+
+- Envolver toda la app con `<ThemeProvider>`
+- El `StatusBar` se ajusta: `style={isDark ? 'light' : 'auto'}`
+- Los colores del Stack header se leen del contexto
+
+### 6. Toggle en el perfil
+**Modificar: `app/(tabs)/profile.tsx`**
+
+Añadir en la pantalla de perfil (antes de "Configuración") un nuevo item de menú:
+- Icono: `moon-outline` / `sunny-outline` según el tema actual
+- Texto: "Modo de pantalla"
+- Al pulsar, mostrar un picker/modal con 3 opciones:
+  - **Sistema** (icono: phone-portrait) - respeta el SO
+  - **Claro** (icono: sunny) - fuerza light
+  - **Oscuro** (icono: moon) - fuerza dark
+- El toggle se muestra inline (sin modal extra) tipo Segmented Control
+
+### 7. Actualizar todos los screens y components
+
+Cada archivo que importa `colors` debe cambiar a usar el hook `useThemeColor()`:
+
+| Archivo | Cambio |
+|---|---|
+| `app/_layout.tsx` | Usa ThemeProvider + context para header colors |
+| `app/(tabs)/_layout.tsx` | Tab bar y header leen colors del context |
+| `app/(tabs)/index.tsx` | `const { colors } = useThemeColor()` |
+| `app/(tabs)/search.tsx` | `const { colors } = useThemeColor()` |
+| `app/(tabs)/scan.tsx` | `const { colors } = useThemeColor()` |
+| `app/(tabs)/alerts.tsx` | `const { colors } = useThemeColor()` |
+| `app/(tabs)/profile.tsx` | `const { colors, isDark } = useThemeColor()` |
+| `app/(tabs)/map.tsx` | `const { colors } = useThemeColor()` |
+| `app/medicine/[id].tsx` | `const { colors } = useThemeColor()` |
+| `app/pharmacy/[id].tsx` | `const { colors } = useThemeColor()` |
+| `app/auth/login.tsx` | `const { colors } = useThemeColor()` |
+| `app/auth/register.tsx` | `const { colors } = useThemeColor()` |
+| `components/SearchBar.tsx` | `const { colors } = useThemeColor()` |
+| `components/MedicineCard.tsx` | `const { colors } = useThemeColor()` |
+| `components/LoadingSpinner.tsx` | `const { colors } = useThemeColor()` |
+| `components/StockBadge.tsx` | Añade colores dark para badges |
+| `components/BarcodeScanner.tsx` | `const { colors } = useThemeColor()` |
+
+**Nota sobre StyleSheet**: Los `StyleSheet.create()` se ejecutan una vez. Para que los estilos se actualicen con el tema, las propiedades que dependen de `colors` deben aplicarse vía `style` inline o moverse a funciones que retornen estilos dinámicos. La estrategia más limpia es:
+- Los colores de fondo/texto van como inline styles
+- Las estructuras (flex, padding, borderRadius) se quedan en `StyleSheet.create`
+
+### 8. Colores hardcodeados
+Los siguientes archivos tienen colores inline hardcodeados que necesitan variante dark:
+
+- **`StockBadge.tsx`**: `#eaf7ec`, `#fff3cd`, `#feecec` → añadir tokens al tema
+- **`search.tsx`**: suggestions con `#ffffff`, `#f0f7ff`, etc. → usar colores del tema
+- **`profile.tsx`**: feedback `#eaf7ec`, `#cfead0`, `#fecaca` → usar colores del tema
+- **`home/index.tsx`**: `rgba(255,255,255,0.2/0.3)` para iconos → ajustar opacidad
+
+### 9. app.json
+**Modificar: `app.json`**
+
+Cambiar `"userInterfaceStyle": "light"` → `"userInterfaceStyle": "automatic"`
+
+## Orden de ejecución
+
+1. `store/themeStore.ts` (nuevo)
+2. `hooks/useThemeColor.ts` (nuevo)
+3. `constants/theme.ts` (añadir `darkColors`)
+4. `components/ThemeProvider.tsx` (nuevo)
+5. `app/_layout.tsx` (envolver con ThemeProvider)
+6. `app/(tabs)/_layout.tsx` (colores dinámicos)
+7. `app/(tabs)/profile.tsx` (toggle de tema)
+8. Todos los screens y components (migrar a hook)
+9. `app.json` (userInterfaceStyle: automatic)
+10. Corregir colores hardcodeados
+
+## Verificación
+
+1. Ejecutar `npx expo start` y verificar que la app arranca sin errores
+2. Probar en iOS/Android: el tema respeta la configuración del sistema
+3. Ir a Perfil > Modo de pantalla y cambiar entre Claro/Oscuro/Sistema
+4. Verificar que el cambio es inmediato sin recargar la app
+5. Cerrar y reabrir la app → la preferencia persiste
+6. Verificar que todos los screens se ven bien en ambos modos (sin texto invisible, sin fondos transparentes)
+7. Probar tablets ( responsive)

apps/backend/.env.example

@@ -15,3 +15,14 @@ PG_PASSWORD=change-me
 VAPID_PUBLIC_KEY=
 VAPID_PRIVATE_KEY=
 VAPID_SUBJECT=mailto:admin@example.com
+
+# Expo Push Notifications (mobile). Get token from:
+#   https://expo.dev/accounts/[username]/settings/access-tokens
+EXPO_ACCESS_TOKEN=
+
+# Open Food Facts
+# Register at: https://world.openfoodfacts.org/
+# User-Agent is REQUIRED per OFF docs (format: AppName/Version (ContactEmail))
+OFF_USER_AGENT=FarmaFinder/1.0 (https://github.com/farmafinder)
+OFF_USERNAME=
+OFF_PASSWORD=

apps/backend/__tests__/off-service.test.js

@@ -0,0 +1,107 @@
+import { jest } from '@jest/globals'
+
+jest.unstable_mockModule('../redis-client.js', () => ({
+  default: {
+    get: jest.fn(async () => null),
+    setEx: jest.fn(async () => 'OK'),
+  },
+}))
+
+jest.unstable_mockModule('axios', () => ({
+  default: {
+    get: jest.fn(async () => ({ data: { products: [] } })),
+  },
+}))
+
+const { transformOFFProduct, searchBabyProducts, getBabyProductDetails } = await import('../off-service.js')
+
+describe('transformOFFProduct', () => {
+  test('transforms a valid OFF product to unified model', () => {
+    const offProduct = {
+      _id: '12345',
+      product_name: 'Baby Rice',
+      brands: 'Nestlé',
+      image_url: 'https://example.com/image.jpg',
+      nutriscore_grade: 'a',
+      ingredients_text: 'Rice, Iron, Vitamins',
+      nova_group: 1,
+      ecoscore_grade: 'b',
+      categories_tags: ['en:baby-foods', 'en:baby-rice'],
+    }
+
+    const result = transformOFFProduct(offProduct)
+
+    expect(result).toEqual({
+      id: '12345',
+      source: 'openfoodfacts',
+      name: 'Baby Rice',
+      brand: 'Nestlé',
+      category: 'baby_food',
+      image_url: 'https://example.com/image.jpg',
+      nutriscore: 'a',
+      ingredients: 'Rice, Iron, Vitamins',
+      nova_group: 1,
+      eco_score: 'b',
+    })
+  })
+
+  test('returns null for null/undefined input', () => {
+    expect(transformOFFProduct(null)).toBeNull()
+    expect(transformOFFProduct(undefined)).toBeNull()
+  })
+
+  test('returns null when missing required fields', () => {
+    expect(transformOFFProduct({ _id: '123' })).toBeNull()
+    expect(transformOFFProduct({ product_name: 'Test' })).toBeNull()
+  })
+
+  test('sets default brand to empty string when missing', () => {
+    const result = transformOFFProduct({
+      _id: '999',
+      product_name: 'Plain Product',
+    })
+    expect(result.brand).toBe('')
+    expect(result.image_url).toBeNull()
+    expect(result.nutriscore).toBeNull()
+    expect(result.ingredients).toBeNull()
+    expect(result.nova_group).toBeNull()
+    expect(result.eco_score).toBeNull()
+  })
+
+  test('detects baby_milk category from tags', () => {
+    const result = transformOFFProduct({
+      _id: '200',
+      product_name: 'Infant Formula',
+      categories_tags: ['en:infant-milk'],
+    })
+    expect(result.category).toBe('baby_milk')
+  })
+
+  test('detects baby_cereal category from tags', () => {
+    const result = transformOFFProduct({
+      _id: '300',
+      product_name: 'Baby Cereal',
+      categories_tags: ['en:baby-cereals'],
+    })
+    expect(result.category).toBe('baby_cereal')
+  })
+})
+
+describe('searchBabyProducts', () => {
+  test('returns empty array for short query', async () => {
+    const result = await searchBabyProducts('a')
+    expect(result).toEqual([])
+  })
+
+  test('returns empty array for null/empty query', async () => {
+    expect(await searchBabyProducts(null)).toEqual([])
+    expect(await searchBabyProducts('')).toEqual([])
+  })
+})
+
+describe('getBabyProductDetails', () => {
+  test('returns null for null barcode', async () => {
+    const result = await getBabyProductDetails(null)
+    expect(result).toBeNull()
+  })
+})

apps/backend/__tests__/server.test.js

@@ -3,6 +3,7 @@ import { jest } from '@jest/globals'
 jest.unstable_mockModule('../cima-service.js', () => ({
   searchMedicines: jest.fn(async () => []),
   getMedicineDetails: jest.fn(async () => null),
+  searchOTC: jest.fn(async () => []),
 }))
 
 jest.unstable_mockModule('../farmacias-webhook-import.js', () => ({

apps/backend/cima-service.js

@@ -151,19 +151,52 @@ export async function getMedicineDetails(nregistro) {
       return JSON.parse(cachedData);
     }
 
-    // Consultar la API de CIMA
+    // Intentar obtener de la API de CIMA (endpoint individual puede no existir)
     console.log(`🌐 Fetching medicine details from CIMA: ${nregistro}`);
-    const response = await axios.get(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`, {
+    try {
+      const response = await axios.get(`${CIMA_API_BASE_URL}/medicamento/${nregistro}`, {
+        timeout: 5000
+      });
+
+      if (response.data) {
+        const med = response.data;
+        const medicineDetails = {
+          id: med.nregistro,
+          nregistro: med.nregistro,
+          name: med.nombre,
+          active_ingredient: med.principiosActivos?.[0]?.nombre || med.vtm?.nombre || null,
+          dosage: med.dosis || null,
+          form: med.formaFarmaceutica?.nombre || null,
+          formSimplified: med.formaFarmaceuticaSimplificada?.nombre || null,
+          laboratory: med.labtitular,
+          prescription: med.cpresc,
+          commercialized: med.comerc,
+          generic: med.generico,
+          photos: med.fotos || [],
+          docs: med.docs || [],
+          presentations: med.presentaciones || []
+        };
+
+        await redisClient.setEx(cacheKey, CACHE_TTL * 24, JSON.stringify(medicineDetails));
+        return medicineDetails;
+      }
+    } catch (apiError) {
+      console.log(`⚠️ Individual medicine endpoint failed, trying search fallback`);
+    }
+
+    // Fallback: buscar por nregistro usando el endpoint de búsqueda
+    const searchResponse = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, {
+      params: { nregistro },
       timeout: 5000
     });
 
-    if (response.data) {
-      const med = response.data;
+    if (searchResponse.data?.resultados?.length > 0) {
+      const med = searchResponse.data.resultados[0];
       const medicineDetails = {
         id: med.nregistro,
         nregistro: med.nregistro,
         name: med.nombre,
-        active_ingredient: med.principiosActivos?.[0]?.nombre || med.vtm?.nombre || null,
+        active_ingredient: med.vtm?.nombre || null,
         dosage: med.dosis || null,
         form: med.formaFarmaceutica?.nombre || null,
         formSimplified: med.formaFarmaceuticaSimplificada?.nombre || null,
@@ -172,13 +205,10 @@ export async function getMedicineDetails(nregistro) {
         commercialized: med.comerc,
         generic: med.generico,
         photos: med.fotos || [],
-        docs: med.docs || [],
-        presentations: med.presentaciones || []
+        docs: med.docs || []
       };
 
-      // Guardar en caché (TTL más largo para detalles específicos)
       await redisClient.setEx(cacheKey, CACHE_TTL * 24, JSON.stringify(medicineDetails));
-      
       return medicineDetails;
     }
 
@@ -201,6 +231,86 @@ export async function getMedicineDetails(nregistro) {
   }
 }
 
+/**
+ * Busca medicamentos OTC (Sin Receta) en la API de CIMA con caché de Redis
+ * @param {string} query - Término de búsqueda
+ * @returns {Promise<Array>} - Lista de medicamentos OTC encontrados
+ */
+export async function searchOTC(query) {
+  if (!query || query.trim().length < 2) {
+    return [];
+  }
+
+  const searchTerm = query.trim().toLowerCase();
+  const cacheKey = `cima:otc:${searchTerm}`;
+
+  try {
+    // Intentar obtener del caché
+    const cachedData = await redisClient.get(cacheKey);
+    
+    if (cachedData) {
+      console.log(`📦 Cache hit for OTC search: ${searchTerm}`);
+      return JSON.parse(cachedData);
+    }
+
+    const parsed = parseSearchQuery(searchTerm);
+    const apiSearchTerm = parsed.nameQuery || searchTerm;
+
+    console.log(`🌐 Fetching OTC from CIMA API: ${apiSearchTerm}`);
+    const response = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, {
+      params: {
+        nombre: apiSearchTerm,
+        cpresc: 'Sin Receta'
+      },
+      timeout: 5000
+    });
+
+    if (response.data && response.data.resultados) {
+      // Transformar los datos de CIMA al modelo unificado Product
+      const medicines = response.data.resultados.map(med => ({
+        id: med.nregistro,
+        source: 'cima',
+        name: med.nombre,
+        brand: med.labtitular || '',
+        category: 'otc',
+        image_url: med.fotos?.[0]?.url || null,
+        active_ingredient: med.vtm?.nombre || null,
+        dosage: med.dosis || null,
+        form: med.formaFarmaceutica?.nombre || null,
+        prescription: med.cpresc,
+        commercialized: med.comerc,
+        photos: med.fotos || [],
+        docs: med.docs || []
+      }));
+
+      const filtered = filterMedicinesByFullQuery(medicines, searchTerm);
+
+      // Guardar en caché (1h TTL)
+      await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(filtered));
+      
+      console.log(`✅ Cached ${filtered.length} OTC medicines for: ${searchTerm}`);
+      return filtered;
+    }
+
+    return [];
+  } catch (error) {
+    console.error('Error searching OTC medicines from CIMA:', error.message);
+    
+    // Si falla, intentar devolver datos cacheados aunque hayan expirado
+    try {
+      const staleData = await redisClient.get(cacheKey);
+      if (staleData) {
+        console.log('⚠️ Returning stale OTC cache data due to API error');
+        return JSON.parse(staleData);
+      }
+    } catch (cacheError) {
+      console.error('OTC cache fallback also failed:', cacheError);
+    }
+    
+    return [];
+  }
+}
+
 /**
  * Limpia el caché de búsquedas (útil para testing o mantenimiento)
  * @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:search:*')

apps/backend/import-farmacias.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * CLI: pull pharmacies from webhook and insert into database.sqlite
+ * CLI: pull pharmacies from webhook and insert into database
  *
  *   npm run import-farmacias
  *   FARMACIAS_WEBHOOK_URL=https://... npm run import-farmacias
@@ -10,12 +10,15 @@
  *   node import-farmacias.js "https://n8n.example/webhook/farmacias" --lat 41.5631 --lon 2.0038 --radio 1500
  *
  * Env defaults for region: FARMACIAS_IMPORT_LAT, FARMACIAS_IMPORT_LON, FARMACIAS_IMPORT_RADIO
+ *
+ * Uses PostgreSQL when PG_URL is set, otherwise falls back to local SQLite.
  */
 
 import sqlite3 from 'sqlite3';
 import { promisify } from 'util';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import pg from 'pg';
 import {
   runFarmaciaWebhookImport,
   DEFAULT_FARMACIAS_WEBHOOK,
@@ -24,19 +27,43 @@ import {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const dbPath = path.join(__dirname, 'database.sqlite');
-const db = new sqlite3.Database(dbPath);
+const PG_URL = process.env.PG_URL;
+let pool = null;
+let db = null;
 
-function dbRun(sql, params = []) {
-  return new Promise((resolve, reject) => {
-    db.run(sql, params, function (err) {
-      if (err) reject(err);
-      else resolve({ lastID: this.lastID, changes: this.changes });
+let dbRun, dbGet;
+
+if (PG_URL) {
+  pool = new pg.Pool({ connectionString: PG_URL });
+
+  function toPositional(sql) {
+    let i = 0;
+    return sql.replace(/\?/g, () => `$${++i}`);
+  }
+
+  dbGet = async (sql, params = []) => {
+    const res = await pool.query(toPositional(sql), params);
+    return res.rows[0] ?? null;
+  };
+
+  dbRun = async (sql, params = []) => {
+    const res = await pool.query(toPositional(sql), params);
+    return { lastID: res.rows[0]?.id, changes: res.rowCount };
+  };
+} else {
+  const dbPath = path.join(__dirname, 'database.sqlite');
+  db = new sqlite3.Database(dbPath);
+
+  dbRun = (sql, params = []) =>
+    new Promise((resolve, reject) => {
+      db.run(sql, params, function (err) {
+        if (err) reject(err);
+        else resolve({ lastID: this.lastID, changes: this.changes });
+      });
     });
-  });
-}
 
-const dbGet = promisify(db.get.bind(db));
+  dbGet = promisify(db.get.bind(db));
+}
 
 function parseCli(argv) {
   const region = {};
@@ -76,6 +103,7 @@ async function main() {
   const { url, region } = parseCli(process.argv);
   console.log('Fetching pharmacies from:', url);
   if (region) console.log('Region query:', region);
+  console.log('Using:', PG_URL ? 'PostgreSQL' : 'SQLite');
 
   try {
     const result = await runFarmaciaWebhookImport(dbGet, dbRun, url, region);
@@ -97,7 +125,8 @@ async function main() {
     }
     process.exitCode = 1;
   } finally {
-    db.close();
+    if (pool) await pool.end();
+    else if (db) db.close();
   }
 }
 

apps/backend/off-service.js

@@ -0,0 +1,206 @@
+import axios from 'axios';
+import redisClient from './redis-client.js';
+
+// OFF API v3 (recommended) with fallback to v2 for search
+const OFF_API_BASE = 'https://world.openfoodfacts.org';
+const CACHE_TTL = 3600;
+const MAX_RETRIES = 2;
+const RETRY_DELAY_MS = 1000;
+
+// User-Agent is REQUIRED per OFF docs: AppName/Version (ContactEmail)
+const OFF_USER_AGENT = process.env.OFF_USER_AGENT || 'FarmaFinder/1.0 (https://github.com/farmafinder)';
+
+// Open Food Facts authentication (optional, for write operations)
+const OFF_USERNAME = process.env.OFF_USERNAME;
+const OFF_PASSWORD = process.env.OFF_PASSWORD;
+
+function getOffHeaders() {
+  return {
+    'User-Agent': OFF_USER_AGENT,
+  };
+}
+
+function getOffAuth() {
+  if (OFF_USERNAME && OFF_PASSWORD) {
+    return {
+      username: OFF_USERNAME,
+      password: OFF_PASSWORD,
+    };
+  }
+  return null;
+}
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export function transformOFFProduct(offProduct) {
+  if (!offProduct || !offProduct._id || !offProduct.product_name) {
+    return null;
+  }
+
+  const categoriesTags = offProduct.categories_tags || [];
+  let category = 'baby_food';
+  for (const tag of categoriesTags) {
+    const lower = tag.toLowerCase();
+    if (lower.includes('baby-milk') || lower.includes('infant-milk')) {
+      category = 'baby_milk';
+      break;
+    }
+    if (lower.includes('baby-cereal') || lower.includes('infant-cereal')) {
+      category = 'baby_cereal';
+      break;
+    }
+  }
+
+  return {
+    id: offProduct._id,
+    source: 'openfoodfacts',
+    name: offProduct.product_name,
+    brand: offProduct.brands || '',
+    category,
+    image_url: offProduct.image_url || null,
+    nutriscore: offProduct.nutriscore_grade || null,
+    ingredients: offProduct.ingredients_text || null,
+    nova_group: offProduct.nova_group || null,
+    eco_score: offProduct.ecoscore_grade || null,
+  };
+}
+
+export async function searchBabyProducts(query) {
+  if (!query || query.trim().length < 2) {
+    return [];
+  }
+
+  const searchTerm = query.trim().toLowerCase();
+  const cacheKey = `off:baby:${searchTerm}`;
+
+  try {
+    const cachedData = await redisClient.get(cacheKey);
+    if (cachedData) {
+      console.log(`Cache hit for OFF search: ${searchTerm}`);
+      return JSON.parse(cachedData);
+    }
+
+    console.log(`Fetching from OFF API: ${searchTerm}`);
+    const headers = getOffHeaders();
+    console.log(`[OFF] User-Agent: ${headers['User-Agent']}`);
+    console.log(`[OFF] URL: ${OFF_API_BASE}/api/v2/search?brands_tags=${searchTerm}`);
+
+    let lastError;
+    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+      try {
+        // Use v2 structured search with brand filter (more reliable than /cgi/search.pl)
+        // READ operations don't require auth per OFF docs, only User-Agent
+        const response = await axios.get(`${OFF_API_BASE}/api/v2/search`, {
+          params: {
+            brands_tags: searchTerm,
+            page_size: 20,
+          },
+          headers,
+          timeout: 10000,
+          validateStatus: (status) => status === 200,
+        });
+
+        // Check if response is actually JSON (OFF sometimes returns HTML on error)
+        if (typeof response.data === 'string' || !response.data.products) {
+          console.warn(`[OFF] Invalid response for "${searchTerm}" (attempt ${attempt + 1}): API may be down`);
+          if (attempt < MAX_RETRIES) {
+            await sleep(RETRY_DELAY_MS * (attempt + 1));
+            continue;
+          }
+          return [];
+        }
+
+        const products = response.data.products
+          .map(transformOFFProduct)
+          .filter(Boolean);
+
+        // Only cache non-empty results to avoid caching API failures
+        if (products.length > 0) {
+          try {
+            await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(products));
+            console.log(`Cached ${products.length} OFF products for: ${searchTerm}`);
+          } catch (cacheErr) {
+            // cache write failed, still return the data
+          }
+        } else {
+          console.log(`[OFF] No products found for "${searchTerm}", not caching empty result`);
+        }
+        return products;
+      } catch (err) {
+        lastError = err;
+        console.warn(`[OFF] Request failed for "${searchTerm}" (attempt ${attempt + 1}): ${err.message}`);
+        if (attempt < MAX_RETRIES) {
+          await sleep(RETRY_DELAY_MS * (attempt + 1));
+        }
+      }
+    }
+
+    console.error(`[OFF] All retries failed for "${searchTerm}": ${lastError?.message}`);
+    return [];
+  } catch (error) {
+    console.error('Error searching baby products from OFF:', error.message);
+    return [];
+  }
+}
+
+export async function getBabyProductDetails(barcode) {
+  if (!barcode) {
+    return null;
+  }
+
+  const cacheKey = `off:product:${barcode}`;
+
+  try {
+    const cachedData = await redisClient.get(cacheKey);
+    if (cachedData) {
+      console.log(`Cache hit for OFF product: ${barcode}`);
+      return JSON.parse(cachedData);
+    }
+
+    console.log(`Fetching OFF product details: ${barcode}`);
+    const headers = getOffHeaders();
+    // Use v3 API (recommended) for product details
+    // READ operations don't require auth per OFF docs, only User-Agent
+    const response = await axios.get(`${OFF_API_BASE}/api/v3/product/${barcode}.json`, {
+      headers,
+      timeout: 10000,
+      validateStatus: (status) => status === 200,
+    });
+
+    if (response.data && response.data.product) {
+      const product = transformOFFProduct(response.data.product);
+
+      if (product) {
+        try {
+          await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(product));
+          console.log(`Cached OFF product: ${barcode}`);
+        } catch (cacheErr) {
+          // cache write failed, still return the data
+        }
+        return product;
+      }
+    }
+
+    return null;
+  } catch (error) {
+    console.error(`Error fetching OFF product ${barcode}:`, error.message);
+    return null;
+  }
+}
+
+export async function clearCache(pattern = 'off:*') {
+  try {
+    const keys = await redisClient.keys(pattern);
+    if (keys.length > 0) {
+      await redisClient.del(keys);
+      console.log(`Cleared ${keys.length} OFF cache entries`);
+      return keys.length;
+    }
+    return 0;
+  } catch (error) {
+    console.error('Error clearing OFF cache:', error);
+    return 0;
+  }
+}

apps/frontend-mobile/.idea/caches/deviceStreaming.xml

@@ -1,8 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DeviceStreaming">
+    <option name="defaultDeviceApplied" value="true" />
     <option name="deviceSelectionList">
       <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+          <option name="selected" value="true" />
+          <option name="tags">
+            <list>
+              <option value="default" />
+            </list>
+          </option>
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="Sony" />
@@ -171,6 +190,18 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a03sutfn" />
+          <option name="id" value="a03sutfn" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A03s" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="35" />
           <option name="brand" value="samsung" />
@@ -531,6 +562,18 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b4qsqw" />
+          <option name="id" value="b4qsqw" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Flip4" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2640" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="36" />
           <option name="brand" value="samsung" />
@@ -1681,6 +1724,18 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r0qksx" />
+          <option name="id" value="r0qksx" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -1785,23 +1840,6 @@
             </list>
           </option>
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="labId" value="google" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-          <option name="tags">
-            <list>
-              <option value="default" />
-            </list>
-          </option>
-        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="accessStatus">
             <list>
@@ -2186,5 +2224,6 @@
         </PersistentDeviceSelectionData>
       </list>
     </option>
+    <option name="selectedCloudProject" value="farmaclic-53c42" />
   </component>
 </project>

apps/frontend-mobile/.idea/vcs.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>

apps/frontend-mobile/.mimocode/.cron-lock

@@ -0,0 +1 @@
+{"pid":1390854,"startedAt":1783459832497}

apps/frontend-mobile/app.json

@@ -5,7 +5,7 @@
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
-    "userInterfaceStyle": "light",
+    "userInterfaceStyle": "automatic",
     "newArchEnabled": true,
     "splash": {
       "image": "./assets/splash.png",
@@ -25,12 +25,29 @@
         "backgroundColor": "#007AFF"
       },
       "package": "com.farmafinder.app",
-      "googleServicesFile": "./google-services.json"
+      "googleServicesFile": "./google-services.json",
+      "config": {
+        "googleMaps": {
+          "apiKey": ""
+        }
+      }
     },
     "plugins": [
       "expo-router",
       ["expo-camera", {"cameraPermission": "Allow FarmaFinder to access your camera for scanning barcodes"}],
-      ["expo-notifications", {"icon": "./assets/notification-icon.png", "color": "#007AFF"}]
+      ["expo-notifications", {"icon": "./assets/notification-icon.png", "color": "#007AFF"}],
+      [
+        "react-native-maps",
+        {
+          "locationAlwaysAndWhenInUsePermission": "Allow FarmaFinder to use your location to find nearby pharmacies."
+        }
+      ],
+      [
+        "expo-location",
+        {
+          "locationAlwaysAndWhenInUsePermission": "Allow FarmaFinder to use your location to find nearby pharmacies."
+        }
+      ]
     ],
     "scheme": "farmafinder",
     "extra": {

apps/frontend-mobile/app/(tabs)/_layout.tsx

@@ -1,16 +1,73 @@
 import { Tabs } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
+import { View, StyleSheet, useWindowDimensions } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { shadows } from '../../constants/theme';
+
+const TABLET_MIN_WIDTH = 768;
+
+// Standard Android navigation bar heights in dp
+const ANDROID_NAV_BAR_HEIGHT = 48;
+
+function ScanIcon({ size }: { size: number }) {
+  return (
+    <View style={styles.fabContainer}>
+      <View style={[styles.fab, shadows.scanButton]}>
+        <Ionicons name="scan" size={size} color="#ffffff" />
+      </View>
+    </View>
+  );
+}
 
 export default function TabLayout() {
+  const insets = useSafeAreaInsets();
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
+  // Use safe area insets if available, otherwise use standard Android nav bar height
+  const bottomPadding = insets.bottom > 0 ? insets.bottom : ANDROID_NAV_BAR_HEIGHT;
+
   return (
     <Tabs
       screenOptions={{
-        tabBarActiveTintColor: '#007AFF',
-        tabBarInactiveTintColor: '#8E8E93',
+        tabBarActiveTintColor: colors.primary,
+        tabBarInactiveTintColor: colors.textSecondary,
+        tabBarStyle: {
+          ...(isTablet ? styles.tabBarTablet : {}),
+          backgroundColor: colors.card,
+          borderTopColor: colors.border,
+          paddingTop: isTablet ? 10 : 8,
+          height: (isTablet ? 64 : 60) + bottomPadding,
+          paddingBottom: bottomPadding,
+          ...(isTablet ? { paddingHorizontal: 24 } : {}),
+        },
+        tabBarLabelStyle: {
+          fontSize: isTablet ? 13 : 11,
+          fontWeight: '500',
+        },
+        headerStyle: {
+          backgroundColor: colors.card,
+        },
+        headerTintColor: colors.primary,
+        headerTitleStyle: {
+          color: colors.text,
+          fontWeight: '600',
+          fontSize: isTablet ? 20 : 17,
+        },
       }}
     >
       <Tabs.Screen
         name="index"
+        options={{
+          title: 'Inicio',
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="home" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="search"
         options={{
           title: 'Buscar',
           tabBarIcon: ({ color, size }) => (
@@ -18,13 +75,27 @@ export default function TabLayout() {
           ),
         }}
       />
+      <Tabs.Screen
+        name="scan"
+        options={{
+          title: 'Escanear',
+          tabBarIcon: ({ color, size }) => <ScanIcon color={color} size={size} />,
+          tabBarLabel: () => null,
+        }}
+      />
+      <Tabs.Screen
+        name="alerts"
+        options={{
+          title: 'Avisos',
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="notifications" size={size} color={color} />
+          ),
+        }}
+      />
       <Tabs.Screen
         name="map"
         options={{
-          title: 'Mapa',
-          tabBarIcon: ({ color, size }) => (
-            <Ionicons name="map" size={size} color={color} />
-          ),
+          href: null,
         }}
       />
       <Tabs.Screen
@@ -39,3 +110,19 @@ export default function TabLayout() {
     </Tabs>
   );
 }
+
+const styles = StyleSheet.create({
+  fabContainer: {
+    position: 'absolute',
+    top: -16,
+    alignItems: 'center',
+  },
+  fab: {
+    width: 52,
+    height: 52,
+    borderRadius: 26,
+    backgroundColor: '#2b5bb5',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});

apps/frontend-mobile/app/(tabs)/alerts.tsx

@@ -0,0 +1,353 @@
+import React, { useEffect, useState } from 'react';
+import { View, Text, StyleSheet, FlatList, TouchableOpacity, Alert, useWindowDimensions } from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import { useRouter } from 'expo-router';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { useAuth } from '../../hooks/useAuth';
+import { spacing, borderRadius, shadows } from '../../constants/theme';
+import { LoadingSpinner } from '../../components/LoadingSpinner';
+import api from '../../services/api';
+
+const TABLET_MIN_WIDTH = 768;
+
+interface NotificationItem {
+  scope: string;
+  id: number;
+  medicine_name?: string;
+  medicine_nregistro?: string;
+  pharmacy_name?: string;
+  pharmacy_id?: number;
+  pharmacy_address?: string;
+  created_at?: string;
+}
+
+export default function AlertsScreen() {
+  const router = useRouter();
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
+  const { isAuthenticated, isLoading: authLoading } = useAuth();
+  const [items, setItems] = useState<NotificationItem[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [deletingId, setDeletingId] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (!authLoading && isAuthenticated) {
+      loadNotifications();
+    } else if (!authLoading && !isAuthenticated) {
+      setIsLoading(false);
+    }
+  }, [authLoading, isAuthenticated]);
+
+  async function loadNotifications() {
+    setIsLoading(true);
+    setError(null);
+    try {
+      const res = await api.get('/notifications/mine');
+      const data = res.data;
+      const merged = [
+        ...(data.pharmacy || []),
+        ...(data.global || []),
+      ].sort((a: NotificationItem, b: NotificationItem) =>
+        (b.created_at || '').localeCompare(a.created_at || '')
+      );
+      setItems(merged);
+    } catch (err: any) {
+      setError(err.message || 'No se pudieron cargar las notificaciones');
+    } finally {
+      setIsLoading(false);
+    }
+  }
+
+  async function handleDelete(item: NotificationItem) {
+    const key = `${item.scope}:${item.id}`;
+    Alert.alert(
+      'Eliminar notificación',
+      `¿Eliminar la notificación de ${item.medicine_name || item.medicine_nregistro}?`,
+      [
+        { text: 'Cancelar', style: 'cancel' },
+        {
+          text: 'Eliminar',
+          style: 'destructive',
+          onPress: async () => {
+            setDeletingId(key);
+            try {
+              await api.delete('/notifications/mine', {
+                data: { scope: item.scope, id: item.id },
+              });
+              setItems(prev => prev.filter(i => !(i.scope === item.scope && i.id === item.id)));
+            } catch (err: any) {
+              Alert.alert('Error', err.message || 'No se pudo eliminar');
+            } finally {
+              setDeletingId(null);
+            }
+          },
+        },
+      ]
+    );
+  }
+
+  function renderItem({ item }: { item: NotificationItem }) {
+    const key = `${item.scope}:${item.id}`;
+    return (
+      <View style={[styles.item, { backgroundColor: colors.card }]}>
+        <View style={styles.itemContent}>
+          <Text style={[styles.itemName, { color: colors.text }]} numberOfLines={2}>
+            {item.medicine_name || item.medicine_nregistro}
+          </Text>
+          <View style={styles.itemMeta}>
+            <View style={[styles.chip, { backgroundColor: colors.primaryContainer }]}>
+              <Ionicons
+                name={item.scope === 'pharmacy' ? 'medical' : 'globe'}
+                size={12}
+                color={colors.primary}
+              />
+              <Text style={[styles.chipText, { color: colors.onPrimaryContainer }]}>
+                {item.scope === 'pharmacy'
+                  ? item.pharmacy_name || `Farmacia #${item.pharmacy_id}`
+                  : 'Cualquier farmacia'}
+              </Text>
+            </View>
+            {item.pharmacy_address && (
+              <Text style={[styles.itemAddress, { color: colors.textSecondary }]} numberOfLines={1}>
+                {item.pharmacy_address}
+              </Text>
+            )}
+          </View>
+        </View>
+        <TouchableOpacity
+          style={[styles.deleteButton, { backgroundColor: colors.dangerContainer }]}
+          onPress={() => handleDelete(item)}
+          disabled={deletingId === key}
+        >
+          {deletingId === key ? (
+            <Ionicons name="hourglass" size={18} color={colors.danger} />
+          ) : (
+            <Ionicons name="trash-outline" size={18} color={colors.danger} />
+          )}
+        </TouchableOpacity>
+      </View>
+    );
+  }
+
+  if (isLoading || authLoading) {
+    return <LoadingSpinner message="Cargando notificaciones..." />;
+  }
+
+  if (!isAuthenticated) {
+    return (
+      <View style={[styles.container, styles.centered, { backgroundColor: colors.background }]}>
+        <Ionicons name="lock-closed-outline" size={64} color={colors.border} />
+        <Text style={[styles.loginTitle, { color: colors.text }]}>Inicia sesión para continuar</Text>
+        <Text style={[styles.loginSubtitle, { color: colors.textSecondary }]}>
+          Necesitas estar autenticado para ver tus notificaciones
+        </Text>
+        <TouchableOpacity
+          style={[styles.loginButton, { backgroundColor: colors.primary }]}
+          onPress={() => router.push('/auth/login')}
+        >
+          <Text style={[styles.loginButtonText, { color: colors.onPrimaryContainer }]}>Iniciar Sesión</Text>
+        </TouchableOpacity>
+      </View>
+    );
+  }
+
+  return (
+    <View style={[styles.container, { backgroundColor: colors.background }]}>
+      <View style={[styles.header, isTablet && styles.headerTablet]}>
+        <Text style={[styles.title, isTablet && styles.titleTablet, { color: colors.text }]}>Notificaciones Guardadas</Text>
+        <Text style={[styles.subtitle, isTablet && styles.subtitleTablet, { color: colors.textSecondary }]}>
+          Recibe avisos cuando medicamentos sin stock se repongan
+        </Text>
+      </View>
+
+      {error && (
+        <View style={[styles.errorContainer, isTablet && styles.errorContainerTablet, { backgroundColor: colors.dangerContainer }]}>
+          <Text style={[styles.errorText, { color: colors.danger }]}>{error}</Text>
+          <TouchableOpacity onPress={loadNotifications} style={styles.retryButton}>
+            <Text style={[styles.retryText, { color: colors.primary }]}>Reintentar</Text>
+          </TouchableOpacity>
+        </View>
+      )}
+
+      {!error && items.length === 0 && (
+        <View style={styles.emptyContainer}>
+          <Ionicons name="notifications-off-outline" size={isTablet ? 80 : 64} color={colors.border} />
+          <Text style={[styles.emptyTitle, isTablet && styles.emptyTitleTablet, { color: colors.text }]}>Sin notificaciones</Text>
+          <Text style={[styles.emptyText, isTablet && styles.emptyTextTablet, { color: colors.textSecondary }]}>
+            Toca la campana en una farmacia sin stock para recibir notificaciones cuando se reponga.
+          </Text>
+        </View>
+      )}
+
+      {!error && items.length > 0 && (
+        <FlatList
+          data={items}
+          keyExtractor={(item) => `${item.scope}:${item.id}`}
+          renderItem={renderItem}
+          contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
+          showsVerticalScrollIndicator={false}
+        />
+      )}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  centered: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: spacing.xl,
+    gap: spacing.md,
+  },
+  loginTitle: {
+    fontSize: 20,
+    fontWeight: '600',
+    textAlign: 'center',
+  },
+  loginSubtitle: {
+    fontSize: 14,
+    textAlign: 'center',
+    lineHeight: 20,
+  },
+  loginButton: {
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.md,
+    borderRadius: borderRadius.lg,
+    marginTop: spacing.sm,
+  },
+  loginButtonText: {
+    fontSize: 16,
+    fontWeight: '600',
+  },
+  header: {
+    paddingHorizontal: spacing.lg,
+    paddingTop: spacing.lg,
+    paddingBottom: spacing.md,
+  },
+  headerTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
+  title: {
+    fontSize: 22,
+    fontWeight: 'bold',
+  },
+  titleTablet: {
+    fontSize: 28,
+  },
+  subtitle: {
+    fontSize: 14,
+    marginTop: spacing.xs,
+    lineHeight: 20,
+  },
+  subtitleTablet: {
+    fontSize: 16,
+    lineHeight: 24,
+  },
+  list: {
+    paddingHorizontal: spacing.lg,
+    paddingBottom: spacing.xl,
+    gap: spacing.sm,
+  },
+  listTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
+  item: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderRadius: borderRadius.lg,
+    padding: spacing.md,
+    ...shadows.card,
+  },
+  itemContent: {
+    flex: 1,
+    gap: spacing.xs,
+  },
+  itemName: {
+    fontSize: 16,
+    fontWeight: '600',
+    lineHeight: 22,
+  },
+  itemMeta: {
+    gap: spacing.xs,
+  },
+  chip: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs,
+    borderRadius: borderRadius.full,
+    paddingHorizontal: spacing.sm,
+    paddingVertical: 3,
+    alignSelf: 'flex-start',
+  },
+  chipText: {
+    fontSize: 12,
+    fontWeight: '600',
+  },
+  itemAddress: {
+    fontSize: 12,
+  },
+  deleteButton: {
+    width: 36,
+    height: 36,
+    borderRadius: 18,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginLeft: spacing.sm,
+  },
+  errorContainer: {
+    margin: spacing.lg,
+    padding: spacing.md,
+    borderRadius: borderRadius.lg,
+    alignItems: 'center',
+    gap: spacing.sm,
+  },
+  errorContainerTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+  },
+  errorText: {
+    fontSize: 14,
+    textAlign: 'center',
+  },
+  retryButton: {
+    paddingHorizontal: spacing.md,
+    paddingVertical: spacing.xs,
+  },
+  retryText: {
+    fontSize: 14,
+    fontWeight: '600',
+  },
+  emptyContainer: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: spacing.xl,
+    gap: spacing.md,
+  },
+  emptyTitle: {
+    fontSize: 18,
+    fontWeight: '600',
+  },
+  emptyTitleTablet: {
+    fontSize: 24,
+  },
+  emptyText: {
+    fontSize: 14,
+    textAlign: 'center',
+    lineHeight: 20,
+  },
+  emptyTextTablet: {
+    fontSize: 16,
+    maxWidth: 400,
+    lineHeight: 24,
+  },
+});

apps/frontend-mobile/app/(tabs)/index.tsx

@@ -1,89 +1,61 @@
-import React, { useState, useEffect } from 'react';
-import { View, FlatList, StyleSheet, Text, TouchableOpacity } from 'react-native';
+import React from 'react';
+import { View, Text, StyleSheet, TouchableOpacity, Image, useWindowDimensions } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
 import { useRouter } from 'expo-router';
-import { SearchBar } from '../../components/SearchBar';
-import { MedicineCard } from '../../components/MedicineCard';
-import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { useDebounce } from '../../hooks/useDebounce';
-import { searchMedicines } from '../../services/medicines';
-import { colors, spacing, borderRadius } from '../../constants/theme';
-import { Medicine } from '../../types';
-import { config } from '../../constants/config';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius, shadows } from '../../constants/theme';
+
+const TABLET_MIN_WIDTH = 768;
 
 export default function HomeScreen() {
   const router = useRouter();
-  const [query, setQuery] = useState('');
-  const [results, setResults] = useState<Medicine[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  
-  const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
-
-  useEffect(() => {
-    if (debouncedQuery.length < 2) {
-      setResults([]);
-      return;
-    }
-
-    const fetchResults = async () => {
-      setIsLoading(true);
-      setError(null);
-      try {
-        const data = await searchMedicines(debouncedQuery);
-        setResults(data);
-      } catch (err) {
-        setError('Error al buscar medicamentos');
-        console.error(err);
-      } finally {
-        setIsLoading(false);
-      }
-    };
-
-    fetchResults();
-  }, [debouncedQuery]);
-
-  const handleSearch = (searchQuery: string) => {
-    setQuery(searchQuery);
-  };
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
 
   return (
-    <View style={styles.container}>
-      <View style={styles.searchContainer}>
-        <SearchBar
-          onSearch={handleSearch}
-          value={query}
-          onChangeText={setQuery}
+    <View style={[styles.container, { backgroundColor: colors.background }]}>
+      <View style={[styles.hero, isTablet && styles.heroTablet]}>
+        <Image
+          source={require('../../assets/farmaclic_logo.png')}
+          style={[styles.logo, isTablet && styles.logoTablet]}
+          resizeMode="contain"
         />
-        <TouchableOpacity 
-          style={styles.scannerButton}
+        <Text style={[styles.brandName, isTablet && styles.brandNameTablet, { color: colors.text }]}>FarmaClic</Text>
+        <Text style={[styles.description, isTablet && styles.descriptionTablet, { color: colors.textSecondary }]}>
+          Encuentra tus medicamentos en farmacias cercanas
+        </Text>
+      </View>
+
+      <View style={[styles.cards, isTablet && styles.cardsTablet]}>
+        <TouchableOpacity
+          style={[styles.card, isTablet && styles.cardTablet, { backgroundColor: colors.primaryContainer }]}
+          activeOpacity={0.85}
+          onPress={() => router.push('/(tabs)/search')}
+        >
+          <View style={[styles.cardIcon, styles.cardIconSearch]}>
+            <Ionicons name="search" size={isTablet ? 28 : 24} color={colors.onPrimaryContainer} />
+          </View>
+          <View style={styles.cardContent}>
+            <Text style={[styles.cardLabel, isTablet && styles.cardLabelTablet, { color: colors.onPrimaryContainer }]}>Buscar Medicamento</Text>
+            <Ionicons name="chevron-forward" size={20} color={colors.onPrimaryContainer} style={{ opacity: 0.7 }} />
+          </View>
+        </TouchableOpacity>
+
+        <TouchableOpacity
+          style={[styles.card, styles.cardScan, isTablet && styles.cardTablet]}
+          activeOpacity={0.85}
           onPress={() => router.push('/scanner')}
         >
-          <Ionicons name="scan" size={24} color={colors.primary} />
+          <View style={[styles.cardIcon, styles.cardIconScan]}>
+            <Ionicons name="scan" size={isTablet ? 28 : 24} color="#ffffff" />
+          </View>
+          <View style={styles.cardContent}>
+            <Text style={[styles.cardLabel, styles.cardLabelScan, isTablet && styles.cardLabelTablet]}>Escanear TSI</Text>
+            <Ionicons name="chevron-forward" size={20} color="#ffffff" style={{ opacity: 0.7 }} />
+          </View>
         </TouchableOpacity>
       </View>
-      
-      {isLoading && <LoadingSpinner message="Buscando medicamentos..." />}
-      
-      {error && (
-        <View style={styles.errorContainer}>
-          <Text style={styles.errorText}>{error}</Text>
-        </View>
-      )}
-      
-      {!isLoading && !error && results.length === 0 && query.length >= 2 && (
-        <View style={styles.emptyContainer}>
-          <Text style={styles.emptyText}>No se encontraron medicamentos</Text>
-        </View>
-      )}
-      
-      <FlatList
-        data={results}
-        keyExtractor={(item) => item.nregistro}
-        renderItem={({ item }) => <MedicineCard medicine={item} />}
-        contentContainerStyle={styles.list}
-        showsVerticalScrollIndicator={false}
-      />
     </View>
   );
 }
@@ -91,37 +63,101 @@ export default function HomeScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: colors.background,
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: spacing.lg,
+    gap: spacing.lg,
   },
-  searchContainer: {
+  hero: {
+    alignItems: 'center',
+    gap: spacing.sm,
+    marginBottom: spacing.md,
+  },
+  heroTablet: {
+    marginBottom: spacing.xl,
+  },
+  logo: {
+    width: 120,
+    height: 120,
+    marginBottom: spacing.xs,
+  },
+  logoTablet: {
+    width: 160,
+    height: 160,
+  },
+  brandName: {
+    fontSize: 28,
+    fontWeight: 'bold',
+    letterSpacing: -0.5,
+  },
+  brandNameTablet: {
+    fontSize: 36,
+  },
+  description: {
+    fontSize: 16,
+    textAlign: 'center',
+    maxWidth: 260,
+    lineHeight: 24,
+  },
+  descriptionTablet: {
+    fontSize: 18,
+    maxWidth: 400,
+    lineHeight: 28,
+  },
+  cards: {
+    width: '100%',
+    maxWidth: 320,
+    gap: spacing.md,
+  },
+  cardsTablet: {
+    maxWidth: 480,
+  },
+  card: {
     flexDirection: 'row',
     alignItems: 'center',
-  },
-  scannerButton: {
-    marginRight: spacing.md,
-    padding: spacing.sm,
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
-  },
-  list: {
-    paddingBottom: spacing.xl,
-  },
-  errorContainer: {
+    gap: spacing.md,
+    borderRadius: borderRadius.lg,
     padding: spacing.md,
-    marginHorizontal: spacing.md,
-    backgroundColor: '#F8D7DA',
-    borderRadius: 8,
+    minHeight: 64,
+    ...shadows.card,
   },
-  errorText: {
-    color: '#721C24',
-    textAlign: 'center',
+  cardTablet: {
+    padding: spacing.lg,
+    minHeight: 72,
   },
-  emptyContainer: {
-    padding: spacing.xl,
+  cardScan: {
+    backgroundColor: '#2b5bb5',
+  },
+  cardIcon: {
+    width: 48,
+    height: 48,
+    borderRadius: borderRadius.md,
+    backgroundColor: 'rgba(255, 255, 255, 0.2)',
     alignItems: 'center',
+    justifyContent: 'center',
+    flexShrink: 0,
   },
-  emptyText: {
-    color: colors.textSecondary,
-    fontSize: 16,
+  cardIconSearch: {
+    backgroundColor: 'rgba(255, 255, 255, 0.3)',
+  },
+  cardIconScan: {
+    backgroundColor: 'rgba(255, 255, 255, 0.2)',
+  },
+  cardContent: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  cardLabel: {
+    fontSize: 18,
+    fontWeight: '700',
+    lineHeight: 24,
+  },
+  cardLabelTablet: {
+    fontSize: 20,
+  },
+  cardLabelScan: {
+    color: '#ffffff',
   },
 });

apps/frontend-mobile/app/(tabs)/map.tsx

@@ -4,15 +4,17 @@ import MapView, { Marker } from 'react-native-maps';
 import { useRouter } from 'expo-router';
 import { getPharmacies } from '../../services/pharmacies';
 import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { colors, spacing } from '../../constants/theme';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius } from '../../constants/theme';
 import { Pharmacy } from '../../types';
 
 export default function MapScreen() {
   const router = useRouter();
+  const { colors } = useThemeContext();
   const [pharmacies, setPharmacies] = useState<Pharmacy[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [region, setRegion] = useState({
-    latitude: 40.4168, // Madrid default
+    latitude: 40.4168,
     longitude: -3.7038,
     latitudeDelta: 0.0922,
     longitudeDelta: 0.0421,
@@ -24,7 +26,6 @@ export default function MapScreen() {
         const data = await getPharmacies();
         setPharmacies(data);
         
-        // Center map on first pharmacy if available
         if (data.length > 0) {
           setRegion({
             latitude: data[0].latitude,
@@ -70,8 +71,8 @@ export default function MapScreen() {
         ))}
       </MapView>
       
-      <View style={styles.legend}>
-        <Text style={styles.legendText}>
+      <View style={[styles.legend, { backgroundColor: colors.card }]}>
+        <Text style={[styles.legendText, { color: colors.text }]}>
           {pharmacies.length} farmacias en el mapa
         </Text>
       </View>
@@ -91,18 +92,16 @@ const styles = StyleSheet.create({
     bottom: spacing.lg,
     left: spacing.md,
     right: spacing.md,
-    backgroundColor: colors.card,
-    borderRadius: 8,
-    padding: spacing.sm,
+    borderRadius: borderRadius.lg,
+    padding: spacing.sm + 4,
     alignItems: 'center',
     shadowColor: '#000',
-    shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.25,
-    shadowRadius: 4,
-    elevation: 5,
+    shadowOffset: { width: 0, height: 4 },
+    shadowOpacity: 0.08,
+    shadowRadius: 20,
+    elevation: 4,
   },
   legendText: {
     fontSize: 14,
-    color: colors.text,
   },
 });

apps/frontend-mobile/app/(tabs)/scan.tsx

@@ -0,0 +1,347 @@
+import React, { useState } from 'react';
+import { View, Text, StyleSheet, TouchableOpacity, TextInput, Alert, useWindowDimensions, ScrollView } from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import { useRouter } from 'expo-router';
+import * as ImagePicker from 'expo-image-picker';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius, shadows } from '../../constants/theme';
+
+const TABLET_MIN_WIDTH = 768;
+
+export default function ScanTabScreen() {
+  const router = useRouter();
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
+  const [manualNumber, setManualNumber] = useState('');
+  const [selectedImage, setSelectedImage] = useState<string | null>(null);
+
+  const handleTakePhoto = async () => {
+    const { status } = await ImagePicker.requestCameraPermissionsAsync();
+    if (status !== 'granted') {
+      Alert.alert(
+        'Permiso requerido',
+        'Necesitamos acceso a la cámara para tomar fotos del dispositivo.'
+      );
+      return;
+    }
+
+    const result = await ImagePicker.launchCameraAsync({
+      mediaTypes: ['images'],
+      allowsEditing: true,
+      quality: 0.8,
+    });
+
+    if (!result.canceled && result.assets[0]) {
+      setSelectedImage(result.assets[0].uri);
+    }
+  };
+
+  const handleSelectFromGallery = async () => {
+    const { status } = await ImagePicker.requestMediaLibraryPermissionsAsync();
+    if (status !== 'granted') {
+      Alert.alert(
+        'Permiso requerido',
+        'Necesitamos acceso a la galería para seleccionar fotos.'
+      );
+      return;
+    }
+
+    const result = await ImagePicker.launchImageLibraryAsync({
+      mediaTypes: ['images'],
+      allowsEditing: true,
+      quality: 0.8,
+    });
+
+    if (!result.canceled && result.assets[0]) {
+      setSelectedImage(result.assets[0].uri);
+    }
+  };
+
+  const handleManualSubmit = () => {
+    const trimmed = manualNumber.trim();
+    if (trimmed.length === 0) {
+      Alert.alert('Campo requerido', 'Por favor, introduce el número de la tarjeta.');
+      return;
+    }
+    router.push(`/medicine/${trimmed}`);
+  };
+
+  return (
+    <ScrollView
+      style={[styles.scrollContainer, { backgroundColor: colors.background }]}
+      contentContainerStyle={styles.scrollContent}
+    >
+      <View style={[styles.content, isTablet && styles.contentTablet]}>
+        <View style={[styles.iconContainer, isTablet && styles.iconContainerTablet, { backgroundColor: colors.primaryContainer }]}>
+          <Ionicons name="scan" size={isTablet ? 80 : 64} color={colors.scanButton} />
+        </View>
+        <Text style={[styles.title, isTablet && styles.titleTablet, { color: colors.text }]}>Escanear TSI</Text>
+        <Text style={[styles.description, isTablet && styles.descriptionTablet, { color: colors.textSecondary }]}>
+          Escanea el código de barras de tu tarjeta sanitaria para encontrar tus medicamentos
+        </Text>
+        <TouchableOpacity
+          style={[styles.primaryButton, shadows.scanButton, isTablet && styles.primaryButtonTablet]}
+          activeOpacity={0.85}
+          onPress={() => router.push('/scanner')}
+        >
+          <Ionicons name="scan" size={isTablet ? 28 : 24} color="#ffffff" />
+          <Text style={[styles.primaryButtonText, isTablet && styles.primaryButtonTextTablet]}>
+            Iniciar escaneo
+          </Text>
+        </TouchableOpacity>
+
+        {/* Separator */}
+        <View style={styles.separator}>
+          <View style={[styles.separatorLine, { backgroundColor: colors.border }]} />
+          <Text style={[styles.separatorText, { color: colors.textSecondary }]}>o</Text>
+          <View style={[styles.separatorLine, { backgroundColor: colors.border }]} />
+        </View>
+
+        {/* Option 2: Upload device photo */}
+        <View style={[styles.optionCard, isTablet && styles.optionCardTablet, { backgroundColor: colors.card, borderColor: colors.border }]}>
+          <Ionicons name="camera" size={24} color={colors.primary} />
+          <View style={styles.optionTextContainer}>
+            <Text style={[styles.optionTitle, isTablet && styles.optionTitleTablet, { color: colors.text }]}>
+              Subir foto del dispositivo
+            </Text>
+            <Text style={[styles.optionDescription, isTablet && styles.optionDescriptionTablet, { color: colors.textSecondary }]}>
+              Toma o selecciona una foto del dispositivo sanitario
+            </Text>
+          </View>
+        </View>
+        <View style={styles.photoButtonsRow}>
+          <TouchableOpacity
+            style={[styles.photoButton, isTablet && styles.photoButtonTablet, { backgroundColor: colors.primaryContainer, borderColor: colors.primary }]}
+            activeOpacity={0.7}
+            onPress={handleTakePhoto}
+          >
+            <Ionicons name="camera-outline" size={20} color={colors.primary} />
+            <Text style={[styles.photoButtonText, { color: colors.primary }]}>Tomar foto</Text>
+          </TouchableOpacity>
+          <TouchableOpacity
+            style={[styles.photoButton, isTablet && styles.photoButtonTablet, { backgroundColor: colors.primaryContainer, borderColor: colors.primary }]}
+            activeOpacity={0.7}
+            onPress={handleSelectFromGallery}
+          >
+            <Ionicons name="images-outline" size={20} color={colors.primary} />
+            <Text style={[styles.photoButtonText, { color: colors.primary }]}>Galería</Text>
+          </TouchableOpacity>
+        </View>
+        {selectedImage && (
+          <View style={styles.imagePreviewContainer}>
+            <Ionicons name="checkmark-circle" size={20} color={colors.success} />
+            <Text style={[styles.imagePreviewText, { color: colors.success }]}>Foto seleccionada correctamente</Text>
+          </View>
+        )}
+
+        {/* Option 3: Enter card number manually */}
+        <View style={[styles.optionCard, isTablet && styles.optionCardTablet, { backgroundColor: colors.card, borderColor: colors.border }]}>
+          <Ionicons name="keypad" size={24} color={colors.primary} />
+          <View style={styles.optionTextContainer}>
+            <Text style={[styles.optionTitle, isTablet && styles.optionTitleTablet, { color: colors.text }]}>
+              Introducir número manualmente
+            </Text>
+            <Text style={[styles.optionDescription, isTablet && styles.optionDescriptionTablet, { color: colors.textSecondary }]}>
+              Escribe el número de tu tarjeta sanitaria
+            </Text>
+          </View>
+        </View>
+        <View style={styles.manualInputRow}>
+          <TextInput
+            style={[styles.manualInput, isTablet && styles.manualInputTablet, { backgroundColor: colors.card, borderColor: colors.border, color: colors.text }]}
+            placeholder="Introduce el número de tarjeta"
+            placeholderTextColor={colors.textSecondary}
+            value={manualNumber}
+            onChangeText={setManualNumber}
+            keyboardType="default"
+            autoCapitalize="none"
+            autoCorrect={false}
+            returnKeyType="search"
+            onSubmitEditing={handleManualSubmit}
+          />
+          <TouchableOpacity
+            style={[styles.manualSubmitButton, isTablet && styles.manualSubmitButtonTablet]}
+            activeOpacity={0.7}
+            onPress={handleManualSubmit}
+          >
+            <Ionicons name="arrow-forward" size={20} color="#ffffff" />
+          </TouchableOpacity>
+        </View>
+      </View>
+    </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  scrollContainer: {
+    flex: 1,
+  },
+  scrollContent: {
+    flexGrow: 1,
+    paddingVertical: spacing.xl,
+  },
+  content: {
+    alignItems: 'center',
+    paddingHorizontal: spacing.xl,
+    gap: spacing.md,
+  },
+  contentTablet: {
+    gap: spacing.lg,
+  },
+  iconContainer: {
+    width: 100,
+    height: 100,
+    borderRadius: 50,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginBottom: spacing.sm,
+  },
+  iconContainerTablet: {
+    width: 140,
+    height: 140,
+    borderRadius: 70,
+  },
+  title: {
+    fontSize: 22,
+    fontWeight: 'bold',
+  },
+  titleTablet: {
+    fontSize: 28,
+  },
+  description: {
+    fontSize: 15,
+    textAlign: 'center',
+    lineHeight: 22,
+    maxWidth: 280,
+  },
+  descriptionTablet: {
+    fontSize: 17,
+    maxWidth: 420,
+    lineHeight: 26,
+  },
+  primaryButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    backgroundColor: '#2b5bb5',
+    borderRadius: borderRadius.lg,
+    paddingVertical: spacing.md,
+    paddingHorizontal: spacing.xl,
+    marginTop: spacing.sm,
+  },
+  primaryButtonTablet: {
+    paddingVertical: spacing.lg,
+    paddingHorizontal: spacing.xl * 1.5,
+  },
+  primaryButtonText: {
+    fontSize: 17,
+    fontWeight: '600',
+    color: '#ffffff',
+  },
+  primaryButtonTextTablet: {
+    fontSize: 20,
+  },
+  separator: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    width: '100%',
+    marginVertical: spacing.sm,
+  },
+  separatorLine: {
+    flex: 1,
+    height: 1,
+  },
+  separatorText: {
+    marginHorizontal: spacing.md,
+    fontSize: 14,
+  },
+  optionCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    width: '100%',
+    borderRadius: borderRadius.lg,
+    padding: spacing.md,
+    gap: spacing.md,
+    borderWidth: 1,
+  },
+  optionCardTablet: {
+    padding: spacing.lg,
+  },
+  optionTextContainer: {
+    flex: 1,
+  },
+  optionTitle: {
+    fontSize: 16,
+    fontWeight: '600',
+  },
+  optionTitleTablet: {
+    fontSize: 18,
+  },
+  optionDescription: {
+    fontSize: 13,
+    marginTop: 2,
+  },
+  optionDescriptionTablet: {
+    fontSize: 15,
+  },
+  photoButtonsRow: {
+    flexDirection: 'row',
+    width: '100%',
+    gap: spacing.sm,
+  },
+  photoButton: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: spacing.xs,
+    borderRadius: borderRadius.md,
+    paddingVertical: spacing.sm + 4,
+    borderWidth: 1,
+  },
+  photoButtonTablet: {
+    paddingVertical: spacing.md,
+  },
+  photoButtonText: {
+    fontSize: 14,
+    fontWeight: '500',
+  },
+  imagePreviewContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs,
+    paddingVertical: spacing.xs,
+  },
+  imagePreviewText: {
+    fontSize: 13,
+    fontWeight: '500',
+  },
+  manualInputRow: {
+    flexDirection: 'row',
+    width: '100%',
+    gap: spacing.sm,
+  },
+  manualInput: {
+    flex: 1,
+    borderRadius: borderRadius.md,
+    borderWidth: 1,
+    paddingHorizontal: spacing.md,
+    paddingVertical: spacing.sm + 4,
+    fontSize: 15,
+  },
+  manualInputTablet: {
+    fontSize: 18,
+    paddingVertical: spacing.md,
+  },
+  manualSubmitButton: {
+    backgroundColor: '#7fbf8f',
+    borderRadius: borderRadius.md,
+    width: 48,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  manualSubmitButtonTablet: {
+    width: 56,
+  },
+});

apps/frontend-mobile/app/(tabs)/search.tsx

@@ -0,0 +1,368 @@
+import React, { useState, useEffect } from 'react';
+import { View, FlatList, StyleSheet, Text, TouchableOpacity, useWindowDimensions } from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import { useNavigation, useRouter } from 'expo-router';
+import { SearchBar } from '../../components/SearchBar';
+import { MedicineCard } from '../../components/MedicineCard';
+import { LoadingSpinner } from '../../components/LoadingSpinner';
+import { useDebounce } from '../../hooks/useDebounce';
+import { useAuth } from '../../hooks/useAuth';
+import { useRecentSearches } from '../../hooks/useRecentSearches';
+import { searchMedicines } from '../../services/medicines';
+import { searchProducts, Product } from '../../services/products';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius } from '../../constants/theme';
+import { Medicine } from '../../types';
+import { config } from '../../constants/config';
+
+const TABLET_MIN_WIDTH = 768;
+
+const suggestions = [
+  { name: 'Paracetamol', icon: 'medical' as const },
+  { name: 'Ibuprofeno', icon: 'fitness' as const },
+  { name: 'Aspirina', icon: 'heart' as const },
+  { name: 'Omeprazol', icon: 'bandage' as const },
+];
+
+export default function SearchScreen() {
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { isAuthenticated } = useAuth();
+  const { recentSearches, addSearch, removeSearch } = useRecentSearches();
+  const { colors } = useThemeContext();
+  const [query, setQuery] = useState('');
+  const [results, setResults] = useState<Medicine[]>([]);
+  const [products, setProducts] = useState<Product[]>([]);
+  const [searchMode, setSearchMode] = useState<'all' | 'medicines' | 'products'>('all');
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const debouncedQuery = useDebounce(query, config.SEARCH_DEBOUNCE_MS);
+  const navigation = useNavigation();
+  const router = useRouter();
+
+  useEffect(() => {
+    const parent = navigation.getParent();
+    if (!parent) return;
+    const unsubscribe = parent.addListener('tabPress', () => {
+      setQuery('');
+      setResults([]);
+      setProducts([]);
+      setSearchMode('all');
+      setIsLoading(false);
+      setError(null);
+    });
+    return unsubscribe;
+  }, [navigation]);
+
+  useEffect(() => {
+    if (debouncedQuery.length < 2) {
+      setResults([]);
+      setProducts([]);
+      return;
+    }
+
+    const fetchResults = async () => {
+      setIsLoading(true);
+      setError(null);
+      try {
+        const data = await searchMedicines(debouncedQuery);
+        setResults(data);
+      } catch (err) {
+        setError('Error al buscar medicamentos');
+        console.error(err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    const fetchProducts = async () => {
+      try {
+        const productResults = await searchProducts(debouncedQuery);
+        setProducts(productResults);
+      } catch (err) {
+        console.error('Product search error:', err);
+      }
+    };
+
+    fetchResults();
+    fetchProducts();
+  }, [debouncedQuery]);
+
+  const handleSearch = (searchQuery: string) => {
+    setQuery(searchQuery);
+    if (searchQuery.trim()) addSearch(searchQuery);
+  };
+
+  const showSuggestions = !query && !isLoading && results.length === 0 && products.length === 0;
+
+  return (
+    <View style={[styles.container, { backgroundColor: colors.background }]}>
+      <SearchBar
+        onSearch={handleSearch}
+        value={query}
+        onChangeText={setQuery}
+      />
+
+      {query.length >= 2 && (
+        <View style={styles.filterContainer}>
+          <TouchableOpacity style={[styles.filterTab, searchMode === 'all' && styles.filterTabActive]} onPress={() => setSearchMode('all')}>
+            <Text style={[styles.filterText, searchMode === 'all' && styles.filterTextActive]}>Todos</Text>
+          </TouchableOpacity>
+          <TouchableOpacity style={[styles.filterTab, searchMode === 'medicines' && styles.filterTabActive]} onPress={() => setSearchMode('medicines')}>
+            <Text style={[styles.filterText, searchMode === 'medicines' && styles.filterTextActive]}>Medicamentos</Text>
+          </TouchableOpacity>
+          <TouchableOpacity style={[styles.filterTab, searchMode === 'products' && styles.filterTabActive]} onPress={() => setSearchMode('products')}>
+            <Text style={[styles.filterText, searchMode === 'products' && styles.filterTextActive]}>Parafarmacia</Text>
+          </TouchableOpacity>
+        </View>
+      )}
+
+      {showSuggestions && (
+        <>
+          <View style={[styles.suggestionsSection, isTablet && styles.suggestionsSectionTablet]}>
+            <Text style={[styles.sectionTitle, { color: colors.text }]}>Sugerencias</Text>
+            <View style={styles.suggestionsGrid}>
+              {suggestions.map((s) => (
+                <TouchableOpacity
+                  key={s.name}
+                  style={[styles.suggestionCard, { backgroundColor: colors.card, borderColor: colors.border }]}
+                  onPress={() => handleSearch(s.name)}
+                  activeOpacity={0.7}
+                >
+                  <View style={[styles.suggestionIcon, { backgroundColor: colors.surfaceLow }]}>
+                    <Ionicons name={s.icon} size={22} color={colors.primary} />
+                  </View>
+                  <Text style={[styles.suggestionName, { color: colors.text }]}>{s.name}</Text>
+                </TouchableOpacity>
+              ))}
+            </View>
+          </View>
+
+          {isAuthenticated && recentSearches.length > 0 && (
+            <View style={[styles.recentSection, isTablet && styles.recentSectionTablet]}>
+              <Text style={[styles.sectionTitle, { color: colors.text }]}>Búsquedas recientes</Text>
+              {recentSearches.map((term) => (
+                <TouchableOpacity
+                  key={term}
+                  style={styles.recentItem}
+                  onPress={() => handleSearch(term)}
+                  activeOpacity={0.7}
+                >
+                  <Ionicons name="time-outline" size={18} color={colors.textSecondary} />
+                  <Text style={[styles.recentText, { color: colors.text }]}>{term}</Text>
+                  <TouchableOpacity onPress={() => removeSearch(term)} hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}>
+                    <Ionicons name="close" size={16} color={colors.textSecondary} />
+                  </TouchableOpacity>
+                </TouchableOpacity>
+              ))}
+            </View>
+          )}
+        </>
+      )}
+
+      {isLoading && <LoadingSpinner message="Buscando..." />}
+
+      {error && (
+        <View style={[styles.errorContainer, isTablet && styles.errorContainerTablet, { backgroundColor: colors.dangerContainer }]}>
+          <Text style={[styles.errorText, { color: colors.danger }]}>{error}</Text>
+        </View>
+      )}
+
+      {!isLoading && !error && results.length === 0 && products.length === 0 && query.length >= 2 && (
+        <View style={styles.emptyContainer}>
+          <Text style={[styles.emptyText, { color: colors.textSecondary }]}>No se encontraron resultados</Text>
+        </View>
+      )}
+
+      <FlatList
+        data={(searchMode === 'medicines' || searchMode === 'all') ? results : []}
+        keyExtractor={(item) => item.nregistro}
+        renderItem={({ item }) => <MedicineCard medicine={item} />}
+        ListHeaderComponent={
+          <>
+            {(searchMode === 'all' || searchMode === 'products') && products.length > 0 && (
+              <View style={styles.section}>
+                <Text style={[styles.sectionTitle, { color: colors.text }]}>Parafarmacia y Bebé</Text>
+                {products.map((product) => (
+                  <TouchableOpacity
+                    key={`${product.source}-${product.id}`}
+                    style={[styles.productCard, { backgroundColor: colors.card, borderColor: colors.border }]}
+                    onPress={() => router.push(`/product/${product.source}/${product.id}`)}
+                    activeOpacity={0.7}
+                  >
+                    <View style={styles.productInfo}>
+                      <View style={styles.badges}>
+                        <View style={[styles.sourceBadge, { backgroundColor: product.source === 'cima' ? '#2563eb' : '#16a34a' }]}>
+                          <Text style={styles.badgeText}>{product.source === 'cima' ? 'CIMA' : 'OFF'}</Text>
+                        </View>
+                      </View>
+                      <Text style={[styles.productName, { color: colors.text }]} numberOfLines={1}>{product.name}</Text>
+                      <Text style={[styles.productBrand, { color: colors.textSecondary }]} numberOfLines={1}>{product.brand}</Text>
+                    </View>
+                  </TouchableOpacity>
+                ))}
+              </View>
+            )}
+          </>
+        }
+        contentContainerStyle={[styles.list, isTablet && styles.listTablet]}
+        showsVerticalScrollIndicator={false}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  filterContainer: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    gap: spacing.sm,
+    paddingVertical: spacing.sm,
+    paddingHorizontal: spacing.md,
+  },
+  filterTab: {
+    paddingHorizontal: spacing.md,
+    paddingVertical: spacing.sm,
+    borderRadius: borderRadius.full,
+    backgroundColor: 'rgba(0,0,0,0.05)',
+  },
+  filterTabActive: {
+    backgroundColor: '#7fbf8f',
+  },
+  filterText: {
+    fontSize: 14,
+    fontWeight: '600',
+    color: '#41493e',
+  },
+  filterTextActive: {
+    color: '#ffffff',
+  },
+  section: {
+    paddingHorizontal: spacing.lg,
+    marginTop: spacing.md,
+  },
+  suggestionsSection: {
+    marginTop: spacing.sm,
+    alignSelf: 'center',
+    width: '80%',
+  },
+  suggestionsSectionTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
+  sectionTitle: {
+    fontSize: 20,
+    fontWeight: '700',
+    marginBottom: spacing.md,
+  },
+  suggestionsGrid: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    gap: spacing.sm,
+  },
+  suggestionCard: {
+    width: '48%' as unknown as number,
+    borderRadius: borderRadius.lg,
+    borderWidth: 1,
+    padding: spacing.md,
+    gap: spacing.sm,
+  },
+  suggestionIcon: {
+    width: 40,
+    height: 40,
+    borderRadius: borderRadius.md,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  suggestionName: {
+    fontSize: 16,
+    fontWeight: '700',
+  },
+  recentSection: {
+    marginTop: spacing.lg,
+    alignSelf: 'center',
+    width: '80%',
+  },
+  recentSectionTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
+  recentItem: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingVertical: spacing.sm,
+    gap: spacing.sm,
+  },
+  recentText: {
+    flex: 1,
+    fontSize: 15,
+  },
+  list: {
+    paddingBottom: spacing.xl,
+  },
+  listTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
+  errorContainer: {
+    padding: spacing.md,
+    marginHorizontal: spacing.lg,
+    borderRadius: borderRadius.lg,
+  },
+  errorContainerTablet: {
+    maxWidth: 700,
+    alignSelf: 'center',
+  },
+  errorText: {
+    textAlign: 'center',
+    fontSize: 14,
+  },
+  emptyContainer: {
+    padding: spacing.xl,
+    alignItems: 'center',
+  },
+  emptyText: {
+    fontSize: 16,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderRadius: borderRadius.lg,
+    borderWidth: 1,
+    padding: spacing.md,
+    marginBottom: spacing.sm,
+  },
+  productInfo: {
+    flex: 1,
+    gap: 4,
+  },
+  badges: {
+    flexDirection: 'row',
+    gap: spacing.sm,
+    marginBottom: 2,
+  },
+  sourceBadge: {
+    paddingHorizontal: spacing.sm,
+    paddingVertical: 2,
+    borderRadius: borderRadius.sm,
+  },
+  badgeText: {
+    color: '#ffffff',
+    fontSize: 11,
+    fontWeight: '700',
+  },
+  productName: {
+    fontSize: 15,
+    fontWeight: '600',
+  },
+  productBrand: {
+    fontSize: 13,
+  },
+});

apps/frontend-mobile/app/_layout.tsx

@@ -1,31 +1,38 @@
-import { useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { Stack } from 'expo-router';
 import { StatusBar } from 'expo-status-bar';
+import { Image, StyleSheet, View } from 'react-native';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { useAuthStore } from '../store/authStore';
 import { registerForPushNotifications, addNotificationListener, addNotificationResponseListener } from '../services/notifications';
+import { ThemeProvider, useThemeContext } from '../components/ThemeProvider';
 
 const queryClient = new QueryClient();
 
-export default function RootLayout() {
+const bgLight = require('../assets/bg.png');
+const bgDark = require('../assets/bg_dark.png');
+
+function RootLayoutInner() {
   const { checkAuth } = useAuthStore();
+  const { colors, isDark } = useThemeContext();
   const notificationListener = useRef<ReturnType<typeof addNotificationListener>>();
   const responseListener = useRef<ReturnType<typeof addNotificationResponseListener>>();
 
   useEffect(() => {
     checkAuth();
-    
+
     registerForPushNotifications();
-    
+
     notificationListener.current = addNotificationListener((notification) => {
       console.log('Notification received:', notification);
     });
-    
+
     responseListener.current = addNotificationResponseListener((response) => {
       console.log('Notification clicked:', response);
     });
-    
+
     return () => {
       notificationListener.current?.remove();
       responseListener.current?.remove();
@@ -33,41 +40,100 @@ export default function RootLayout() {
   }, []);
 
   return (
-    <GestureHandlerRootView style={{ flex: 1 }}>
-      <QueryClientProvider client={queryClient}>
-        <Stack>
-          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-          <Stack.Screen 
-            name="medicine/[id]" 
-            options={{ 
-              title: 'Medicamento',
-              headerTintColor: '#007AFF',
-            }} 
-          />
-          <Stack.Screen 
-            name="pharmacy/[id]" 
-            options={{ 
-              title: 'Farmacia',
-              headerTintColor: '#007AFF',
-            }} 
-          />
-          <Stack.Screen 
-            name="auth/login" 
-            options={{ 
-              title: 'Iniciar Sesión',
-              headerShown: false,
-            }} 
-          />
-          <Stack.Screen 
-            name="auth/register" 
-            options={{ 
-              title: 'Registrarse',
-              headerShown: false,
-            }} 
-          />
-        </Stack>
-        <StatusBar style="auto" />
-      </QueryClientProvider>
+    <>
+      <Stack
+        screenOptions={{
+          headerStyle: { backgroundColor: colors.card },
+          headerTintColor: colors.primary,
+          headerTitleStyle: { color: colors.text, fontWeight: '600' },
+        }}
+      >
+        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="medicine/[id]"
+          options={{ title: 'Medicamento' }}
+        />
+        <Stack.Screen
+          name="pharmacy/[id]"
+          options={{ title: 'Farmacia' }}
+        />
+        <Stack.Screen
+          name="scanner"
+          options={{
+            title: 'Escanear',
+            headerShown: false,
+          }}
+        />
+        <Stack.Screen
+          name="auth/login"
+          options={{
+            title: 'Iniciar Sesión',
+            headerShown: false,
+          }}
+        />
+        <Stack.Screen
+          name="auth/register"
+          options={{
+            title: 'Registrarse',
+            headerShown: false,
+          }}
+        />
+      </Stack>
+      <StatusBar style={isDark ? 'light' : 'auto'} />
+    </>
+  );
+}
+
+function ThemedBackground({ children }: { children: React.ReactNode }) {
+  const { isDark } = useThemeContext();
+
+  return (
+    <View style={styles.root}>
+      <Image
+        source={isDark ? bgDark : bgLight}
+        style={styles.bgImage}
+        resizeMode="cover"
+      />
+      <View style={[styles.overlay, isDark && styles.overlayDark]} pointerEvents="none" />
+      <View style={styles.content}>
+        {children}
+      </View>
+    </View>
+  );
+}
+
+export default function RootLayout() {
+  return (
+    <GestureHandlerRootView style={styles.root}>
+      <SafeAreaProvider>
+        <QueryClientProvider client={queryClient}>
+          <ThemeProvider>
+            <ThemedBackground>
+              <RootLayoutInner />
+            </ThemedBackground>
+          </ThemeProvider>
+        </QueryClientProvider>
+      </SafeAreaProvider>
     </GestureHandlerRootView>
   );
 }
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+  },
+  bgImage: {
+    ...StyleSheet.absoluteFillObject,
+    opacity: 0.55,
+  },
+  overlay: {
+    ...StyleSheet.absoluteFillObject,
+    backgroundColor: 'rgba(255, 252, 245, 0.48)',
+  },
+  overlayDark: {
+    backgroundColor: 'rgba(0, 0, 0, 0.25)',
+  },
+  content: {
+    flex: 1,
+  },
+});

apps/frontend-mobile/app/auth/login.tsx

@@ -1,38 +1,54 @@
 import React, { useState, useEffect } from 'react';
-import { 
-  View, 
-  Text, 
-  TextInput, 
-  TouchableOpacity, 
-  StyleSheet, 
+import {
+  View,
+  Text,
+  TextInput,
+  TouchableOpacity,
+  StyleSheet,
   KeyboardAvoidingView,
   Platform,
-  Alert
+  Alert,
+  Image,
 } from 'react-native';
 import { useRouter } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
 import { useAuthStore } from '../../store/authStore';
-import { colors, spacing, borderRadius } from '../../constants/theme';
-import { 
-  isBiometricsAvailable, 
-  authenticateWithBiometrics, 
-  saveBiometricCredentials, 
-  getBiometricUsername 
+import { useThemeContext } from '../../components/ThemeProvider';
+import { register } from '../../services/auth';
+import { spacing, borderRadius, shadows } from '../../constants/theme';
+import {
+  isBiometricsAvailable,
+  authenticateWithBiometrics,
+  saveBiometricCredentials,
+  getBiometricUsername,
 } from '../../services/biometrics';
 
+type Tab = 'login' | 'register';
+
 export default function LoginScreen() {
   const router = useRouter();
   const { login } = useAuthStore();
+  const { colors } = useThemeContext();
+  const [tab, setTab] = useState<Tab>('login');
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
   const [isLoading, setIsLoading] = useState(false);
   const [biometricsAvailable, setBiometricsAvailable] = useState(false);
   const [biometricUsername, setBiometricUsername] = useState<string | null>(null);
 
+  const isRegister = tab === 'register';
+
   useEffect(() => {
     checkBiometrics();
   }, []);
 
+  useEffect(() => {
+    setUsername('');
+    setPassword('');
+    setConfirmPassword('');
+  }, [tab]);
+
   const checkBiometrics = async () => {
     try {
       const available = await isBiometricsAvailable();
@@ -46,22 +62,42 @@ export default function LoginScreen() {
     }
   };
 
-  const handleLogin = async () => {
-    if (!username || !password) {
-      Alert.alert('Error', 'Por favor ingresa usuario y contraseña');
+  const handleSubmit = async () => {
+    if (!username.trim() || !password) {
+      Alert.alert('Error', 'Por favor completa todos los campos');
       return;
     }
 
+    if (isRegister) {
+      if (password.length < 8) {
+        Alert.alert('Error', 'La contraseña debe tener al menos 8 caracteres');
+        return;
+      }
+      if (password !== confirmPassword) {
+        Alert.alert('Error', 'Las contraseñas no coinciden');
+        return;
+      }
+    }
+
     setIsLoading(true);
     try {
-      await login(username, password);
-      // Save username for biometric login
-      if (biometricsAvailable) {
-        await saveBiometricCredentials(username);
+      if (isRegister) {
+        await register(username.trim(), password);
+        Alert.alert('Éxito', 'Cuenta creada correctamente', [
+          { text: 'OK', onPress: () => setTab('login') },
+        ]);
+      } else {
+        await login(username.trim(), password);
+        if (biometricsAvailable) {
+          await saveBiometricCredentials(username.trim());
+        }
+        router.replace('/(tabs)');
       }
-      router.replace('/(tabs)');
     } catch (error) {
-      Alert.alert('Error', 'Credenciales incorrectas');
+      Alert.alert(
+        'Error',
+        isRegister ? 'No se pudo crear la cuenta' : 'Credenciales incorrectas'
+      );
     } finally {
       setIsLoading(false);
     }
@@ -77,8 +113,6 @@ export default function LoginScreen() {
     try {
       const authenticated = await authenticateWithBiometrics();
       if (authenticated) {
-        // Use saved username with empty password for biometric login
-        // The backend should handle biometric authentication differently
         await login(biometricUsername, '');
         router.replace('/(tabs)');
       } else {
@@ -93,64 +127,165 @@ export default function LoginScreen() {
 
   return (
     <KeyboardAvoidingView
-      style={styles.container}
+      style={[styles.container, { backgroundColor: colors.background }]}
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
     >
-      <View style={styles.form}>
-        <Text style={styles.title}>Iniciar Sesión</Text>
-        <Text style={styles.subtitle}>Ingresa tus credenciales para continuar</Text>
-
-        <View style={styles.inputContainer}>
-          <Text style={styles.label}>Usuario</Text>
-          <TextInput
-            style={styles.input}
-            value={username}
-            onChangeText={setUsername}
-            placeholder="Tu usuario"
-            placeholderTextColor={colors.textSecondary}
-            autoCapitalize="none"
-            autoCorrect={false}
+      <View style={styles.content}>
+        {/* Logo */}
+        <View style={styles.logoSection}>
+          <Image
+            source={require('../../assets/farmaclic_logo.png')}
+            style={styles.logo}
+            resizeMode="contain"
           />
+          <Text style={[styles.brandName, { color: colors.text }]}>FarmaClic</Text>
         </View>
 
-        <View style={styles.inputContainer}>
-          <Text style={styles.label}>Contraseña</Text>
-          <TextInput
-            style={styles.input}
-            value={password}
-            onChangeText={setPassword}
-            placeholder="Tu contraseña"
-            placeholderTextColor={colors.textSecondary}
-            secureTextEntry
-          />
-        </View>
-
-        <TouchableOpacity
-          style={[styles.button, isLoading && styles.buttonDisabled]}
-          onPress={handleLogin}
-          disabled={isLoading}
-        >
-          <Text style={styles.buttonText}>
-            {isLoading ? 'Ingresando...' : 'Iniciar Sesión'}
-          </Text>
-        </TouchableOpacity>
-
-        {biometricsAvailable && biometricUsername && (
+        {/* Tabs */}
+        <View style={[styles.tabBar, { backgroundColor: colors.surfaceLow }]}>
           <TouchableOpacity
-            style={[styles.biometricButton, isLoading && styles.buttonDisabled]}
-            onPress={handleBiometricLogin}
+            style={[
+              styles.tab,
+              !isRegister && [styles.tabActive, { backgroundColor: colors.primary }],
+            ]}
+            onPress={() => setTab('login')}
             disabled={isLoading}
           >
-            <Ionicons name="finger-print" size={24} color={colors.primary} />
-            <Text style={styles.biometricText}>Iniciar con biometría</Text>
+            <Text
+              style={[
+                styles.tabText,
+                { color: isRegister ? colors.textSecondary : colors.onPrimaryContainer },
+                !isRegister && styles.tabTextActive,
+              ]}
+            >
+              Iniciar Sesión
+            </Text>
           </TouchableOpacity>
-        )}
+          <TouchableOpacity
+            style={[
+              styles.tab,
+              isRegister && [styles.tabActive, { backgroundColor: colors.primary }],
+            ]}
+            onPress={() => setTab('register')}
+            disabled={isLoading}
+          >
+            <Text
+              style={[
+                styles.tabText,
+                { color: !isRegister ? colors.textSecondary : colors.onPrimaryContainer },
+                isRegister && styles.tabTextActive,
+              ]}
+            >
+              Crear Cuenta
+            </Text>
+          </TouchableOpacity>
+        </View>
 
+        {/* Card */}
+        <View style={[styles.card, { backgroundColor: colors.card }, shadows.card]}>
+          {/* Header */}
+          <Text style={[styles.title, { color: colors.text }]}>
+            {isRegister ? 'Crea tu cuenta' : 'Bienvenido de nuevo'}
+          </Text>
+          <Text style={[styles.subtitle, { color: colors.textSecondary }]}>
+            {isRegister
+              ? 'Guarda tu dirección y recibe notificaciones cuando lleguen medicamentos.'
+              : 'Inicia sesión para gestionar tu perfil y notificaciones.'}
+          </Text>
+
+          {/* Username */}
+          <View style={[styles.inputWrapper, { backgroundColor: colors.surfaceLow, borderColor: colors.border }]}>
+            <Ionicons name="person-outline" size={20} color={colors.textSecondary} style={styles.inputIcon} />
+            <TextInput
+              style={[styles.input, { color: colors.text }]}
+              value={username}
+              onChangeText={setUsername}
+              placeholder="Usuario"
+              placeholderTextColor={colors.textSecondary}
+              autoCapitalize="none"
+              autoCorrect={false}
+              autoComplete="username"
+            />
+          </View>
+
+          {/* Password */}
+          <View style={[styles.inputWrapper, { backgroundColor: colors.surfaceLow, borderColor: colors.border }]}>
+            <Ionicons name="lock-closed-outline" size={20} color={colors.textSecondary} style={styles.inputIcon} />
+            <TextInput
+              style={[styles.input, { color: colors.text }]}
+              value={password}
+              onChangeText={setPassword}
+              placeholder="Contraseña"
+              placeholderTextColor={colors.textSecondary}
+              secureTextEntry
+              autoComplete={isRegister ? 'new-password' : 'current-password'}
+            />
+          </View>
+
+          {/* Confirm password (register only) */}
+          {isRegister && (
+            <View style={[styles.inputWrapper, { backgroundColor: colors.surfaceLow, borderColor: colors.border }]}>
+              <Ionicons name="lock-closed-outline" size={20} color={colors.textSecondary} style={styles.inputIcon} />
+              <TextInput
+                style={[styles.input, { color: colors.text }]}
+                value={confirmPassword}
+                onChangeText={setConfirmPassword}
+                placeholder="Confirmar contraseña"
+                placeholderTextColor={colors.textSecondary}
+                secureTextEntry
+                autoComplete="new-password"
+              />
+            </View>
+          )}
+
+          {/* Hints (register only) */}
+          {isRegister && (
+            <View style={styles.hints}>
+              <Text style={[styles.hint, { color: colors.textSecondary }]}>
+                <Ionicons name="information-circle-outline" size={14} color={colors.textSecondary} /> 3-32 caracteres para el usuario
+              </Text>
+              <Text style={[styles.hint, { color: colors.textSecondary }]}>
+                <Ionicons name="information-circle-outline" size={14} color={colors.textSecondary} /> Mínimo 8 caracteres para la contraseña
+              </Text>
+            </View>
+          )}
+
+          {/* Submit button */}
+          <TouchableOpacity
+            style={[styles.button, { backgroundColor: colors.primary }, isLoading && styles.buttonDisabled]}
+            onPress={handleSubmit}
+            disabled={isLoading}
+          >
+            {isLoading ? (
+              <Ionicons name="hourglass" size={20} color={colors.onPrimaryContainer} />
+            ) : (
+              <Text style={[styles.buttonText, { color: colors.onPrimaryContainer }]}>
+                {isRegister ? 'Crear Cuenta' : 'Iniciar Sesión'}
+              </Text>
+            )}
+          </TouchableOpacity>
+
+          {/* Biometrics (login only) */}
+          {!isRegister && biometricsAvailable && biometricUsername && (
+            <TouchableOpacity
+              style={[styles.biometricButton, { borderColor: colors.primary }]}
+              onPress={handleBiometricLogin}
+              disabled={isLoading}
+            >
+              <Ionicons name="finger-print" size={22} color={colors.primary} />
+              <Text style={[styles.biometricText, { color: colors.primary }]}>Iniciar con biometría</Text>
+            </TouchableOpacity>
+          )}
+        </View>
+
+        {/* Footer link */}
         <TouchableOpacity
           style={styles.linkButton}
-          onPress={() => router.push('/auth/register')}
+          onPress={() => setTab(isRegister ? 'login' : 'register')}
         >
-          <Text style={styles.linkText}>¿No tienes cuenta? Regístrate</Text>
+          <Text style={[styles.linkText, { color: colors.primary }]}>
+            {isRegister ? '¿Ya tienes cuenta? Inicia sesión' : '¿No tienes cuenta? Regístrate'}
+          </Text>
         </TouchableOpacity>
       </View>
     </KeyboardAvoidingView>
@@ -160,78 +295,124 @@ export default function LoginScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: colors.background,
   },
-  form: {
+  content: {
     flex: 1,
     justifyContent: 'center',
-    padding: spacing.xl,
+    paddingHorizontal: spacing.lg,
+    gap: spacing.lg,
   },
-  title: {
-    fontSize: 28,
-    fontWeight: 'bold',
-    color: colors.text,
-    marginBottom: spacing.sm,
+  logoSection: {
+    alignItems: 'center',
+    gap: spacing.sm,
   },
-  subtitle: {
-    fontSize: 16,
-    color: colors.textSecondary,
-    marginBottom: spacing.xl,
+  logo: {
+    width: 80,
+    height: 80,
   },
-  inputContainer: {
-    marginBottom: spacing.md,
+  brandName: {
+    fontSize: 22,
+    fontWeight: '700',
+    letterSpacing: -0.3,
   },
-  label: {
+  tabBar: {
+    flexDirection: 'row',
+    borderRadius: borderRadius.lg,
+    padding: 4,
+  },
+  tab: {
+    flex: 1,
+    paddingVertical: spacing.sm + 2,
+    borderRadius: borderRadius.md,
+    alignItems: 'center',
+  },
+  tabActive: {
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 1 },
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  tabText: {
     fontSize: 14,
     fontWeight: '500',
-    color: colors.text,
+  },
+  tabTextActive: {
+    fontWeight: '700',
+  },
+  card: {
+    borderRadius: borderRadius.xl,
+    padding: spacing.lg,
+    gap: spacing.sm,
+  },
+  title: {
+    fontSize: 22,
+    fontWeight: '700',
     marginBottom: spacing.xs,
   },
-  input: {
-    backgroundColor: colors.card,
+  subtitle: {
+    fontSize: 14,
+    lineHeight: 20,
+    marginBottom: spacing.sm,
+  },
+  inputWrapper: {
+    flexDirection: 'row',
+    alignItems: 'center',
     borderRadius: borderRadius.md,
-    padding: spacing.md,
+    borderWidth: 1,
+    paddingHorizontal: spacing.md,
+  },
+  inputIcon: {
+    marginRight: spacing.sm,
+  },
+  input: {
+    flex: 1,
+    paddingVertical: spacing.md,
     fontSize: 16,
-    color: colors.text,
+  },
+  hints: {
+    gap: 2,
+    marginTop: spacing.xs,
+  },
+  hint: {
+    fontSize: 12,
+    lineHeight: 18,
   },
   button: {
-    backgroundColor: colors.primary,
     borderRadius: borderRadius.md,
     padding: spacing.md,
     alignItems: 'center',
-    marginTop: spacing.md,
+    marginTop: spacing.sm,
+    flexDirection: 'row',
+    justifyContent: 'center',
   },
   buttonDisabled: {
     opacity: 0.6,
   },
   buttonText: {
-    color: colors.textInverse,
     fontSize: 16,
-    fontWeight: '600',
-  },
-  linkButton: {
-    marginTop: spacing.lg,
-    alignItems: 'center',
-  },
-  linkText: {
-    color: colors.primary,
-    fontSize: 14,
+    fontWeight: '700',
   },
   biometricButton: {
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',
-    backgroundColor: colors.card,
     borderRadius: borderRadius.md,
     padding: spacing.md,
-    marginTop: spacing.md,
+    marginTop: spacing.xs,
     borderWidth: 1,
-    borderColor: colors.primary,
+    gap: spacing.sm,
   },
   biometricText: {
-    color: colors.primary,
-    fontSize: 16,
+    fontSize: 15,
+    fontWeight: '600',
+  },
+  linkButton: {
+    alignItems: 'center',
+    paddingVertical: spacing.sm,
+  },
+  linkText: {
+    fontSize: 14,
     fontWeight: '600',
-    marginLeft: spacing.sm,
   },
 });

apps/frontend-mobile/app/auth/register.tsx

@@ -1,172 +1,5 @@
-import React, { useState } from 'react';
-import { 
-  View, 
-  Text, 
-  TextInput, 
-  TouchableOpacity, 
-  StyleSheet, 
-  KeyboardAvoidingView,
-  Platform,
-  Alert
-} from 'react-native';
-import { useRouter } from 'expo-router';
-import { register } from '../../services/auth';
-import { colors, spacing, borderRadius } from '../../constants/theme';
+import { Redirect } from 'expo-router';
 
-export default function RegisterScreen() {
-  const router = useRouter();
-  const [username, setUsername] = useState('');
-  const [password, setPassword] = useState('');
-  const [confirmPassword, setConfirmPassword] = useState('');
-  const [isLoading, setIsLoading] = useState(false);
-
-  const handleRegister = async () => {
-    if (!username || !password || !confirmPassword) {
-      Alert.alert('Error', 'Por favor completa todos los campos');
-      return;
-    }
-
-    if (password !== confirmPassword) {
-      Alert.alert('Error', 'Las contraseñas no coinciden');
-      return;
-    }
-
-    setIsLoading(true);
-    try {
-      await register(username, password);
-      router.replace('/(tabs)');
-    } catch (error) {
-      Alert.alert('Error', 'No se pudo crear la cuenta');
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <KeyboardAvoidingView
-      style={styles.container}
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
-      <View style={styles.form}>
-        <Text style={styles.title}>Crear Cuenta</Text>
-        <Text style={styles.subtitle}>Regístrate para empezar</Text>
-
-        <View style={styles.inputContainer}>
-          <Text style={styles.label}>Usuario</Text>
-          <TextInput
-            style={styles.input}
-            value={username}
-            onChangeText={setUsername}
-            placeholder="Elige un usuario"
-            placeholderTextColor={colors.textSecondary}
-            autoCapitalize="none"
-            autoCorrect={false}
-          />
-        </View>
-
-        <View style={styles.inputContainer}>
-          <Text style={styles.label}>Contraseña</Text>
-          <TextInput
-            style={styles.input}
-            value={password}
-            onChangeText={setPassword}
-            placeholder="Elige una contraseña"
-            placeholderTextColor={colors.textSecondary}
-            secureTextEntry
-          />
-        </View>
-
-        <View style={styles.inputContainer}>
-          <Text style={styles.label}>Confirmar Contraseña</Text>
-          <TextInput
-            style={styles.input}
-            value={confirmPassword}
-            onChangeText={setConfirmPassword}
-            placeholder="Repite la contraseña"
-            placeholderTextColor={colors.textSecondary}
-            secureTextEntry
-          />
-        </View>
-
-        <TouchableOpacity
-          style={[styles.button, isLoading && styles.buttonDisabled]}
-          onPress={handleRegister}
-          disabled={isLoading}
-        >
-          <Text style={styles.buttonText}>
-            {isLoading ? 'Creando cuenta...' : 'Crear Cuenta'}
-          </Text>
-        </TouchableOpacity>
-
-        <TouchableOpacity
-          style={styles.linkButton}
-          onPress={() => router.back()}
-        >
-          <Text style={styles.linkText}>¿Ya tienes cuenta? Inicia sesión</Text>
-        </TouchableOpacity>
-      </View>
-    </KeyboardAvoidingView>
-  );
+export default function RegisterRedirect() {
+  return <Redirect href="/auth/login" />;
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: colors.background,
-  },
-  form: {
-    flex: 1,
-    justifyContent: 'center',
-    padding: spacing.xl,
-  },
-  title: {
-    fontSize: 28,
-    fontWeight: 'bold',
-    color: colors.text,
-    marginBottom: spacing.sm,
-  },
-  subtitle: {
-    fontSize: 16,
-    color: colors.textSecondary,
-    marginBottom: spacing.xl,
-  },
-  inputContainer: {
-    marginBottom: spacing.md,
-  },
-  label: {
-    fontSize: 14,
-    fontWeight: '500',
-    color: colors.text,
-    marginBottom: spacing.xs,
-  },
-  input: {
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
-    padding: spacing.md,
-    fontSize: 16,
-    color: colors.text,
-  },
-  button: {
-    backgroundColor: colors.primary,
-    borderRadius: borderRadius.md,
-    padding: spacing.md,
-    alignItems: 'center',
-    marginTop: spacing.md,
-  },
-  buttonDisabled: {
-    opacity: 0.6,
-  },
-  buttonText: {
-    color: colors.textInverse,
-    fontSize: 16,
-    fontWeight: '600',
-  },
-  linkButton: {
-    marginTop: spacing.lg,
-    alignItems: 'center',
-  },
-  linkText: {
-    color: colors.primary,
-    fontSize: 14,
-  },
-});

apps/frontend-mobile/app/medicine/[id].tsx

@@ -1,18 +1,57 @@
-import React, { useEffect, useState } from 'react';
-import { View, Text, ScrollView, StyleSheet, TouchableOpacity } from 'react-native';
+import React, { useEffect, useState, useMemo } from 'react';
+import { View, Text, ScrollView, StyleSheet, TouchableOpacity, Linking } from 'react-native';
 import { useLocalSearchParams, useRouter } from 'expo-router';
+import { Ionicons } from '@expo/vector-icons';
+import * as Location from 'expo-location';
 import { getMedicine, getMedicinePharmacies } from '../../services/medicines';
+import { subscribeToMedicine, unsubscribeFromMedicine } from '../../services/notifications';
+import { useAuth } from '../../hooks/useAuth';
 import { StockBadge } from '../../components/StockBadge';
 import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { colors, spacing, borderRadius } from '../../constants/theme';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius } from '../../constants/theme';
 import { Medicine, PharmacyMedicine } from '../../types';
 
+function haversineKm(lat1: number, lon1: number, lat2: number, lon2: number): number {
+  const R = 6371;
+  const dLat = ((lat2 - lat1) * Math.PI) / 180;
+  const dLon = ((lon2 - lon1) * Math.PI) / 180;
+  const a =
+    Math.sin(dLat / 2) ** 2 +
+    Math.cos((lat1 * Math.PI) / 180) *
+      Math.cos((lat2 * Math.PI) / 180) *
+      Math.sin(dLon / 2) ** 2;
+  return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+}
+
+function formatDistance(km: number): string {
+  if (km < 1) return `${Math.round(km * 1000)} m`;
+  if (km < 10) return `${km.toFixed(1)} km`;
+  return `${Math.round(km)} km`;
+}
+
+function getPharmacyLat(p: PharmacyMedicine): number | null {
+  return p.latitude ?? p.pharmacy?.latitude ?? null;
+}
+
+function getPharmacyLon(p: PharmacyMedicine): number | null {
+  return p.longitude ?? p.pharmacy?.longitude ?? null;
+}
+
 export default function MedicineDetailScreen() {
   const { id } = useLocalSearchParams<{ id: string }>();
   const router = useRouter();
+  const { colors } = useThemeContext();
+  const { isAuthenticated } = useAuth();
   const [medicine, setMedicine] = useState<Medicine | null>(null);
   const [pharmacies, setPharmacies] = useState<PharmacyMedicine[]>([]);
   const [isLoading, setIsLoading] = useState(true);
+  const [sortByDistance, setSortByDistance] = useState(false);
+  const [userPosition, setUserPosition] = useState<{ lat: number; lon: number } | null>(null);
+  const [locating, setLocating] = useState(false);
+  const [locationError, setLocationError] = useState<string | null>(null);
+  const [isSubscribed, setIsSubscribed] = useState(false);
+  const [togglingSub, setTogglingSub] = useState(false);
 
   useEffect(() => {
     if (!id) return;
@@ -35,71 +74,233 @@ export default function MedicineDetailScreen() {
     fetchMedicine();
   }, [id]);
 
+  const handleSortByDistance = async () => {
+    if (sortByDistance) {
+      setSortByDistance(false);
+      return;
+    }
+
+    setLocating(true);
+    setLocationError(null);
+
+    try {
+      const { status } = await Location.requestForegroundPermissionsAsync();
+      if (status !== 'granted') {
+        setLocationError('Permiso de ubicación denegado');
+        setLocating(false);
+        return;
+      }
+
+      const pos = await Location.getCurrentPositionAsync({ accuracy: Location.Accuracy.Balanced });
+      setUserPosition({ lat: pos.coords.latitude, lon: pos.coords.longitude });
+      setSortByDistance(true);
+    } catch {
+      setLocationError('No se pudo obtener tu ubicación');
+    } finally {
+      setLocating(false);
+    }
+  };
+
+  const handleToggleSubscription = async () => {
+    if (!isAuthenticated || !id) return;
+    setTogglingSub(true);
+    try {
+      if (isSubscribed) {
+        await unsubscribeFromMedicine(id as string);
+        setIsSubscribed(false);
+      } else {
+        await subscribeToMedicine(id as string, medicine?.name || null);
+        setIsSubscribed(true);
+      }
+    } catch {
+      // silently fail
+    } finally {
+      setTogglingSub(false);
+    }
+  };
+
+  const sortedPharmacies = useMemo(() => {
+    if (!sortByDistance || !userPosition) return pharmacies;
+
+    return [...pharmacies]
+      .map((p) => {
+        const lat = getPharmacyLat(p);
+        const lon = getPharmacyLon(p);
+        const distance =
+          lat != null && lon != null
+            ? haversineKm(userPosition.lat, userPosition.lon, lat, lon)
+            : Infinity;
+        return { ...p, _distance: distance };
+      })
+      .sort((a, b) => a._distance - b._distance);
+  }, [pharmacies, sortByDistance, userPosition]);
+
+  const locatedPharmacies = useMemo(
+    () =>
+      sortedPharmacies.filter(
+        (p) => getPharmacyLat(p) != null && getPharmacyLon(p) != null
+      ),
+    [sortedPharmacies]
+  );
+
+  const mapCenter = useMemo(() => {
+    if (locatedPharmacies.length === 0) return { latitude: 40.4168, longitude: -3.7038 };
+    const lat = locatedPharmacies.reduce((s, p) => s + (getPharmacyLat(p) || 0), 0) / locatedPharmacies.length;
+    const lon = locatedPharmacies.reduce((s, p) => s + (getPharmacyLon(p) || 0), 0) / locatedPharmacies.length;
+    return { latitude: lat, longitude: lon };
+  }, [locatedPharmacies]);
+
+  const handleDirections = (latitude: number, longitude: number) => {
+    const url = `https://www.google.com/maps/dir/?api=1&destination=${latitude},${longitude}`;
+    Linking.openURL(url);
+  };
+
   if (isLoading) {
     return <LoadingSpinner message="Cargando medicamento..." />;
   }
 
   if (!medicine) {
     return (
-      <View style={styles.errorContainer}>
-        <Text style={styles.errorText}>Medicamento no encontrado</Text>
+      <View style={[styles.errorContainer, { backgroundColor: colors.background }]}>
+        <Text style={[styles.errorText, { color: colors.textSecondary }]}>Medicamento no encontrado</Text>
       </View>
     );
   }
 
   return (
-    <ScrollView style={styles.container}>
-      <View style={styles.header}>
-        <Text style={styles.name}>{medicine.nombre}</Text>
-        <StockBadge stock={medicine.stock} />
+    <ScrollView style={[styles.container, { backgroundColor: colors.background }]}>
+      <View style={[styles.header, { backgroundColor: colors.card }]}>
+        <Text style={[styles.name, { color: colors.text }]}>{medicine.name}</Text>
+        <View style={styles.headerRight}>
+          {medicine.stock != null && <StockBadge stock={medicine.stock} />}
+          {isAuthenticated && (
+            <TouchableOpacity
+              style={[styles.bellButton, { backgroundColor: isSubscribed ? colors.primary : colors.surfaceVariant }]}
+              onPress={handleToggleSubscription}
+              disabled={togglingSub}
+            >
+              <Ionicons
+                name={isSubscribed ? 'notifications' : 'notifications-outline'}
+                size={20}
+                color={isSubscribed ? '#fff' : colors.textSecondary}
+              />
+            </TouchableOpacity>
+          )}
+        </View>
       </View>
 
-      <View style={styles.infoSection}>
-        <InfoRow label="Principio activo" value={medicine.principioActivo} />
-        <InfoRow label="Laboratorio" value={medicine.laboratorio} />
-        <InfoRow label="Forma farmacéutica" value={medicine.formaFarmaceutica} />
+      <View style={[styles.infoSection, { backgroundColor: colors.card }]}>
+        <InfoRow label="Principio activo" value={medicine.active_ingredient} colors={colors} />
+        <InfoRow label="Laboratorio" value={medicine.laboratory} colors={colors} />
+        <InfoRow label="Forma farmacéutica" value={medicine.form} colors={colors} />
+        <InfoRow label="Dosificación" value={medicine.dosage} colors={colors} />
         <InfoRow
           label="Precio"
-          value={medicine.precio ? `${medicine.precio.toFixed(2)} €` : 'No disponible'}
+          value={medicine.precio != null ? `${medicine.precio.toFixed(2)} €` : 'No disponible'}
+          colors={colors}
         />
-        <InfoRow label="Registro" value={medicine.nregistro} />
+        <InfoRow label="Registro" value={medicine.nregistro} colors={colors} />
       </View>
 
-      <View style={styles.pharmaciesSection}>
-        <Text style={styles.sectionTitle}>
-          Farmacias ({pharmacies.length})
-        </Text>
+      {locatedPharmacies.length > 0 && (
+        <View style={[styles.mapContainer, { backgroundColor: colors.surfaceVariant }]}>
+          <Ionicons name="map-outline" size={48} color={colors.textSecondary} />
+          <Text style={[styles.mapPlaceholder, { color: colors.textSecondary }]}>
+            Mapa próximamente…
+          </Text>
+        </View>
+      )}
 
-        {pharmacies.length === 0 ? (
-          <Text style={styles.noPharmacies}>No hay farmacias con este medicamento</Text>
-        ) : (
-          pharmacies.map((pharm) => (
-            <TouchableOpacity
-              key={pharm.id}
-              style={styles.pharmacyCard}
-              onPress={() => router.push(`/pharmacy/${pharm.pharmacy_id}`)}
-            >
-              <View style={styles.pharmacyInfo}>
-                <Text style={styles.pharmacyName}>{pharm.pharmacy?.name}</Text>
-                <Text style={styles.pharmacyAddress}>{pharm.pharmacy?.address}</Text>
-              </View>
-              <View style={styles.pharmacyStock}>
-                <Text style={styles.price}>{pharm.price.toFixed(2)} €</Text>
-                <Text style={styles.stock}>Stock: {pharm.stock}</Text>
-              </View>
+      <View style={styles.pharmaciesSection}>
+        <View style={styles.pharmaciesHeader}>
+          <Text style={[styles.sectionTitle, { color: colors.text }]}>
+            Farmacias ({sortedPharmacies.length})
+          </Text>
+          <TouchableOpacity
+            style={[styles.sortButton, sortByDistance && styles.sortButtonActive, { backgroundColor: sortByDistance ? colors.primary : colors.primaryContainer, borderColor: colors.primary }]}
+            onPress={handleSortByDistance}
+            disabled={locating}
+          >
+            <Ionicons name="location" size={16} color={sortByDistance ? '#fff' : colors.primary} />
+            <Text style={[styles.sortButtonText, sortByDistance && styles.sortButtonTextActive, { color: sortByDistance ? '#fff' : colors.primary }]}>
+              {locating
+                ? 'Localizando…'
+                : sortByDistance
+                  ? 'Distancia · Reset'
+                  : 'Ordenar por distancia'}
+            </Text>
+          </TouchableOpacity>
+        </View>
+
+        {locationError && (
+          <View style={[styles.locationErrorContainer, { backgroundColor: colors.dangerContainer }]}>
+            <Text style={[styles.locationErrorText, { color: colors.danger }]}>{locationError}</Text>
+            <TouchableOpacity onPress={handleSortByDistance}>
+              <Text style={[styles.retryText, { color: colors.primary }]}>Reintentar</Text>
             </TouchableOpacity>
-          ))
+          </View>
+        )}
+
+        {sortedPharmacies.length === 0 ? (
+          <Text style={[styles.noPharmacies, { color: colors.textSecondary }]}>No hay farmacias disponibles</Text>
+        ) : (
+          sortedPharmacies.map((pharm) => {
+            const lat = getPharmacyLat(pharm);
+            const lon = getPharmacyLon(pharm);
+            const distanceKm =
+              sortByDistance && userPosition && lat != null && lon != null
+                ? haversineKm(userPosition.lat, userPosition.lon, lat, lon)
+                : null;
+
+            return (
+              <View key={pharm.id} style={[styles.pharmacyCard, { backgroundColor: colors.card }]}>
+                <TouchableOpacity
+                  style={styles.pharmacyCardContent}
+                  onPress={() => router.push(`/pharmacy/${pharm.pharmacy_id || pharm.id}`)}
+                >
+                  <View style={styles.pharmacyInfo}>
+                    <View style={styles.pharmacyNameRow}>
+                      <Text style={[styles.pharmacyName, { color: colors.text }]}>{pharm.pharmacy?.name || pharm.name}</Text>
+                      {distanceKm != null && (
+                        <Text style={[styles.pharmacyDistance, { color: colors.primary, backgroundColor: colors.primaryContainer }]}>{formatDistance(distanceKm)}</Text>
+                      )}
+                    </View>
+                    <Text style={[styles.pharmacyAddress, { color: colors.textSecondary }]}>{pharm.pharmacy?.address || pharm.address}</Text>
+                  </View>
+                  <View style={styles.pharmacyStock}>
+                    {pharm.price != null ? (
+                      <Text style={[styles.price, { color: colors.primary }]}>{pharm.price.toFixed(2)} €</Text>
+                    ) : (
+                      <Text style={[styles.price, { color: colors.primary }]}>Consultar precio</Text>
+                    )}
+                    {pharm.stock > 0 && (
+                      <Text style={[styles.stock, { color: colors.textSecondary }]}>Stock: {pharm.stock}</Text>
+                    )}
+                  </View>
+                </TouchableOpacity>
+                {lat != null && lon != null && (
+                  <TouchableOpacity
+                    style={[styles.directionsButton, { borderTopColor: colors.border }]}
+                    onPress={() => handleDirections(lat, lon)}
+                  >
+                    <Ionicons name="navigate" size={16} color={colors.primary} />
+                    <Text style={[styles.directionsText, { color: colors.primary }]}>Cómo llegar</Text>
+                  </TouchableOpacity>
+                )}
+              </View>
+            );
+          })
         )}
       </View>
     </ScrollView>
   );
 }
 
-function InfoRow({ label, value }: { label: string; value: string }) {
+function InfoRow({ label, value, colors }: { label: string; value: string; colors: any }) {
   return (
-    <View style={styles.infoRow}>
-      <Text style={styles.infoLabel}>{label}</Text>
-      <Text style={styles.infoValue}>{value}</Text>
+    <View style={[styles.infoRow, { borderBottomColor: colors.border }]}>
+      <Text style={[styles.infoLabel, { color: colors.textSecondary }]}>{label}</Text>
+      <Text style={[styles.infoValue, { color: colors.text }]}>{value}</Text>
     </View>
   );
 }
@@ -107,77 +308,154 @@ function InfoRow({ label, value }: { label: string; value: string }) {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: colors.background,
   },
   header: {
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItems: 'flex-start',
-    padding: spacing.md,
-    backgroundColor: colors.card,
+    padding: spacing.lg,
+  },
+  headerRight: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
   },
   name: {
     flex: 1,
     fontSize: 22,
     fontWeight: 'bold',
-    color: colors.text,
     marginRight: spacing.sm,
   },
+  bellButton: {
+    width: 36,
+    height: 36,
+    borderRadius: 18,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
   infoSection: {
-    backgroundColor: colors.card,
     marginTop: spacing.sm,
-    padding: spacing.md,
+    padding: spacing.lg,
   },
   infoRow: {
     flexDirection: 'row',
     justifyContent: 'space-between',
     paddingVertical: spacing.sm,
     borderBottomWidth: 1,
-    borderBottomColor: colors.separator,
   },
   infoLabel: {
-    fontSize: 14,
-    color: colors.textSecondary,
+    fontSize: 13,
+    flexShrink: 0,
+    marginRight: spacing.sm,
   },
   infoValue: {
+    fontSize: 13,
+    fontWeight: '500',
+    flex: 1,
+    textAlign: 'right',
+  },
+  mapContainer: {
+    marginTop: spacing.sm,
+    marginHorizontal: spacing.lg,
+    height: 200,
+    borderRadius: borderRadius.lg,
+    overflow: 'hidden',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: spacing.sm,
+  },
+  mapPlaceholder: {
     fontSize: 14,
-    color: colors.text,
     fontWeight: '500',
   },
   pharmaciesSection: {
     marginTop: spacing.sm,
-    padding: spacing.md,
+    padding: spacing.lg,
+  },
+  pharmaciesHeader: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: spacing.md,
   },
   sectionTitle: {
     fontSize: 18,
     fontWeight: '600',
-    color: colors.text,
-    marginBottom: spacing.md,
+  },
+  sortButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs,
+    paddingHorizontal: spacing.sm + 4,
+    paddingVertical: spacing.xs + 2,
+    borderRadius: borderRadius.full,
+    borderWidth: 1,
+  },
+  sortButtonActive: {},
+  sortButtonText: {
+    fontSize: 13,
+    fontWeight: '600',
+  },
+  sortButtonTextActive: {},
+  locationErrorContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    padding: spacing.sm,
+    marginBottom: spacing.sm,
+    borderRadius: borderRadius.md,
+  },
+  locationErrorText: {
+    flex: 1,
+    fontSize: 13,
+  },
+  retryText: {
+    fontSize: 13,
+    fontWeight: '600',
   },
   noPharmacies: {
-    color: colors.textSecondary,
     textAlign: 'center',
     padding: spacing.xl,
   },
   pharmacyCard: {
+    borderRadius: borderRadius.lg,
+    marginBottom: spacing.sm,
+    overflow: 'hidden',
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 8,
+    elevation: 2,
+  },
+  pharmacyCardContent: {
     flexDirection: 'row',
     justifyContent: 'space-between',
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
     padding: spacing.md,
-    marginBottom: spacing.sm,
   },
   pharmacyInfo: {
     flex: 1,
   },
+  pharmacyNameRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
   pharmacyName: {
+    flex: 1,
     fontSize: 16,
     fontWeight: '600',
-    color: colors.text,
+    marginRight: spacing.sm,
+  },
+  pharmacyDistance: {
+    fontSize: 12,
+    fontWeight: '600',
+    paddingHorizontal: spacing.sm,
+    paddingVertical: 2,
+    borderRadius: borderRadius.full,
+    overflow: 'hidden',
   },
   pharmacyAddress: {
     fontSize: 14,
-    color: colors.textSecondary,
     marginTop: spacing.xs,
   },
   pharmacyStock: {
@@ -186,13 +464,23 @@ const styles = StyleSheet.create({
   price: {
     fontSize: 16,
     fontWeight: '600',
-    color: colors.primary,
   },
   stock: {
     fontSize: 12,
-    color: colors.textSecondary,
     marginTop: spacing.xs,
   },
+  directionsButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: spacing.xs,
+    paddingVertical: spacing.sm,
+    borderTopWidth: 1,
+  },
+  directionsText: {
+    fontSize: 14,
+    fontWeight: '600',
+  },
   errorContainer: {
     flex: 1,
     justifyContent: 'center',
@@ -200,6 +488,5 @@ const styles = StyleSheet.create({
   },
   errorText: {
     fontSize: 16,
-    color: colors.textSecondary,
   },
 });

apps/frontend-mobile/app/pharmacy/[id].tsx

@@ -4,16 +4,22 @@ import { useLocalSearchParams, useRouter } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
 import MapView, { Marker } from 'react-native-maps';
 import { getPharmacy, getPharmacyMedicines } from '../../services/pharmacies';
+import { subscribeToMedicine, unsubscribeFromMedicine } from '../../services/notifications';
+import { useAuth } from '../../hooks/useAuth';
 import { LoadingSpinner } from '../../components/LoadingSpinner';
-import { colors, spacing, borderRadius } from '../../constants/theme';
+import { useThemeContext } from '../../components/ThemeProvider';
+import { spacing, borderRadius } from '../../constants/theme';
 import { Pharmacy, PharmacyMedicine } from '../../types';
 
 export default function PharmacyDetailScreen() {
   const { id } = useLocalSearchParams<{ id: string }>();
   const router = useRouter();
+  const { colors } = useThemeContext();
+  const { isAuthenticated } = useAuth();
   const [pharmacy, setPharmacy] = useState<Pharmacy | null>(null);
   const [medicines, setMedicines] = useState<PharmacyMedicine[]>([]);
   const [isLoading, setIsLoading] = useState(true);
+  const [subscribedMeds, setSubscribedMeds] = useState<Set<string>>(new Set());
 
   useEffect(() => {
     if (!id) return;
@@ -49,46 +55,67 @@ export default function PharmacyDetailScreen() {
     }
   };
 
+  const handleToggleMedSubscription = async (nregistro: string, medicineName: string) => {
+    if (!isAuthenticated) return;
+    const key = nregistro;
+    const isSub = subscribedMeds.has(key);
+    try {
+      if (isSub) {
+        await unsubscribeFromMedicine(nregistro, Number(id));
+        setSubscribedMeds(prev => {
+          const next = new Set(prev);
+          next.delete(key);
+          return next;
+        });
+      } else {
+        await subscribeToMedicine(nregistro, medicineName, Number(id));
+        setSubscribedMeds(prev => new Set(prev).add(key));
+      }
+    } catch {
+      // silently fail
+    }
+  };
+
   if (isLoading) {
     return <LoadingSpinner message="Cargando farmacia..." />;
   }
 
   if (!pharmacy) {
     return (
-      <View style={styles.errorContainer}>
-        <Text style={styles.errorText}>Farmacia no encontrada</Text>
+      <View style={[styles.errorContainer, { backgroundColor: colors.background }]}>
+        <Text style={[styles.errorText, { color: colors.textSecondary }]}>Farmacia no encontrada</Text>
       </View>
     );
   }
 
   return (
-    <ScrollView style={styles.container}>
-      <View style={styles.header}>
-        <Text style={styles.name}>{pharmacy.name}</Text>
+    <ScrollView style={[styles.container, { backgroundColor: colors.background }]}>
+      <View style={[styles.header, { backgroundColor: colors.card }]}>
+        <Text style={[styles.name, { color: colors.text }]}>{pharmacy.name}</Text>
       </View>
 
-      <View style={styles.actionsRow}>
+      <View style={[styles.actionsRow, { backgroundColor: colors.card, borderBottomColor: colors.separator }]}>
         <TouchableOpacity style={styles.actionButton} onPress={handleCall}>
           <Ionicons name="call" size={20} color={colors.primary} />
-          <Text style={styles.actionText}>Llamar</Text>
+          <Text style={[styles.actionText, { color: colors.primary }]}>Llamar</Text>
         </TouchableOpacity>
 
         <TouchableOpacity style={styles.actionButton} onPress={handleDirections}>
           <Ionicons name="navigate" size={20} color={colors.primary} />
-          <Text style={styles.actionText}>Cómo llegar</Text>
+          <Text style={[styles.actionText, { color: colors.primary }]}>Cómo llegar</Text>
         </TouchableOpacity>
       </View>
 
-      <View style={styles.infoSection}>
+      <View style={[styles.infoSection, { backgroundColor: colors.card }]}>
         <View style={styles.infoRow}>
           <Ionicons name="location" size={18} color={colors.textSecondary} />
-          <Text style={styles.infoText}>{pharmacy.address}</Text>
+          <Text style={[styles.infoText, { color: colors.text }]}>{pharmacy.address}</Text>
         </View>
 
         {pharmacy.phone && (
           <View style={styles.infoRow}>
             <Ionicons name="call" size={18} color={colors.textSecondary} />
-            <Text style={styles.infoText}>{pharmacy.phone}</Text>
+            <Text style={[styles.infoText, { color: colors.text }]}>{pharmacy.phone}</Text>
           </View>
         )}
       </View>
@@ -115,29 +142,48 @@ export default function PharmacyDetailScreen() {
       </View>
 
       <View style={styles.medicinesSection}>
-        <Text style={styles.sectionTitle}>
+        <Text style={[styles.sectionTitle, { color: colors.text }]}>
           Medicamentos ({medicines.length})
         </Text>
 
         {medicines.length === 0 ? (
-          <Text style={styles.noMedicines}>No hay medicamentos disponibles</Text>
+          <Text style={[styles.noMedicines, { color: colors.textSecondary }]}>No hay medicamentos disponibles</Text>
         ) : (
-          medicines.map((med) => (
-            <TouchableOpacity
-              key={med.id}
-              style={styles.medicineCard}
-              onPress={() => router.push(`/medicine/${med.medicine_nregistro}`)}
-            >
-              <View style={styles.medicineInfo}>
-                <Text style={styles.medicineName}>{med.medicine_name}</Text>
-                <Text style={styles.medicineNregistro}>Reg: {med.medicine_nregistro}</Text>
+          medicines.map((med) => {
+            const isSub = subscribedMeds.has(med.medicine_nregistro);
+            return (
+              <View key={med.id} style={[styles.medicineCard, { backgroundColor: colors.card }]}>
+                <TouchableOpacity
+                  style={styles.medicineCardContent}
+                  onPress={() => router.push(`/medicine/${med.medicine_nregistro}`)}
+                >
+                  <View style={styles.medicineInfo}>
+                    <Text style={[styles.medicineName, { color: colors.text }]}>{med.medicine_name}</Text>
+                    <Text style={[styles.medicineNregistro, { color: colors.textSecondary }]}>Reg: {med.medicine_nregistro}</Text>
+                  </View>
+                  <View style={styles.medicineStock}>
+                    <Text style={[styles.price, { color: colors.primary }]}>{med.price.toFixed(2)} €</Text>
+                    <Text style={[styles.stock, { color: colors.textSecondary }]}>Stock: {med.stock}</Text>
+                  </View>
+                </TouchableOpacity>
+                {isAuthenticated && (
+                  <TouchableOpacity
+                    style={[styles.bellButton, { backgroundColor: isSub ? colors.primary : colors.surfaceVariant, borderTopColor: colors.border }]}
+                    onPress={() => handleToggleMedSubscription(med.medicine_nregistro, med.medicine_name)}
+                  >
+                    <Ionicons
+                      name={isSub ? 'notifications' : 'notifications-outline'}
+                      size={18}
+                      color={isSub ? '#fff' : colors.textSecondary}
+                    />
+                    <Text style={[styles.bellText, { color: isSub ? '#fff' : colors.textSecondary }]}>
+                      {isSub ? 'Notificaciones activas' : 'Notificarme cuando haya stock'}
+                    </Text>
+                  </TouchableOpacity>
+                )}
               </View>
-              <View style={styles.medicineStock}>
-                <Text style={styles.price}>{med.price.toFixed(2)} €</Text>
-                <Text style={styles.stock}>Stock: {med.stock}</Text>
-              </View>
-            </TouchableOpacity>
-          ))
+            );
+          })
         )}
       </View>
     </ScrollView>
@@ -147,24 +193,19 @@ export default function PharmacyDetailScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: colors.background,
   },
   header: {
     padding: spacing.md,
-    backgroundColor: colors.card,
   },
   name: {
     fontSize: 22,
     fontWeight: 'bold',
-    color: colors.text,
   },
   actionsRow: {
     flexDirection: 'row',
     justifyContent: 'space-around',
     padding: spacing.md,
-    backgroundColor: colors.card,
     borderBottomWidth: 1,
-    borderBottomColor: colors.separator,
   },
   actionButton: {
     flexDirection: 'row',
@@ -173,12 +214,10 @@ const styles = StyleSheet.create({
   },
   actionText: {
     marginLeft: spacing.xs,
-    color: colors.primary,
     fontWeight: '500',
   },
   infoSection: {
     padding: spacing.md,
-    backgroundColor: colors.card,
     marginTop: spacing.sm,
   },
   infoRow: {
@@ -190,7 +229,6 @@ const styles = StyleSheet.create({
     flex: 1,
     marginLeft: spacing.sm,
     fontSize: 16,
-    color: colors.text,
   },
   mapContainer: {
     height: 200,
@@ -206,21 +244,21 @@ const styles = StyleSheet.create({
   sectionTitle: {
     fontSize: 18,
     fontWeight: '600',
-    color: colors.text,
     marginBottom: spacing.md,
   },
   noMedicines: {
-    color: colors.textSecondary,
     textAlign: 'center',
     padding: spacing.xl,
   },
   medicineCard: {
+    borderRadius: borderRadius.md,
+    marginBottom: spacing.sm,
+    overflow: 'hidden',
+  },
+  medicineCardContent: {
     flexDirection: 'row',
     justifyContent: 'space-between',
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
     padding: spacing.md,
-    marginBottom: spacing.sm,
   },
   medicineInfo: {
     flex: 1,
@@ -228,11 +266,9 @@ const styles = StyleSheet.create({
   medicineName: {
     fontSize: 16,
     fontWeight: '500',
-    color: colors.text,
   },
   medicineNregistro: {
     fontSize: 12,
-    color: colors.textSecondary,
     marginTop: spacing.xs,
   },
   medicineStock: {
@@ -241,13 +277,23 @@ const styles = StyleSheet.create({
   price: {
     fontSize: 16,
     fontWeight: '600',
-    color: colors.primary,
   },
   stock: {
     fontSize: 12,
-    color: colors.textSecondary,
     marginTop: spacing.xs,
   },
+  bellButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: spacing.xs,
+    paddingVertical: spacing.sm,
+    borderTopWidth: 1,
+  },
+  bellText: {
+    fontSize: 13,
+    fontWeight: '600',
+  },
   errorContainer: {
     flex: 1,
     justifyContent: 'center',
@@ -255,6 +301,5 @@ const styles = StyleSheet.create({
   },
   errorText: {
     fontSize: 16,
-    color: colors.textSecondary,
   },
 });

apps/frontend-mobile/app/product/[source]/[id].tsx

@@ -0,0 +1,249 @@
+import React, { useEffect, useState } from 'react';
+import { View, Text, ScrollView, StyleSheet, Image, ActivityIndicator } from 'react-native';
+import { useLocalSearchParams } from 'expo-router';
+import { getProduct, Product } from '../../../services/products';
+import { LoadingSpinner } from '../../../components/LoadingSpinner';
+import { useThemeContext } from '../../../components/ThemeProvider';
+import { spacing, borderRadius } from '../../../constants/theme';
+
+export default function ProductDetailScreen() {
+  const { source, id } = useLocalSearchParams<{ source: string; id: string }>();
+  const { colors } = useThemeContext();
+  const [product, setProduct] = useState<Product | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(false);
+
+  useEffect(() => {
+    if (!source || !id) return;
+
+    const fetchProduct = async () => {
+      try {
+        const data = await getProduct(source, id);
+        if (data) {
+          setProduct(data);
+        } else {
+          setError(true);
+        }
+      } catch {
+        setError(true);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchProduct();
+  }, [source, id]);
+
+  if (isLoading) {
+    return <LoadingSpinner message="Cargando producto..." />;
+  }
+
+  if (error || !product) {
+    return (
+      <View style={[styles.errorContainer, { backgroundColor: colors.background }]}>
+        <Text style={[styles.errorText, { color: colors.textSecondary }]}>Producto no encontrado</Text>
+      </View>
+    );
+  }
+
+  const isCima = product.source === 'cima';
+
+  return (
+    <ScrollView style={[styles.container, { backgroundColor: colors.background }]}>
+      {product.image_url ? (
+        <Image source={{ uri: product.image_url }} style={styles.image} resizeMode="contain" />
+      ) : (
+        <View style={[styles.imagePlaceholder, { backgroundColor: colors.surfaceLow }]}>
+          <Text style={[styles.placeholderText, { color: colors.textSecondary }]}>Sin imagen</Text>
+        </View>
+      )}
+
+      <View style={[styles.header, { backgroundColor: colors.card }]}>
+        <View style={styles.nameRow}>
+          <Text style={[styles.name, { color: colors.text }]}>{product.name}</Text>
+          <View style={[styles.badge, { backgroundColor: isCima ? '#2b5bb5' : '#4caf50' }]}>
+            <Text style={styles.badgeText}>{isCima ? 'CIMA' : 'OFF'}</Text>
+          </View>
+        </View>
+        {product.brand ? (
+          <Text style={[styles.brand, { color: colors.textSecondary }]}>{product.brand}</Text>
+        ) : null}
+        {product.category ? (
+          <Text style={[styles.category, { color: colors.textSecondary }]}>{product.category}</Text>
+        ) : null}
+      </View>
+
+      {isCima ? (
+        <View style={[styles.infoSection, { backgroundColor: colors.card }]}>
+          <Text style={[styles.sectionTitle, { color: colors.text }]}>Detalles CIMA</Text>
+          {product.active_ingredient && (
+            <InfoRow label="Principio activo" value={product.active_ingredient} colors={colors} />
+          )}
+          {product.dosage && (
+            <InfoRow label="Dosificación" value={product.dosage} colors={colors} />
+          )}
+          {product.form && (
+            <InfoRow label="Forma farmacéutica" value={product.form} colors={colors} />
+          )}
+          {product.prescription && (
+            <InfoRow label="Tipo de dispensación" value={product.prescription} colors={colors} />
+          )}
+          <InfoRow label="Comercializado" value={product.commercialized ? 'Sí' : 'No'} colors={colors} />
+        </View>
+      ) : (
+        <View style={[styles.infoSection, { backgroundColor: colors.card }]}>
+          <Text style={[styles.sectionTitle, { color: colors.text }]}>Información nutricional</Text>
+          {product.nutriscore && (
+            <InfoRow label="Nutri-Score" value={product.nutriscore.toUpperCase()} colors={colors} />
+          )}
+          {product.nova_group != null && (
+            <InfoRow label="Grupo NOVA" value={String(product.nova_group)} colors={colors} />
+          )}
+          {product.eco_score && (
+            <InfoRow label="Eco-Score" value={product.eco_score.toUpperCase()} colors={colors} />
+          )}
+          {product.ingredients && (
+            <View style={[styles.infoRow, { borderBottomColor: colors.border }]}>
+              <Text style={[styles.infoLabel, { color: colors.textSecondary }]}>Ingredientes</Text>
+              <Text style={[styles.infoValueMultiline, { color: colors.text }]}>{product.ingredients}</Text>
+            </View>
+          )}
+        </View>
+      )}
+
+      {isCima && product.photos && product.photos.length > 0 && (
+        <View style={[styles.infoSection, { backgroundColor: colors.card }]}>
+          <Text style={[styles.sectionTitle, { color: colors.text }]}>Imágenes</Text>
+          <ScrollView horizontal showsHorizontalScrollIndicator={false} style={styles.photosScroll}>
+            {product.photos.map((photo, i) => (
+              <View key={i} style={styles.photoItem}>
+                <Image source={{ uri: photo.url }} style={styles.photoImage} resizeMode="contain" />
+                <Text style={[styles.photoLabel, { color: colors.textSecondary }]}>{photo.tipo}</Text>
+              </View>
+            ))}
+          </ScrollView>
+        </View>
+      )}
+    </ScrollView>
+  );
+}
+
+function InfoRow({ label, value, colors }: { label: string; value: string; colors: any }) {
+  return (
+    <View style={[styles.infoRow, { borderBottomColor: colors.border }]}>
+      <Text style={[styles.infoLabel, { color: colors.textSecondary }]}>{label}</Text>
+      <Text style={[styles.infoValue, { color: colors.text }]}>{value}</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  image: {
+    width: '100%',
+    height: 260,
+    backgroundColor: '#f5f5f5',
+  },
+  imagePlaceholder: {
+    width: '100%',
+    height: 160,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  placeholderText: {
+    fontSize: 14,
+  },
+  header: {
+    padding: spacing.lg,
+  },
+  nameRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'flex-start',
+    gap: spacing.sm,
+  },
+  name: {
+    flex: 1,
+    fontSize: 22,
+    fontWeight: 'bold',
+  },
+  badge: {
+    paddingHorizontal: spacing.sm,
+    paddingVertical: spacing.xs,
+    borderRadius: borderRadius.full,
+    overflow: 'hidden',
+  },
+  badgeText: {
+    color: '#fff',
+    fontSize: 12,
+    fontWeight: '700',
+  },
+  brand: {
+    fontSize: 15,
+    marginTop: spacing.xs,
+  },
+  category: {
+    fontSize: 13,
+    marginTop: spacing.xs,
+  },
+  infoSection: {
+    marginTop: spacing.sm,
+    padding: spacing.lg,
+  },
+  sectionTitle: {
+    fontSize: 16,
+    fontWeight: '600',
+    marginBottom: spacing.sm,
+  },
+  infoRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    paddingVertical: spacing.sm,
+    borderBottomWidth: 1,
+  },
+  infoLabel: {
+    fontSize: 13,
+    flexShrink: 0,
+    marginRight: spacing.sm,
+  },
+  infoValue: {
+    fontSize: 13,
+    fontWeight: '500',
+    flex: 1,
+    textAlign: 'right',
+  },
+  infoValueMultiline: {
+    fontSize: 13,
+    fontWeight: '500',
+    flex: 1,
+    textAlign: 'right',
+  },
+  photosScroll: {
+    marginTop: spacing.xs,
+  },
+  photoItem: {
+    marginRight: spacing.md,
+    alignItems: 'center',
+    width: 120,
+  },
+  photoImage: {
+    width: 120,
+    height: 120,
+    borderRadius: borderRadius.md,
+    backgroundColor: '#f5f5f5',
+  },
+  photoLabel: {
+    fontSize: 11,
+    marginTop: spacing.xs,
+  },
+  errorContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  errorText: {
+    fontSize: 16,
+  },
+});

apps/frontend-mobile/components/BarcodeScanner.tsx

@@ -2,7 +2,8 @@ import React, { useState } from 'react';
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
 import { CameraView, useCameraPermissions } from 'expo-camera';
 import { Ionicons } from '@expo/vector-icons';
-import { colors, spacing, borderRadius } from '../constants/theme';
+import { useThemeContext } from './ThemeProvider';
+import { spacing, borderRadius } from '../constants/theme';
 
 interface BarcodeScannerProps {
   onBarcodeScanned: (barcode: string) => void;
@@ -12,6 +13,7 @@ interface BarcodeScannerProps {
 export function BarcodeScanner({ onBarcodeScanned, onClose }: BarcodeScannerProps) {
   const [permission, requestPermission] = useCameraPermissions();
   const [scanned, setScanned] = useState(false);
+  const { colors } = useThemeContext();
 
   if (!permission) {
     return <View style={styles.container} />;
@@ -19,17 +21,17 @@ export function BarcodeScanner({ onBarcodeScanned, onClose }: BarcodeScannerProp
 
   if (!permission.granted) {
     return (
-      <View style={styles.permissionContainer}>
+      <View style={[styles.permissionContainer, { backgroundColor: colors.background }]}>
         <Ionicons name="camera" size={64} color={colors.textSecondary} />
-        <Text style={styles.permissionTitle}>Permiso de cámara requerido</Text>
-        <Text style={styles.permissionText}>
+        <Text style={[styles.permissionTitle, { color: colors.text }]}>Permiso de cámara requerido</Text>
+        <Text style={[styles.permissionText, { color: colors.textSecondary }]}>
           Necesitamos acceso a la cámara para escanear códigos de barras
         </Text>
-        <TouchableOpacity style={styles.permissionButton} onPress={requestPermission}>
+        <TouchableOpacity style={[styles.permissionButton, { backgroundColor: colors.primary }]} onPress={requestPermission}>
           <Text style={styles.permissionButtonText}>Conceder permiso</Text>
         </TouchableOpacity>
         <TouchableOpacity style={styles.cancelButton} onPress={onClose}>
-          <Text style={styles.cancelButtonText}>Cancelar</Text>
+          <Text style={[styles.cancelButtonText, { color: colors.textSecondary }]}>Cancelar</Text>
         </TouchableOpacity>
       </View>
     );
@@ -54,10 +56,10 @@ export function BarcodeScanner({ onBarcodeScanned, onClose }: BarcodeScannerProp
       
       <View style={styles.overlay}>
         <View style={styles.scannerFrame}>
-          <View style={[styles.corner, styles.topLeft]} />
-          <View style={[styles.corner, styles.topRight]} />
-          <View style={[styles.corner, styles.bottomLeft]} />
-          <View style={[styles.corner, styles.bottomRight]} />
+          <View style={[styles.corner, styles.topLeft, { borderColor: colors.primary }]} />
+          <View style={[styles.corner, styles.topRight, { borderColor: colors.primary }]} />
+          <View style={[styles.corner, styles.bottomLeft, { borderColor: colors.primary }]} />
+          <View style={[styles.corner, styles.bottomRight, { borderColor: colors.primary }]} />
         </View>
         
         <Text style={styles.instruction}>
@@ -72,7 +74,7 @@ export function BarcodeScanner({ onBarcodeScanned, onClose }: BarcodeScannerProp
       {scanned && (
         <View style={styles.scannedOverlay}>
           <TouchableOpacity 
-            style={styles.scanAgainButton}
+            style={[styles.scanAgainButton, { backgroundColor: colors.primary }]}
             onPress={() => setScanned(false)}
           >
             <Text style={styles.scanAgainText}>Escanear de nuevo</Text>
@@ -92,30 +94,26 @@ const styles = StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
-    backgroundColor: colors.background,
     padding: spacing.xl,
   },
   permissionTitle: {
     fontSize: 20,
     fontWeight: 'bold',
-    color: colors.text,
     marginTop: spacing.lg,
   },
   permissionText: {
     fontSize: 16,
-    color: colors.textSecondary,
     textAlign: 'center',
     marginTop: spacing.sm,
     marginBottom: spacing.xl,
   },
   permissionButton: {
-    backgroundColor: colors.primary,
     borderRadius: borderRadius.md,
     paddingVertical: spacing.md,
     paddingHorizontal: spacing.xl,
   },
   permissionButtonText: {
-    color: colors.textInverse,
+    color: '#ffffff',
     fontSize: 16,
     fontWeight: '600',
   },
@@ -123,7 +121,6 @@ const styles = StyleSheet.create({
     marginTop: spacing.md,
   },
   cancelButtonText: {
-    color: colors.textSecondary,
     fontSize: 14,
   },
   overlay: {
@@ -143,7 +140,6 @@ const styles = StyleSheet.create({
     position: 'absolute',
     width: 30,
     height: 30,
-    borderColor: colors.primary,
   },
   topLeft: {
     top: 0,
@@ -170,7 +166,7 @@ const styles = StyleSheet.create({
     borderRightWidth: 3,
   },
   instruction: {
-    color: colors.textInverse,
+    color: '#ffffff',
     fontSize: 14,
     textAlign: 'center',
     marginTop: spacing.xl,
@@ -194,13 +190,12 @@ const styles = StyleSheet.create({
     right: spacing.xl,
   },
   scanAgainButton: {
-    backgroundColor: colors.primary,
     borderRadius: borderRadius.md,
     padding: spacing.md,
     alignItems: 'center',
   },
   scanAgainText: {
-    color: colors.textInverse,
+    color: '#ffffff',
     fontSize: 16,
     fontWeight: '600',
   },

apps/frontend-mobile/components/LoadingSpinner.tsx

@@ -1,16 +1,19 @@
 import React from 'react';
 import { View, ActivityIndicator, Text, StyleSheet } from 'react-native';
-import { colors, spacing } from '../constants/theme';
+import { useThemeContext } from './ThemeProvider';
+import { spacing } from '../constants/theme';
 
 interface LoadingSpinnerProps {
   message?: string;
 }
 
 export function LoadingSpinner({ message = 'Cargando...' }: LoadingSpinnerProps) {
+  const { colors } = useThemeContext();
+
   return (
     <View style={styles.container}>
       <ActivityIndicator size="large" color={colors.primary} />
-      <Text style={styles.message}>{message}</Text>
+      <Text style={[styles.message, { color: colors.textSecondary }]}>{message}</Text>
     </View>
   );
 }
@@ -25,6 +28,5 @@ const styles = StyleSheet.create({
   message: {
     marginTop: spacing.md,
     fontSize: 16,
-    color: colors.textSecondary,
   },
 });

apps/frontend-mobile/components/MedicineCard.tsx

@@ -1,47 +1,57 @@
 import React from 'react';
-import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
+import { View, Text, StyleSheet, TouchableOpacity, useWindowDimensions } from 'react-native';
 import { useRouter } from 'expo-router';
 import { Ionicons } from '@expo/vector-icons';
-import { colors, spacing, borderRadius } from '../constants/theme';
+import { useThemeContext } from './ThemeProvider';
+import { spacing, borderRadius } from '../constants/theme';
 import { StockBadge } from './StockBadge';
 import { Medicine } from '../types';
 
+const TABLET_MIN_WIDTH = 768;
+
 interface MedicineCardProps {
   medicine: Medicine;
 }
 
 export function MedicineCard({ medicine }: MedicineCardProps) {
   const router = useRouter();
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
 
   const handlePress = () => {
     router.push(`/medicine/${medicine.nregistro}`);
   };
 
   return (
-    <TouchableOpacity style={styles.card} onPress={handlePress} activeOpacity={0.7}>
+    <TouchableOpacity
+      style={[styles.card, isTablet && styles.cardTablet, { backgroundColor: colors.card }]}
+      onPress={handlePress}
+      activeOpacity={0.7}
+    >
       <View style={styles.header}>
-        <Text style={styles.name} numberOfLines={2}>
-          {medicine.nombre}
+        <Text style={[styles.name, isTablet && styles.nameTablet, { color: colors.text }]} numberOfLines={2}>
+          {medicine.name}
         </Text>
-        <StockBadge stock={medicine.stock} />
+        {medicine.stock != null && <StockBadge stock={medicine.stock} />}
       </View>
-      
-      <Text style={styles.principioActivo} numberOfLines={1}>
-        {medicine.principioActivo}
+
+      <Text style={[styles.principioActivo, { color: colors.textSecondary }]} numberOfLines={1}>
+        {medicine.active_ingredient}{medicine.dosage ? ` - ${medicine.dosage}` : ''}
       </Text>
-      
+
       <View style={styles.footer}>
         <View style={styles.priceContainer}>
           <Ionicons name="pricetag" size={14} color={colors.textSecondary} />
-          <Text style={styles.price}>
-            {medicine.precio ? `${medicine.precio.toFixed(2)} €` : 'Sin precio'}
+          <Text style={[styles.price, isTablet && styles.priceTablet, { color: colors.primary }]}>
+            {medicine.precio != null ? `${medicine.precio.toFixed(2)} €` : 'Sin precio'}
           </Text>
         </View>
-        
+
         <View style={styles.labContainer}>
           <Ionicons name="business" size={14} color={colors.textSecondary} />
-          <Text style={styles.laboratorio} numberOfLines={1}>
-            {medicine.laboratorio}
+          <Text style={[styles.laboratorio, isTablet && styles.laboratorioTablet, { color: colors.textSecondary }]} numberOfLines={1}>
+            {medicine.laboratory}
           </Text>
         </View>
       </View>
@@ -51,17 +61,22 @@ export function MedicineCard({ medicine }: MedicineCardProps) {
 
 const styles = StyleSheet.create({
   card: {
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
+    borderRadius: borderRadius.lg,
     padding: spacing.md,
-    marginHorizontal: spacing.md,
+    marginHorizontal: spacing.lg,
     marginVertical: spacing.xs,
     shadowColor: '#000',
     shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.1,
-    shadowRadius: 4,
+    shadowOpacity: 0.06,
+    shadowRadius: 8,
     elevation: 2,
   },
+  cardTablet: {
+    padding: spacing.lg,
+    maxWidth: 700,
+    alignSelf: 'center',
+    width: '100%',
+  },
   header: {
     flexDirection: 'row',
     justifyContent: 'space-between',
@@ -72,12 +87,13 @@ const styles = StyleSheet.create({
     flex: 1,
     fontSize: 16,
     fontWeight: '600',
-    color: colors.text,
     marginRight: spacing.sm,
   },
+  nameTablet: {
+    fontSize: 18,
+  },
   principioActivo: {
     fontSize: 14,
-    color: colors.textSecondary,
     marginBottom: spacing.sm,
   },
   footer: {
@@ -92,9 +108,11 @@ const styles = StyleSheet.create({
   price: {
     fontSize: 14,
     fontWeight: '600',
-    color: colors.text,
     marginLeft: spacing.xs,
   },
+  priceTablet: {
+    fontSize: 16,
+  },
   labContainer: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -103,8 +121,11 @@ const styles = StyleSheet.create({
   },
   laboratorio: {
     fontSize: 12,
-    color: colors.textSecondary,
     marginLeft: spacing.xs,
     maxWidth: 120,
   },
+  laboratorioTablet: {
+    fontSize: 14,
+    maxWidth: 200,
+  },
 });

apps/frontend-mobile/components/SearchBar.tsx

@@ -1,7 +1,10 @@
 import React, { useState } from 'react';
-import { View, TextInput, StyleSheet, TouchableOpacity } from 'react-native';
+import { View, TextInput, StyleSheet, TouchableOpacity, useWindowDimensions } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
-import { colors, spacing, borderRadius } from '../constants/theme';
+import { useThemeContext } from './ThemeProvider';
+import { spacing, borderRadius } from '../constants/theme';
+
+const TABLET_MIN_WIDTH = 768;
 
 interface SearchBarProps {
   placeholder?: string;
@@ -10,12 +13,15 @@ interface SearchBarProps {
   onChangeText?: (text: string) => void;
 }
 
-export function SearchBar({ 
-  placeholder = 'Buscar medicamentos...', 
+export function SearchBar({
+  placeholder = 'Buscar medicamentos...',
   onSearch,
   value,
-  onChangeText 
+  onChangeText
 }: SearchBarProps) {
+  const { width } = useWindowDimensions();
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const { colors } = useThemeContext();
   const [localValue, setLocalValue] = useState(value || '');
 
   const handleChange = (text: string) => {
@@ -34,10 +40,10 @@ export function SearchBar({
   };
 
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, isTablet && styles.containerTablet, { backgroundColor: colors.card }]}>
       <Ionicons name="search" size={20} color={colors.textSecondary} style={styles.icon} />
       <TextInput
-        style={styles.input}
+        style={[styles.input, isTablet && styles.inputTablet, { color: colors.text }]}
         placeholder={placeholder}
         placeholderTextColor={colors.textSecondary}
         value={localValue}
@@ -59,12 +65,21 @@ const styles = StyleSheet.create({
   container: {
     flexDirection: 'row',
     alignItems: 'center',
-    backgroundColor: colors.card,
-    borderRadius: borderRadius.md,
+    borderRadius: borderRadius.lg,
     paddingHorizontal: spacing.md,
-    paddingVertical: spacing.sm,
-    marginHorizontal: spacing.md,
+    paddingVertical: spacing.sm + 2,
     marginVertical: spacing.sm,
+    alignSelf: 'center',
+    width: '80%',
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 8,
+    elevation: 2,
+  },
+  containerTablet: {
+    paddingHorizontal: spacing.lg,
+    paddingVertical: spacing.md,
   },
   icon: {
     marginRight: spacing.sm,
@@ -72,9 +87,12 @@ const styles = StyleSheet.create({
   input: {
     flex: 1,
     fontSize: 16,
-    color: colors.text,
     paddingVertical: spacing.xs,
   },
+  inputTablet: {
+    fontSize: 18,
+    paddingVertical: spacing.sm,
+  },
   clearButton: {
     marginLeft: spacing.sm,
   },

apps/frontend-mobile/components/StockBadge.tsx

@@ -1,27 +1,32 @@
 import React from 'react';
 import { View, Text, StyleSheet } from 'react-native';
-import { colors, borderRadius, spacing } from '../constants/theme';
+import { useThemeContext } from './ThemeProvider';
+import { borderRadius, spacing } from '../constants/theme';
 
 interface StockBadgeProps {
   stock: number;
 }
 
 export function StockBadge({ stock }: StockBadgeProps) {
-  const getBadgeStyle = () => {
-    if (stock === 0) return styles.danger;
-    if (stock < 5) return styles.warning;
-    return styles.success;
+  const { colors, isDark } = useThemeContext();
+
+  const getBadgeColors = () => {
+    if (stock === 0) {
+      return { bg: isDark ? '#3a1a1a' : '#feecec', text: isDark ? '#ef9a9a' : '#b91c1c' };
+    }
+    if (stock < 5) {
+      return { bg: isDark ? '#3a3010' : '#fff3cd', text: isDark ? '#ffd54f' : '#FF9500' };
+    }
+    return { bg: isDark ? '#1a3a1c' : '#eaf7ec', text: isDark ? '#81c784' : '#34C759' };
   };
 
-  const getText = () => {
-    if (stock === 0) return 'Sin stock';
-    if (stock < 5) return `Bajo (${stock})`;
-    return `Disponible (${stock})`;
-  };
+  const badgeColors = getBadgeColors();
 
   return (
-    <View style={[styles.badge, getBadgeStyle()]}>
-      <Text style={styles.text}>{getText()}</Text>
+    <View style={[styles.badge, { backgroundColor: badgeColors.bg }]}>
+      <Text style={[styles.text, { color: badgeColors.text }]}>
+        {stock === 0 ? 'Sin stock' : stock < 5 ? `Bajo (${stock})` : `Disponible (${stock})`}
+      </Text>
     </View>
   );
 }
@@ -32,15 +37,6 @@ const styles = StyleSheet.create({
     paddingVertical: spacing.xs,
     borderRadius: borderRadius.sm,
   },
-  success: {
-    backgroundColor: '#D4EDDA',
-  },
-  warning: {
-    backgroundColor: '#FFF3CD',
-  },
-  danger: {
-    backgroundColor: '#F8D7DA',
-  },
   text: {
     fontSize: 12,
     fontWeight: '600',

apps/frontend-mobile/components/ThemeProvider.tsx

@@ -0,0 +1,43 @@
+import React, { createContext, useContext, useEffect, useMemo } from 'react';
+import { useColorScheme } from 'react-native';
+import { useThemeStore } from '../store/themeStore';
+import { colors, darkColors } from '../constants/theme';
+import type { AppColors } from '../hooks/useThemeColor';
+
+interface ThemeContextValue {
+  colors: AppColors;
+  isDark: boolean;
+}
+
+const ThemeContext = createContext<ThemeContextValue>({
+  colors,
+  isDark: false,
+});
+
+export function useThemeContext() {
+  return useContext(ThemeContext);
+}
+
+export function ThemeProvider({ children }: { children: React.ReactNode }) {
+  const systemScheme = useColorScheme();
+  const mode = useThemeStore((s) => s.mode);
+  const init = useThemeStore((s) => s.init);
+
+  useEffect(() => {
+    init();
+  }, []);
+
+  const value = useMemo(() => {
+    const isDark = mode === 'dark' || (mode === 'system' && systemScheme === 'dark');
+    return {
+      colors: isDark ? darkColors : colors,
+      isDark,
+    };
+  }, [mode, systemScheme]);
+
+  return (
+    <ThemeContext.Provider value={value}>
+      {children}
+    </ThemeContext.Provider>
+  );
+}

apps/frontend-mobile/constants/config.ts

@@ -5,14 +5,16 @@ const ENV = {
     API_BASE_URL: 'http://localhost:3001/api',
   },
   production: {
-    API_BASE_URL: 'https://your-production-api.com/api',
+    API_BASE_URL: 'https://farmacias.hacecalor.net/api',
   },
 };
 
 const environment = Constants.expoConfig?.extra?.environment || (__DEV__ ? 'development' : 'production');
 
+const envBaseUrl = process.env.EXPO_PUBLIC_API_URL;
+
 export const config = {
-  API_BASE_URL: ENV[environment as keyof typeof ENV]?.API_BASE_URL || ENV.development.API_BASE_URL,
+  API_BASE_URL: envBaseUrl || ENV[environment as keyof typeof ENV]?.API_BASE_URL || ENV.development.API_BASE_URL,
   SEARCH_DEBOUNCE_MS: 300,
   CACHE_STALE_TIME: 5 * 60 * 1000, // 5 minutes
   CACHE_CACHE_TIME: 30 * 60 * 1000, // 30 minutes

apps/frontend-mobile/constants/theme.ts

@@ -1,25 +1,93 @@
 export const colors = {
-  // Primary
-  primary: '#007AFF',
-  primaryLight: '#4DA3FF',
-  primaryDark: '#0056CC',
+  // Primary - pastel green pharmacy palette (matching PWA)
+  primary: '#7fbf8f',
+  primaryLight: '#cfead0',
+  primaryDark: '#09310a',
+  onPrimary: '#09310a',
+  primaryContainer: '#cfead0',
+  onPrimaryContainer: '#0d2b12',
+
+  // Secondary - soft blue
+  secondary: '#a3b8ff',
+  secondaryContainer: '#dbe7ff',
+
+  // Tertiary - soft lavender
+  tertiary: '#c9b3ff',
+  tertiaryContainer: '#efe7ff',
+
+  // Scan button - vivid blue (intentionally prominent)
+  scanButton: '#2b5bb5',
+  scanButtonShadow: 'rgba(43, 91, 181, 0.32)',
 
   // Semantic
   success: '#34C759',
-  danger: '#FF3B30',
+  danger: '#b91c1c',
+  dangerContainer: '#feecec',
   warning: '#FF9500',
 
-  // Neutral
-  background: '#F2F2F7',
-  card: '#FFFFFF',
-  border: '#E5E5EA',
-  separator: '#C6C6C8',
+  // Surface
+  background: 'transparent',
+  card: '#ffffff',
+  surfaceLow: '#f2f4f5',
+  surface: '#eceeef',
+  surfaceHigh: '#e6e8e9',
+  border: '#c0c9bb',
+  separator: '#c0c9bb',
 
   // Text
-  text: '#1C1C1E',
-  textSecondary: '#8E8E93',
-  textInverse: '#FFFFFF',
-  textLink: '#007AFF',
+  text: '#111417',
+  textSecondary: '#41493e',
+  textInverse: '#ffffff',
+  textLink: '#7fbf8f',
+
+  // Accent
+  accentWarm: '#f5a97a',
+};
+
+export const darkColors = {
+  // Primary - pastel green pharmacy palette
+  primary: '#7fbf8f',
+  primaryLight: '#2a5a35',
+  primaryDark: '#cfead0',
+  onPrimary: '#cfead0',
+  primaryContainer: '#1a3a1c',
+  onPrimaryContainer: '#cfead0',
+
+  // Secondary - soft blue
+  secondary: '#a3b8ff',
+  secondaryContainer: '#1a2a4a',
+
+  // Tertiary - soft lavender
+  tertiary: '#c9b3ff',
+  tertiaryContainer: '#2a1a4a',
+
+  // Scan button - vivid blue
+  scanButton: '#4a7dd5',
+  scanButtonShadow: 'rgba(74, 125, 213, 0.32)',
+
+  // Semantic
+  success: '#34C759',
+  danger: '#ef5350',
+  dangerContainer: '#3a1a1a',
+  warning: '#FF9500',
+
+  // Surface
+  background: 'transparent',
+  card: '#1e1e1e',
+  surfaceLow: '#2a2a2a',
+  surface: '#333333',
+  surfaceHigh: '#3a3a3a',
+  border: '#3a3a3a',
+  separator: '#3a3a3a',
+
+  // Text
+  text: '#f0f0f0',
+  textSecondary: '#a0a0a0',
+  textInverse: '#111417',
+  textLink: '#7fbf8f',
+
+  // Accent
+  accentWarm: '#f5a97a',
 };
 
 export const spacing = {
@@ -32,27 +100,67 @@ export const spacing = {
 };
 
 export const borderRadius = {
-  sm: 8,
-  md: 12,
-  lg: 16,
-  xl: 24,
+  sm: 4,
+  md: 8,
+  lg: 12,
+  xl: 16,
+  full: 9999,
 };
 
 export const typography = {
   title: {
     fontSize: 28,
     fontWeight: 'bold' as const,
+    color: '#111417',
   },
   heading: {
     fontSize: 20,
     fontWeight: '600' as const,
+    color: '#111417',
   },
   body: {
     fontSize: 16,
     fontWeight: 'normal' as const,
+    color: '#111417',
+  },
+  bodyLarge: {
+    fontSize: 18,
+    fontWeight: '400' as const,
+    color: '#41493e',
+    lineHeight: 27,
   },
   caption: {
     fontSize: 12,
     fontWeight: 'normal' as const,
+    color: '#41493e',
+  },
+  label: {
+    fontSize: 14,
+    fontWeight: '500' as const,
+    color: '#41493e',
+  },
+};
+
+export const shadows = {
+  soft: {
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 4 },
+    shadowOpacity: 0.08,
+    shadowRadius: 20,
+    elevation: 3,
+  },
+  card: {
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.06,
+    shadowRadius: 8,
+    elevation: 2,
+  },
+  scanButton: {
+    shadowColor: '#2b5bb5',
+    shadowOffset: { width: 0, height: 8 },
+    shadowOpacity: 0.32,
+    shadowRadius: 26,
+    elevation: 8,
   },
 };

apps/frontend-mobile/eas.json

@@ -15,17 +15,11 @@
     },
     "preview": {
       "distribution": "internal",
-      "ios": {
-        "buildType": "preview"
-      },
       "android": {
         "buildType": "apk"
       }
     },
     "production": {
-      "ios": {
-        "buildType": "release"
-      },
       "android": {
         "buildType": "app-bundle"
       }
@@ -33,11 +27,6 @@
   },
   "submit": {
     "production": {
-      "ios": {
-        "appleId": "",
-        "ascAppId": "",
-        "appleTeamId": ""
-      },
       "android": {
         "serviceAccountKeyPath": "./google-service-account.json"
       }

apps/frontend-mobile/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "441816187714",
+    "project_id": "farmaclic-53c42",
+    "storage_bucket": "farmaclic-53c42.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:441816187714:android:e212145141c570147fbedb",
+        "android_client_info": {
+          "package_name": "com.farmafinder.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyD6cnDvP9v1a7XUI7p8oF0jTPwTNBgKylY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

apps/frontend-mobile/hooks/useRecentSearches.ts

@@ -0,0 +1,41 @@
+import { useState, useEffect, useCallback } from 'react';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+const STORAGE_KEY = 'recent_medicine_searches';
+const MAX_ITEMS = 5;
+
+export function useRecentSearches() {
+  const [recentSearches, setRecentSearches] = useState<string[]>([]);
+
+  useEffect(() => {
+    AsyncStorage.getItem(STORAGE_KEY).then((data) => {
+      if (data) setRecentSearches(JSON.parse(data));
+    });
+  }, []);
+
+  const addSearch = useCallback(async (query: string) => {
+    const trimmed = query.trim();
+    if (!trimmed) return;
+    setRecentSearches((prev) => {
+      const filtered = prev.filter((s) => s !== trimmed);
+      const next = [trimmed, ...filtered].slice(0, MAX_ITEMS);
+      AsyncStorage.setItem(STORAGE_KEY, JSON.stringify(next));
+      return next;
+    });
+  }, []);
+
+  const removeSearch = useCallback(async (query: string) => {
+    setRecentSearches((prev) => {
+      const next = prev.filter((s) => s !== query);
+      AsyncStorage.setItem(STORAGE_KEY, JSON.stringify(next));
+      return next;
+    });
+  }, []);
+
+  const clearAll = useCallback(async () => {
+    setRecentSearches([]);
+    AsyncStorage.removeItem(STORAGE_KEY);
+  }, []);
+
+  return { recentSearches, addSearch, removeSearch, clearAll };
+}

apps/frontend-mobile/hooks/useResponsive.ts

@@ -0,0 +1,29 @@
+import { useWindowDimensions } from 'react-native';
+
+const TABLET_MIN_WIDTH = 768;
+
+export function useResponsive() {
+  const { width, height } = useWindowDimensions();
+
+  const isTablet = width >= TABLET_MIN_WIDTH;
+  const isLandscape = width > height;
+
+  // Scale factor for tablet: 1.0 on phone, ~1.2 on tablet
+  const scale = isTablet ? 1.2 : 1.0;
+
+  // Max content width to prevent stretching on large screens
+  const maxContentWidth = isTablet ? Math.min(600, width * 0.6) : width;
+
+  // Horizontal padding: more on tablets to center content
+  const horizontalPadding = isTablet ? 48 : 24;
+
+  return {
+    width,
+    height,
+    isTablet,
+    isLandscape,
+    scale,
+    maxContentWidth,
+    horizontalPadding,
+  };
+}

apps/frontend-mobile/hooks/useThemeColor.ts

@@ -0,0 +1,19 @@
+import { useColorScheme } from 'react-native';
+import { colors, darkColors } from '../constants/theme';
+import { useThemeStore, ThemeMode } from '../store/themeStore';
+
+export type AppColors = typeof colors;
+
+export function useThemeColor(): { colors: AppColors; isDark: boolean; mode: ThemeMode } {
+  const systemScheme = useColorScheme();
+  const mode = useThemeStore((s) => s.mode);
+
+  const isDark =
+    mode === 'dark' || (mode === 'system' && systemScheme === 'dark');
+
+  return {
+    colors: isDark ? darkColors : colors,
+    isDark,
+    mode,
+  };
+}

apps/frontend-mobile/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "main": "expo-router/entry",
   "dependencies": {
+    "@expo/vector-icons": "^15.0.2",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@tanstack/react-query": "^5.101.2",
     "axios": "^1.18.1",
@@ -15,6 +16,7 @@
     "expo-image-picker": "~57.0.2",
     "expo-linking": "~57.0.1",
     "expo-local-authentication": "~57.0.0",
+    "expo-location": "~57.0.2",
     "expo-notifications": "~57.0.3",
     "expo-router": "~57.0.3",
     "expo-secure-store": "~57.0.0",

apps/frontend-mobile/services/api.ts

@@ -2,32 +2,43 @@ import axios from 'axios';
 import * as SecureStore from 'expo-secure-store';
 import { config } from '../constants/config';
 
+const SESSION_KEY = 'session_id';
+
 export const api = axios.create({
   baseURL: config.API_BASE_URL,
   timeout: 10000,
+  withCredentials: true,
   headers: {
     'Content-Type': 'application/json',
   },
 });
 
-// Request interceptor - add auth token
+// Request interceptor - restore session cookie from SecureStore
 api.interceptors.request.use(
   async (axiosConfig) => {
-    const token = await SecureStore.getItemAsync('auth_token');
-    if (token) {
-      axiosConfig.headers.Authorization = `Bearer ${token}`;
+    const session = await SecureStore.getItemAsync(SESSION_KEY);
+    if (session) {
+      axiosConfig.headers.Cookie = session;
     }
     return axiosConfig;
   },
   (error) => Promise.reject(error)
 );
 
-// Response interceptor - handle errors
+// Response interceptor - capture and persist session cookie from responses
 api.interceptors.response.use(
-  (response) => response,
+  (response) => {
+    const setCookie = response.headers['set-cookie'];
+    if (setCookie) {
+      const cookieStr = Array.isArray(setCookie) ? setCookie[0] : setCookie;
+      const sessionId = cookieStr.split(';')[0];
+      SecureStore.setItemAsync(SESSION_KEY, sessionId);
+    }
+    return response;
+  },
   async (error) => {
     if (error.response?.status === 401) {
-      await SecureStore.deleteItemAsync('auth_token');
+      await SecureStore.deleteItemAsync(SESSION_KEY);
     }
     return Promise.reject(error);
   }

apps/frontend-mobile/services/auth.ts

@@ -2,42 +2,44 @@ import api from './api';
 import * as SecureStore from 'expo-secure-store';
 import { AuthResponse, User } from '../types';
 
+const USER_KEY = 'user_data';
+
 export async function login(username: string, password: string): Promise<AuthResponse> {
   const response = await api.post('/auth/login', { username, password });
-  const { user, token } = response.data;
+  const { user } = response.data;
 
-  await SecureStore.setItemAsync('auth_token', token);
-  await SecureStore.setItemAsync('user', JSON.stringify(user));
+  await SecureStore.setItemAsync(USER_KEY, JSON.stringify(user));
 
   return response.data;
 }
 
 export async function logout(): Promise<void> {
   await api.post('/auth/logout');
-  await SecureStore.deleteItemAsync('auth_token');
-  await SecureStore.deleteItemAsync('user');
+  await SecureStore.deleteItemAsync(USER_KEY);
 }
 
 export async function checkAuth(): Promise<User | null> {
   try {
     const response = await api.get('/auth/check');
-    return response.data.user;
+    if (response.data.authenticated) {
+      return response.data.user;
+    }
+    return null;
   } catch {
     return null;
   }
 }
 
 export async function getStoredUser(): Promise<User | null> {
-  const userStr = await SecureStore.getItemAsync('user');
+  const userStr = await SecureStore.getItemAsync(USER_KEY);
   return userStr ? JSON.parse(userStr) : null;
 }
 
 export async function register(username: string, password: string): Promise<AuthResponse> {
   const response = await api.post('/auth/register', { username, password });
-  const { user, token } = response.data;
+  const { user } = response.data;
 
-  await SecureStore.setItemAsync('auth_token', token);
-  await SecureStore.setItemAsync('user', JSON.stringify(user));
+  await SecureStore.setItemAsync(USER_KEY, JSON.stringify(user));
 
   return response.data;
 }

apps/frontend-mobile/services/notifications.ts

@@ -2,6 +2,7 @@ import * as Notifications from 'expo-notifications';
 import * as Device from 'expo-device';
 import * as Constants from 'expo-constants';
 import { Platform } from 'react-native';
+import api from './api';
 
 Notifications.setNotificationHandler({
   handleNotification: async () => ({
@@ -12,6 +13,8 @@ Notifications.setNotificationHandler({
   }),
 });
 
+let _cachedToken: string | null = null;
+
 export async function registerForPushNotifications() {
   if (!Device.isDevice) {
     console.log('Push notifications require a physical device');
@@ -48,6 +51,11 @@ export async function registerForPushNotifications() {
       projectId,
     });
 
+    _cachedToken = token.data;
+
+    // Register token with backend (fire and forget)
+    registerTokenWithBackend(token.data).catch(() => {});
+
     return token.data;
   } catch (e) {
     console.log('Error getting push token:', e);
@@ -55,6 +63,52 @@ export async function registerForPushNotifications() {
   }
 }
 
+async function registerTokenWithBackend(token: string) {
+  try {
+    await api.post('/notifications/expo-register', { token });
+  } catch (e) {
+    console.log('Failed to register push token with backend:', e);
+  }
+}
+
+export async function subscribeToMedicine(
+  medicineNregistro: string,
+  medicineName: string | null,
+  pharmacyId?: number | null
+) {
+  const token = _cachedToken;
+  if (!token) {
+    console.log('No push token available for subscription');
+    return;
+  }
+  try {
+    await api.post('/notifications/expo-register', {
+      token,
+      medicine_nregistro: medicineNregistro,
+      medicine_name: medicineName,
+      pharmacy_id: pharmacyId || null,
+    });
+  } catch (e) {
+    console.log('Failed to subscribe to medicine notifications:', e);
+  }
+}
+
+export async function unsubscribeFromMedicine(
+  medicineNregistro: string,
+  pharmacyId?: number | null
+) {
+  try {
+    await api.delete('/notifications/expo-unregister', {
+      data: {
+        medicine_nregistro: medicineNregistro,
+        pharmacy_id: pharmacyId || null,
+      },
+    });
+  } catch (e) {
+    console.log('Failed to unsubscribe from medicine notifications:', e);
+  }
+}
+
 export async function scheduleMedicineAvailabilityNotification(
   medicineName: string,
   pharmacyName: string

apps/frontend-mobile/services/products.ts

@@ -0,0 +1,53 @@
+import api from './api';
+
+export interface Product {
+  id: string;
+  source: 'cima' | 'openfoodfacts';
+  name: string;
+  brand: string;
+  category: string;
+  image_url: string | null;
+  active_ingredient?: string;
+  dosage?: string;
+  form?: string;
+  prescription?: string;
+  commercialized?: boolean;
+  photos?: { tipo: string; url: string }[];
+  docs?: { tipo: number; url: string }[];
+  nutriscore?: string;
+  ingredients?: string;
+  nova_group?: number;
+  eco_score?: string;
+}
+
+export interface ProductSearchResponse {
+  results: Product[];
+  total: number;
+  sources: {
+    cima: number;
+    openfoodfacts: number;
+  };
+}
+
+export async function searchProducts(query: string): Promise<Product[]> {
+  if (!query || query.trim().length < 2) return [];
+  try {
+    const { data } = await api.get<ProductSearchResponse>('/products/search', {
+      params: { q: query }
+    });
+    return data.results || [];
+  } catch (error) {
+    console.error('[Products] Search error:', error);
+    return [];
+  }
+}
+
+export async function getProduct(source: string, id: string): Promise<Product | null> {
+  try {
+    const { data } = await api.get<Product>(`/products/${source}/${id}`);
+    return data;
+  } catch (error) {
+    console.error('[Products] Detail error:', error);
+    return null;
+  }
+}

apps/frontend-mobile/store/themeStore.ts

@@ -0,0 +1,30 @@
+import { create } from 'zustand';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+export type ThemeMode = 'light' | 'dark' | 'system';
+
+interface ThemeState {
+  mode: ThemeMode;
+  setMode: (mode: ThemeMode) => Promise<void>;
+  init: () => Promise<void>;
+}
+
+const STORAGE_KEY = '@theme_mode';
+
+export const useThemeStore = create<ThemeState>((set) => ({
+  mode: 'system',
+
+  setMode: async (mode: ThemeMode) => {
+    set({ mode });
+    await AsyncStorage.setItem(STORAGE_KEY, mode);
+  },
+
+  init: async () => {
+    try {
+      const saved = await AsyncStorage.getItem(STORAGE_KEY);
+      if (saved === 'light' || saved === 'dark' || saved === 'system') {
+        set({ mode: saved });
+      }
+    } catch {}
+  },
+}));

apps/frontend-mobile/types/index.ts

@@ -1,12 +1,20 @@
 export interface Medicine {
+  id: string;
   nregistro: string;
-  nombre: string;
-  principioActivo: string;
-  laboratorio: string;
-  formaFarmaceutica: string;
-  precio: number | null;
-  stock: number;
-  disponibilidad: 'disponible' | 'sin_stock' | 'bajo_stock';
+  name: string;
+  active_ingredient: string;
+  dosage: string;
+  form: string;
+  formSimplified: string;
+  laboratory: string;
+  prescription: string;
+  commercialized: boolean;
+  generic: boolean;
+  photos: string[];
+  docs: { tipo: number; url: string; urlHtml?: string; secc: boolean; fecha: number }[];
+  // Optional pharmacy-specific fields (only present in pharmacy_medicines joins)
+  precio?: number | null;
+  stock?: number;
 }
 
 export interface Pharmacy {
@@ -16,15 +24,22 @@ export interface Pharmacy {
   phone: string;
   latitude: number;
   longitude: number;
+  opening_hours?: string;
 }
 
 export interface PharmacyMedicine {
   id: number;
-  pharmacy_id: number;
-  medicine_nregistro: string;
-  medicine_name: string;
-  price: number;
-  stock: number;
+  pharmacy_id?: number;
+  medicine_nregistro?: string;
+  medicine_name?: string;
+  name?: string;
+  address?: string;
+  phone?: string;
+  latitude?: number;
+  longitude?: number;
+  opening_hours?: string;
+  price?: number | null;
+  stock?: number;
   pharmacy?: Pharmacy;
 }
 

apps/frontend/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-    <meta name="theme-color" content="#7fbf8f" />
+    <meta name="theme-color" content="#c0dde9" />
     <title>FarmaClic</title>
     <link rel="icon" href="/favicon.png" type="image/png" />
     <link rel="icon" href="/favicon.ico" sizes="32x32" />

apps/frontend/src/App.css

@@ -11,6 +11,7 @@
   flex: 1;
   min-height: 0;
   overflow-y: auto;
+  overflow-x: hidden;
   overscroll-behavior-y: contain;
 }
 

apps/frontend/src/App.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import './App.css';
 import HomeView from './views/HomeView';
 import SearchView from './views/SearchView';
+import ProductView from './views/ProductView';
 import ScannerView from './views/ScannerView';
 import AlertsView from './views/AlertsView';
 import ProfileView from './views/ProfileView';
@@ -9,6 +10,7 @@ import AdminView from './views/AdminView';
 import LoginModal from './components/LoginModal';
 import SavedNotifications from './components/SavedNotifications';
 import BottomNav from './components/BottomNav';
+import { getFaro } from './utils/faro';
 
 function App() {
   const [screen, setScreen] = useState('home');
@@ -18,16 +20,44 @@ function App() {
   const [showSaved, setShowSaved] = useState(false);
   const [badgeCount, setBadgeCount] = useState(0);
   const [prescriptionSearch, setPrescriptionSearch] = useState('');
+  const [productScreen, setProductScreen] = useState(null);
   const [screenSize, setScreenSize] = useState({
     width: window.innerWidth,
     height: window.innerHeight
   });
 
+  // Theme: 'auto' | 'light' | 'dark'
+  const [theme, setThemeState] = useState(() => {
+    return localStorage.getItem('ff-theme') || 'auto';
+  });
+
   // Device detection
   const isMobile = screenSize.width <= 768;
   const isTablet = screenSize.width > 768 && screenSize.width <= 1024;
   const isDesktop = screenSize.width > 1024;
 
+  // Apply theme to document
+  useEffect(() => {
+    const mq = window.matchMedia('(prefers-color-scheme: dark)');
+
+    function applyTheme() {
+      const isDark = theme === 'dark' || (theme === 'auto' && mq.matches);
+      document.documentElement.setAttribute('data-theme', isDark ? 'dark' : 'light');
+    }
+
+    applyTheme();
+
+    if (theme === 'auto') {
+      mq.addEventListener('change', applyTheme);
+      return () => mq.removeEventListener('change', applyTheme);
+    }
+  }, [theme]);
+
+  function setTheme(newTheme) {
+    setThemeState(newTheme);
+    localStorage.setItem('ff-theme', newTheme);
+  }
+
   useEffect(() => {
     // Set initial screen size
     const handleResize = () => {
@@ -40,7 +70,10 @@ function App() {
     fetch('/api/auth/check')
       .then(r => r.json())
       .then(data => { if (data.authenticated) setCurrentUser(data.user); })
-      .catch(() => {})
+      .catch((err) => {
+        console.warn('[auth/check]', err);
+        getFaro()?.pushError(err, { type: 'network', url: '/api/auth/check' });
+      })
       .finally(() => setAuthChecked(true));
 
     window.addEventListener('resize', handleResize);
@@ -57,7 +90,10 @@ function App() {
         const count = (data.global?.length || 0) + (data.pharmacy?.length || 0);
         setBadgeCount(count);
       })
-      .catch(() => {});
+      .catch((err) => {
+        console.warn('[notifications/mine]', err);
+        getFaro()?.pushError(err, { type: 'network', url: '/api/notifications/mine' });
+      });
     return () => { cancelled = true; };
   }, [currentUser]);
 
@@ -69,7 +105,10 @@ function App() {
         if (!data) return;
         setBadgeCount((data.global?.length || 0) + (data.pharmacy?.length || 0));
       })
-      .catch(() => {});
+      .catch((err) => {
+        console.warn('[refreshBadge]', err);
+        getFaro()?.pushError(err, { type: 'network', url: '/api/notifications/mine' });
+      });
   }
 
   function handleLogin(user) {
@@ -121,11 +160,21 @@ function App() {
           onShowSaved={() => setShowSaved(true)}
           onLogout={handleLogout}
           onAdminClick={handleAdminClick}
+          theme={theme}
+          onThemeChange={setTheme}
         />
       );
       break;
     case 'alerts':
-      activeView = <AlertsView onNotificationChange={refreshBadgeCount} />;
+      activeView = (
+        <AlertsView
+          onNotificationChange={refreshBadgeCount}
+          onNavigateToMedicine={(name) => {
+            setPrescriptionSearch(name);
+            setScreen('search');
+          }}
+        />
+      );
       break;
     case 'search':
       activeView = (
@@ -133,6 +182,19 @@ function App() {
           currentUser={currentUser}
           onLoginRequest={() => setShowLogin(true)}
           initialQuery={prescriptionSearch}
+          onNavigateToProduct={(source, id) => {
+            setProductScreen({ source, id });
+            setScreen('product');
+          }}
+        />
+      );
+      break;
+    case 'product':
+      activeView = (
+        <ProductView
+          source={productScreen?.source}
+          id={productScreen?.id}
+          onBack={() => { setProductScreen(null); setScreen('search'); }}
         />
       );
       break;

apps/frontend/src/components/BottomNav.css

@@ -65,9 +65,9 @@
   height: 3.5rem;
   border-radius: var(--radius-full);
   /* Stronger, brighter blue to make scan button easy to find */
-  background: #2b5bb5;
-  color: #ffffff;
-  box-shadow: 0 8px 26px rgba(43, 91, 181, 0.32);
+  background: var(--fab-bg);
+  color: var(--fab-text);
+  box-shadow: 0 8px 26px var(--fab-shadow);
   margin-top: -1.5rem;
   transition: transform 0.12s, box-shadow 160ms ease;
 }
@@ -78,12 +78,12 @@
 
 .nav-fab:hover {
   transform: translateY(-2px);
-  box-shadow: 0 12px 36px rgba(43, 91, 181, 0.36);
+  box-shadow: 0 12px 36px var(--fab-shadow);
 }
 
 .nav-fab:focus {
   outline: none;
-  box-shadow: 0 0 0 6px rgba(43,91,181,0.12), 0 8px 26px rgba(43, 91, 181, 0.32);
+  box-shadow: 0 0 0 6px rgba(43,91,181,0.12), 0 8px 26px var(--fab-shadow);
 }
 
 .nav-badge {

apps/frontend/src/components/ErrorBoundary.jsx

@@ -0,0 +1,57 @@
+import React from 'react';
+
+export default class ErrorBoundary extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error, info) {
+    // Report to Faro if available
+    try {
+      const faro = window.__faro;
+      if (faro?.api?.pushError) {
+        faro.api.pushError(error, { type: 'react-boundary', componentStack: info.componentStack });
+      }
+    } catch {
+      // Faro reporting must never break the app
+    }
+    console.error('[ErrorBoundary]', error, info);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <div style={{
+          padding: '2rem',
+          textAlign: 'center',
+          fontFamily: 'system-ui, sans-serif',
+          color: '#333',
+        }}>
+          <h2>Algo salió mal</h2>
+          <p style={{ color: '#666' }}>Ha ocurrido un error inesperado. Por favor, recarga la página.</p>
+          <button
+            onClick={() => window.location.reload()}
+            style={{
+              marginTop: '1rem',
+              padding: '0.5rem 1.5rem',
+              backgroundColor: '#27633a',
+              color: '#fff',
+              border: 'none',
+              borderRadius: '6px',
+              cursor: 'pointer',
+              fontSize: '1rem',
+            }}
+          >
+            Recargar
+          </button>
+        </div>
+      );
+    }
+    return this.props.children;
+  }
+}

apps/frontend/src/components/LoginModal.css

@@ -118,7 +118,7 @@
 
 .modal-error {
   font-size: 0.82rem;
-  color: #b91c1c;
+  color: var(--error);
   margin: 0.25rem 0 0.75rem;
 }
 
@@ -149,7 +149,7 @@
 .modal-submit {
   background: var(--primary);
   border: none;
-  color: #fff;
+  color: var(--on-primary);
   padding: 0.55rem 1.35rem;
   border-radius: 999px;
   cursor: pointer;

apps/frontend/src/components/MedicineResults.css

@@ -1,10 +1,11 @@
 .medicine-results {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
   gap: 1rem;
   margin-top: 0.5rem;
   max-height: 70vh;
   overflow-y: auto;
+  overflow-x: hidden;
   overscroll-behavior: contain;
   animation: fadeInUp 0.5s ease-out;
 }

apps/frontend/src/components/PharmacyList.css

@@ -14,7 +14,7 @@
 
 .pharmacy-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
   gap: 1rem;
 }
 
@@ -139,8 +139,8 @@
 }
 
 .stock.low-stock {
-  background: rgba(180, 83, 9, 0.12);
-  color: #b45309;
+  background: var(--warning-container);
+  color: var(--warning);
 }
 
 .stock.out-of-stock {
@@ -159,6 +159,28 @@
   margin-top: 1rem;
 }
 
+.pharmacy-directions {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.4rem;
+  margin-top: 0.75rem;
+  padding: 0.45rem 0.85rem;
+  font-size: 0.82rem;
+  font-weight: 600;
+  color: var(--primary);
+  background: rgba(0, 69, 13, 0.06);
+  border: 1px solid rgba(0, 69, 13, 0.15);
+  border-radius: var(--radius-full);
+  text-decoration: none;
+  transition: background 0.15s, border-color 0.15s;
+  width: fit-content;
+}
+
+.pharmacy-directions:hover {
+  background: rgba(0, 69, 13, 0.12);
+  border-color: var(--primary);
+}
+
 @media (max-width: 768px) {
   .pharmacy-grid {
     grid-template-columns: 1fr;

apps/frontend/src/components/PharmacyList.jsx

@@ -45,6 +45,7 @@ function PharmacyList({ pharmacies, loading, userPosition, medicine, currentUser
               medicine={medicine}
               currentUser={currentUser}
               onLoginRequest={onLoginRequest}
+              userPosition={userPosition}
             />
           );
         })}
@@ -53,7 +54,7 @@ function PharmacyList({ pharmacies, loading, userPosition, medicine, currentUser
   );
 }
 
-function PharmacyCard({ pharmacy, distanceKm, medicine, currentUser, onLoginRequest }) {
+function PharmacyCard({ pharmacy, distanceKm, medicine, currentUser, onLoginRequest, userPosition }) {
   const nregistro = medicine?.nregistro || medicine?.id;
   const supported = pushSupported();
   const outOfStock = pharmacy.stock !== undefined && pharmacy.stock <= 0;
@@ -146,6 +147,23 @@ function PharmacyCard({ pharmacy, distanceKm, medicine, currentUser, onLoginRequ
           <p className="pharmacy-phone">📞 {pharmacy.phone}</p>
         )}
         {error && <p className="notify-error">{error}</p>}
+        {pharmacy.latitude != null && pharmacy.longitude != null && (
+          <a
+            className="pharmacy-directions"
+            href={
+              userPosition
+                ? `https://www.google.com/maps/dir/?api=1&origin=${userPosition.lat},${userPosition.lon}&destination=${pharmacy.latitude},${pharmacy.longitude}`
+                : `https://www.google.com/maps/dir/?api=1&destination=${pharmacy.latitude},${pharmacy.longitude}`
+            }
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+              <polygon points="3 11 22 2 13 21 11 13 3 11" />
+            </svg>
+            Cómo llegar
+          </a>
+        )}
         <div className="pharmacy-pricing">
           {pharmacy.price && (
             <span className="price">€{parseFloat(pharmacy.price).toFixed(2)}</span>

apps/frontend/src/components/ProductResults.css

@@ -0,0 +1,163 @@
+.product-results {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+  gap: 1rem;
+  margin-top: 0.5rem;
+  max-height: 70vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+  overscroll-behavior: contain;
+  animation: fadeInUp 0.5s ease-out;
+}
+
+@media (min-width: 1024px) {
+  .product-results {
+    max-height: 76vh;
+  }
+}
+
+.product-card {
+  background: var(--surface-container-lowest);
+  border-radius: var(--radius-md);
+  padding: 1.25rem;
+  cursor: pointer;
+  transition: transform 0.15s, box-shadow 0.15s;
+  border: 1px solid var(--outline-variant);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-shadow: var(--shadow-soft);
+}
+
+.product-card:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.1);
+  border-color: var(--primary);
+}
+
+.product-card-image {
+  width: 100%;
+  height: 120px;
+  margin-bottom: 1rem;
+  overflow: hidden;
+  border-radius: var(--radius-sm);
+  background: var(--surface-container-low);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.product-card-image img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.product-image-placeholder {
+  color: var(--outline-variant);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.product-card-content {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.product-card-badges {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+  margin-bottom: 0.75rem;
+}
+
+.source-badge {
+  color: white;
+  padding: 0.25rem 0.5rem;
+  border-radius: var(--radius-sm);
+  font-size: 0.7rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.02em;
+}
+
+.category-badge {
+  background: var(--surface-container-high);
+  color: var(--on-surface-variant);
+  padding: 0.25rem 0.5rem;
+  border-radius: var(--radius-sm);
+  font-size: 0.7rem;
+  font-weight: 600;
+}
+
+.nutri-score-badge {
+  color: white;
+  padding: 0.25rem 0.5rem;
+  border-radius: var(--radius-sm);
+  font-size: 0.7rem;
+  font-weight: 600;
+}
+
+.product-card-header {
+  margin-bottom: 0.5rem;
+}
+
+.product-card-header h3 {
+  color: var(--on-surface);
+  font-size: 1.15rem;
+  font-weight: 700;
+  letter-spacing: -0.01em;
+  flex: 1;
+  margin: 0;
+}
+
+.product-card-body {
+  margin-bottom: 1rem;
+  flex: 1;
+}
+
+.product-card-body p {
+  font-size: 0.9rem;
+  color: var(--on-surface-variant);
+  line-height: 1.55;
+  margin-bottom: 0.25rem;
+}
+
+.product-card-body strong {
+  color: var(--on-surface);
+  font-weight: 600;
+}
+
+.product-card-footer {
+  padding-top: 0.75rem;
+  border-top: 1px solid var(--outline-variant);
+}
+
+.view-details {
+  color: var(--primary);
+  font-weight: 600;
+  font-size: 0.9rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.view-details::after {
+  content: "→";
+  transition: transform 0.2s;
+}
+
+.product-card:hover .view-details::after {
+  transform: translateX(4px);
+}
+
+.no-results {
+  text-align: center;
+  padding: 2.5rem 1.5rem;
+  background: var(--surface-container-low);
+  border-radius: var(--radius-md);
+  color: var(--on-surface-variant);
+  border: 1px dashed var(--outline-variant);
+}

apps/frontend/src/components/ProductResults.jsx

@@ -0,0 +1,114 @@
+import React from 'react';
+import './ProductResults.css';
+
+const categoryLabels = {
+  otc: 'Sin Receta',
+  baby_food: 'Alimentación Infantil',
+  baby_milk: 'Leche de Fórmula',
+  baby_cereal: 'Cereales Bebé'
+};
+
+const sourceColors = {
+  cima: '#2563eb',
+  openfoodfacts: '#16a34a'
+};
+
+const sourceLabels = {
+  cima: 'CIMA',
+  openfoodfacts: 'Open Food Facts'
+};
+
+function ProductResults({ products, onSelect }) {
+  if (!products || products.length === 0) {
+    return (
+      <div className="no-results">
+        <p>No se encontraron productos</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="product-results">
+      {products.map((product) => (
+        <ProductCard
+          key={product.id}
+          product={product}
+          onSelect={onSelect}
+        />
+      ))}
+    </div>
+  );
+}
+
+function ProductCard({ product, onSelect }) {
+  const nutriScore = product.nutriscore;
+  const nutriScoreColors = {
+    a: '#16a34a',
+    b: '#65a30d',
+    c: '#eab308',
+    d: '#f97316',
+    e: '#dc2626'
+  };
+
+  return (
+    <div className="product-card" onClick={() => onSelect(product)}>
+      <div className="product-card-image">
+        {product.image_url ? (
+          <img src={product.image_url} alt={product.name} loading="lazy" />
+        ) : (
+          <div className="product-image-placeholder">
+            <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
+              <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
+              <circle cx="8.5" cy="8.5" r="1.5" />
+              <polyline points="21 15 16 10 5 21" />
+            </svg>
+          </div>
+        )}
+      </div>
+
+      <div className="product-card-content">
+        <div className="product-card-badges">
+          <span
+            className="source-badge"
+            style={{ backgroundColor: sourceColors[product.source] }}
+          >
+            {sourceLabels[product.source]}
+          </span>
+          <span className="category-badge">
+            {categoryLabels[product.category] || product.category}
+          </span>
+          {product.source === 'openfoodfacts' && nutriScore && (
+            <span
+              className="nutri-score-badge"
+              style={{ backgroundColor: nutriScoreColors[nutriScore.toLowerCase()] || '#9ca3af' }}
+            >
+              Nutri-Score {nutriScore.toUpperCase()}
+            </span>
+          )}
+        </div>
+
+        <div className="product-card-header">
+          <h3>{product.name}</h3>
+        </div>
+
+        <div className="product-card-body">
+          {product.brand && (
+            <p><strong>Marca:</strong> {product.brand}</p>
+          )}
+          {product.source === 'cima' && product.active_ingredient && (
+            <p><strong>Principio Activo:</strong> {product.active_ingredient}</p>
+          )}
+          {product.source === 'cima' && product.dosage && (
+            <p><strong>Dosis:</strong> {product.dosage}</p>
+          )}
+        </div>
+
+        <div className="product-card-footer">
+          <span className="view-details">Ver detalles →</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default ProductResults;

apps/frontend/src/components/SavedNotifications.css

@@ -73,7 +73,7 @@
 }
 
 .saved-notifications-error {
-  color: #b91c1c;
+  color: var(--error);
 }
 
 .saved-notifications-list {
@@ -155,8 +155,8 @@
 }
 
 .saved-notifications-remove:hover:not(:disabled) {
-  border-color: #b91c1c;
-  color: #b91c1c;
+  border-color: var(--error);
+  color: var(--error);
   background: rgba(185, 28, 28, 0.06);
 }
 
@@ -175,6 +175,41 @@
   to { opacity: 1; transform: translateY(0) scale(1); }
 }
 
+/* Dark mode adaptations */
+[data-theme="dark"] .saved-notifications-item {
+  background: var(--surface-container);
+  border-color: var(--border);
+}
+
+[data-theme="dark"] .saved-notifications-item-name {
+  color: #b0d4b8;
+}
+
+[data-theme="dark"] .saved-notifications-chip {
+  background: rgba(96, 165, 250, 0.15);
+  color: #93c5fd;
+}
+
+[data-theme="dark"] .saved-notifications-chip--pharmacy {
+  background: rgba(142, 212, 160, 0.15);
+  color: #8ed4a0;
+}
+
+[data-theme="dark"] .saved-notifications-address {
+  color: #9ca3af;
+}
+
+[data-theme="dark"] .saved-notifications-remove {
+  border-color: var(--border);
+  color: var(--text-muted);
+}
+
+[data-theme="dark"] .saved-notifications-remove:hover:not(:disabled) {
+  background: rgba(239, 68, 68, 0.12);
+  color: #fca5a5;
+  border-color: #f87171;
+}
+
 @media (max-width: 540px) {
   .saved-notifications-backdrop {
     padding: 2vh 0.5rem;

apps/frontend/src/components/admin/AdminComponents.css

@@ -397,6 +397,28 @@
   border-color: var(--border-strong);
 }
 
+/* Source badges */
+.source-badge {
+  display: inline-block;
+  padding: 0.15rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.75rem;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  vertical-align: middle;
+}
+
+.source-badge--cima {
+  background: rgba(37, 99, 235, 0.12);
+  color: #2563eb;
+}
+
+.source-badge--off {
+  background: rgba(16, 185, 129, 0.12);
+  color: #10b981;
+}
+
 /* Pharmacies: search, region import, list filter */
 .pharmacy-tools-card {
   background: var(--surface);

apps/frontend/src/components/admin/PharmacyProductLink.jsx

@@ -0,0 +1,421 @@
+import React, { useState, useEffect, useMemo, useRef } from 'react';
+import './AdminComponents.css';
+
+const MAX_PHARMACY_RESULTS = 25;
+
+function normalize(s) {
+  return (s || '').toString().toLowerCase().normalize('NFD').replace(/[̀-ͯ]/g, '');
+}
+
+function PharmacyProductLink() {
+  const [pharmacies, setPharmacies] = useState([]);
+  const [productSearch, setProductSearch] = useState('');
+  const [productResults, setProductResults] = useState([]);
+  const [selectedPharmacy, setSelectedPharmacy] = useState(null);
+  const [selectedProduct, setSelectedProduct] = useState(null);
+  const [pharmacyProducts, setPharmacyProducts] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const [searching, setSearching] = useState(false);
+  const [pharmacyQuery, setPharmacyQuery] = useState('');
+  const [pharmacyDropdownOpen, setPharmacyDropdownOpen] = useState(false);
+  const pharmacyInputRef = useRef(null);
+  const [formData, setFormData] = useState({
+    pharmacy_id: '',
+    price: '',
+    stock: ''
+  });
+
+  const filteredPharmacies = useMemo(() => {
+    const q = normalize(pharmacyQuery).trim();
+    if (!q) return pharmacies.slice(0, MAX_PHARMACY_RESULTS);
+    const tokens = q.split(/\s+/).filter(Boolean);
+    return pharmacies
+      .filter(p => {
+        const hay = `${normalize(p.name)} ${normalize(p.address)}`;
+        return tokens.every(tok => hay.includes(tok));
+      })
+      .slice(0, MAX_PHARMACY_RESULTS);
+  }, [pharmacies, pharmacyQuery]);
+
+  useEffect(() => {
+    fetchPharmacies();
+  }, []);
+
+  useEffect(() => {
+    if (selectedPharmacy) {
+      fetchPharmacyProducts(selectedPharmacy.id);
+    }
+  }, [selectedPharmacy]);
+
+  // Buscar productos en la API mientras el usuario escribe
+  useEffect(() => {
+    const q = productSearch.trim();
+    if (q.length < 2) {
+      setProductResults([]);
+      setSearching(false);
+      return;
+    }
+
+    const controller = new AbortController();
+    const timeoutId = setTimeout(async () => {
+      setSearching(true);
+      try {
+        const response = await fetch(`/api/products/search?q=${encodeURIComponent(q)}`, {
+          credentials: 'include',
+          signal: controller.signal,
+        });
+        const data = await response.json();
+        setProductResults(Array.isArray(data) ? data : []);
+      } catch (error) {
+        if (error.name === 'AbortError') return;
+        console.error('Error searching products:', error);
+      } finally {
+        if (!controller.signal.aborted) setSearching(false);
+      }
+    }, 500);
+
+    return () => {
+      clearTimeout(timeoutId);
+      controller.abort();
+    };
+  }, [productSearch]);
+
+  const fetchPharmacies = async () => {
+    try {
+      const response = await fetch('/api/pharmacies', {
+        credentials: 'include',
+      });
+      const data = await response.json();
+      setPharmacies(data);
+    } catch (error) {
+      console.error('Error fetching pharmacies:', error);
+    }
+  };
+
+  const fetchPharmacyProducts = async (pharmacyId) => {
+    setLoading(true);
+    try {
+      const response = await fetch(`/api/admin/pharmacies/${pharmacyId}/products`, {
+        credentials: 'include',
+      });
+      const data = await response.json();
+      setPharmacyProducts(data);
+    } catch (error) {
+      console.error('Error fetching pharmacy products:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    
+    if (!selectedProduct) {
+      alert('Por favor, selecciona un producto primero');
+      return;
+    }
+
+    try {
+      // Build identifier: source:id (e.g., openfoodfacts:9421025231209)
+      const identifier = selectedProduct._id 
+        ? `${selectedProduct.source || 'openfoodfacts'}:${selectedProduct._id}`
+        : `${selectedProduct.source || 'openfoodfacts'}:${selectedProduct.id}`;
+
+      const payload = {
+        pharmacy_id: parseInt(formData.pharmacy_id),
+        product_source: selectedProduct.source || 'openfoodfacts',
+        product_off_id: selectedProduct._id || selectedProduct.id,
+        product_name: selectedProduct.product_name || selectedProduct.name,
+        price: formData.price ? parseFloat(formData.price) : null,
+        stock: formData.stock ? parseInt(formData.stock) : 0
+      };
+
+      const response = await fetch('/api/admin/pharmacy-products', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify(payload)
+      });
+
+      if (!response.ok) throw new Error('Error al vincular producto a farmacia');
+
+      resetForm();
+      if (selectedPharmacy) {
+        fetchPharmacyProducts(selectedPharmacy.id);
+      }
+      alert('¡Producto vinculado a la farmacia correctamente!');
+    } catch (error) {
+      console.error('Error linking product:', error);
+      alert('Error al vincular producto a farmacia');
+    }
+  };
+
+  const handleUpdate = async (id, price, stock) => {
+    try {
+      const response = await fetch(`/api/admin/pharmacy-products/${id}`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify({ price, stock })
+      });
+
+      if (!response.ok) throw new Error('Error al actualizar');
+
+      fetchPharmacyProducts(selectedPharmacy.id);
+      alert('¡Actualizado correctamente!');
+    } catch (error) {
+      console.error('Error updating:', error);
+      alert('Error al actualizar');
+    }
+  };
+
+  const handleDelete = async (id) => {
+    if (!confirm('¿Eliminar este producto de la farmacia?')) return;
+
+    try {
+      const response = await fetch(`/api/admin/pharmacy-products/${id}`, {
+        method: 'DELETE',
+        credentials: 'include'
+      });
+
+      if (!response.ok) throw new Error('Error al eliminar');
+
+      fetchPharmacyProducts(selectedPharmacy.id);
+      alert('¡Producto eliminado de la farmacia!');
+    } catch (error) {
+      console.error('Error deleting:', error);
+      alert('Error al eliminar producto');
+    }
+  };
+
+  const resetForm = () => {
+    setFormData({
+      pharmacy_id: selectedPharmacy ? selectedPharmacy.id.toString() : '',
+      price: '',
+      stock: ''
+    });
+    setSelectedProduct(null);
+    setProductSearch('');
+    setProductResults([]);
+  };
+
+  const selectProduct = (product) => {
+    setSelectedProduct(product);
+    setProductSearch(product.product_name || product.name);
+    setProductResults([]);
+  };
+
+  const pickPharmacy = (pharmacy) => {
+    setSelectedPharmacy(pharmacy);
+    setFormData(prev => ({ ...prev, pharmacy_id: pharmacy.id.toString() }));
+    setPharmacyQuery(`${pharmacy.name} — ${pharmacy.address}`);
+    setPharmacyDropdownOpen(false);
+  };
+
+  const clearPharmacy = () => {
+    setSelectedPharmacy(null);
+    setFormData(prev => ({ ...prev, pharmacy_id: '' }));
+    setPharmacyQuery('');
+    setPharmacyDropdownOpen(true);
+    setTimeout(() => pharmacyInputRef.current?.focus(), 0);
+  };
+
+  const getSourceBadge = (source) => {
+    if (source === 'cima') {
+      return <span className="source-badge source-badge--cima">CIMA</span>;
+    }
+    return <span className="source-badge source-badge--off">OFF</span>;
+  };
+
+  return (
+    <div className="admin-section">
+      <h2>Vincular Producto a Farmacia</h2>
+
+      <form className="admin-form" onSubmit={handleSubmit}>
+        <div className="form-group">
+          <label>Farmacia *</label>
+          <input
+            ref={pharmacyInputRef}
+            type="text"
+            value={pharmacyQuery}
+            onChange={(e) => {
+              setPharmacyQuery(e.target.value);
+              if (selectedPharmacy) {
+                setSelectedPharmacy(null);
+                setFormData(prev => ({ ...prev, pharmacy_id: '' }));
+              }
+              setPharmacyDropdownOpen(true);
+            }}
+            onFocus={() => setPharmacyDropdownOpen(true)}
+            onBlur={() => setTimeout(() => setPharmacyDropdownOpen(false), 150)}
+            placeholder={pharmacies.length ? `Buscar entre ${pharmacies.length} farmacias por nombre o dirección…` : 'Cargando farmacias…'}
+            autoComplete="off"
+            required={!selectedPharmacy}
+          />
+          {!selectedPharmacy && pharmacyDropdownOpen && (
+            <div className="medicine-search-results">
+              {filteredPharmacies.length === 0 ? (
+                <div className="search-result-item search-result-item--empty">
+                  <span>No hay farmacias que coincidan con "{pharmacyQuery}"</span>
+                </div>
+              ) : (
+                filteredPharmacies.map((pharmacy) => (
+                  <div
+                    key={pharmacy.id}
+                    className="search-result-item"
+                    onMouseDown={(e) => { e.preventDefault(); pickPharmacy(pharmacy); }}
+                  >
+                    <strong>{pharmacy.name}</strong>
+                    <span>{pharmacy.address}</span>
+                  </div>
+                ))
+              )}
+            </div>
+          )}
+          {selectedPharmacy && (
+            <div className="selected-medicine-info">
+              <p>✅ Selected: <strong>{selectedPharmacy.name}</strong></p>
+              <p className="medicine-details">{selectedPharmacy.address}</p>
+              <button type="button" className="btn-small" onClick={clearPharmacy}>
+                Cambiar farmacia
+              </button>
+            </div>
+          )}
+        </div>
+
+        <div className="form-group">
+          <label>Buscar Producto (Open Food Facts) *</label>
+          <input
+            type="text"
+            value={productSearch}
+            onChange={(e) => {
+              setProductSearch(e.target.value);
+              setSelectedProduct(null);
+            }}
+            placeholder="Escribe para buscar productos..."
+            required
+          />
+          {searching && <p className="loading-text">Buscando...</p>}
+          
+          {productResults.length > 0 && !selectedProduct && (
+            <div className="medicine-search-results">
+              {productResults.slice(0, 10).map((product) => (
+                <div 
+                  key={product._id || product.id} 
+                  className="search-result-item"
+                  onClick={() => selectProduct(product)}
+                >
+                  <strong>{product.product_name || product.name}</strong>
+                  {product.brands && <span> - {product.brands}</span>}
+                  {product.quantity && <span> ({product.quantity})</span>}
+                </div>
+              ))}
+            </div>
+          )}
+
+          {selectedProduct && (
+            <div className="selected-medicine-info">
+              <p>✅ Selected: <strong>{selectedProduct.product_name || selectedProduct.name}</strong></p>
+              <p className="medicine-details">
+                {selectedProduct.brands && `Marca: ${selectedProduct.brands} • `}
+                {selectedProduct.quantity && `Cantidad: ${selectedProduct.quantity} • `}
+                {getSourceBadge(selectedProduct.source || 'openfoodfacts')}
+                {' '}
+                {selectedProduct._id || selectedProduct.id}
+              </p>
+              <button 
+                type="button" 
+                className="btn-small" 
+                onClick={() => {
+                  setSelectedProduct(null);
+                  setProductSearch('');
+                }}
+              >
+                Cambiar producto
+              </button>
+            </div>
+          )}
+        </div>
+
+        <div className="form-row">
+          <div className="form-group">
+            <label>Precio (€)</label>
+            <input
+              type="number"
+              step="0.01"
+              value={formData.price}
+              onChange={(e) => setFormData({ ...formData, price: e.target.value })}
+              placeholder="e.g., 3.50"
+            />
+          </div>
+
+          <div className="form-group">
+            <label>Stock</label>
+            <input
+              type="number"
+              value={formData.stock}
+              onChange={(e) => setFormData({ ...formData, stock: e.target.value })}
+              placeholder="e.g., 100"
+            />
+          </div>
+        </div>
+
+        <div className="form-actions">
+          <button type="submit" className="btn-primary">
+            Vincular Producto
+          </button>
+          <button type="button" className="btn-secondary" onClick={resetForm}>
+            Reiniciar
+          </button>
+        </div>
+      </form>
+
+      {selectedPharmacy && (
+        <div className="pharmacy-medicines-section">
+          <h3>Productos en {selectedPharmacy.name}</h3>
+          {loading ? (
+            <div className="loading">Cargando...</div>
+          ) : pharmacyProducts.length === 0 ? (
+            <p className="empty-state">Aún no hay productos vinculados a esta farmacia.</p>
+          ) : (
+            <div className="admin-list">
+              {pharmacyProducts.map((pp) => (
+                <div key={pp.id} className="admin-item">
+                  <div className="item-content">
+                    <h4>
+                      {pp.product_name}
+                      {getSourceBadge(pp.product_source)}
+                    </h4>
+                    <p>
+                      <strong>Precio:</strong> {pp.price ? `€${parseFloat(pp.price).toFixed(2)}` : 'No definido'} • 
+                      <strong> Stock:</strong> {pp.stock || 0}
+                    </p>
+                  </div>
+                  <div className="item-actions">
+                    <button 
+                      className="btn-edit"
+                      onClick={() => {
+                        const newPrice = prompt('Introduce nuevo precio:', pp.price || '');
+                        const newStock = prompt('Introduce nuevo stock:', pp.stock || '0');
+                        if (newPrice !== null && newStock !== null) {
+                          handleUpdate(pp.id, newPrice ? parseFloat(newPrice) : null, parseInt(newStock) || 0);
+                        }
+                      }}
+                    >
+                      Actualizar
+                    </button>
+                    <button className="btn-delete" onClick={() => handleDelete(pp.id)}>
+                      Eliminar
+                    </button>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default PharmacyProductLink;

apps/frontend/src/index.css

@@ -71,6 +71,101 @@
   --primary-shadow: rgba(127, 191, 143, 0.12);
   --primary-light: #eaf7ec;
   --primary-faint: rgba(127, 191, 143, 0.06);
+  --fab-bg: #2b5bb5;
+  --fab-text: #ffffff;
+  --fab-shadow: rgba(43, 91, 181, 0.32);
+  --warning: #b45309;
+  --warning-container: rgba(180, 83, 9, 0.12);
+  --suggestion-1: #ffffff;
+  --suggestion-2: #f0f7ff;
+  --suggestion-3: #e0f0ff;
+  --suggestion-4: #d4ebff;
+  --suggestion-border-1: #e2e8f0;
+  --suggestion-border-2: #dbeafe;
+  --suggestion-border-3: #bfdbfe;
+  --suggestion-border-4: #93c5fd;
+  --suggestion-text: #1e293b;
+  --suggestion-icon-bg: rgba(59, 130, 246, 0.08);
+  --suggestion-icon-color: #3b82f6;
+}
+
+/* ── Dark mode ── */
+[data-theme="dark"] {
+  --primary: #8ed4a0;
+  --on-primary: #003912;
+  --primary-container: #1a5c2a;
+  --on-primary-container: #c2ecd0;
+  --secondary: #b8c9ff;
+  --on-secondary: #1a3066;
+  --secondary-container: #2a4080;
+  --on-secondary-container: #d9e2ff;
+  --tertiary: #dac4ff;
+  --on-tertiary: #3b2a5a;
+  --tertiary-container: #524070;
+  --on-tertiary-container: #efe7ff;
+  --surface: #1e2024;
+  --on-surface: #e1e3e4;
+  --on-surface-variant: #c0c9bb;
+  --surface-container-lowest: #171a1d;
+  --surface-container-low: #252830;
+  --surface-container: #2c3038;
+  --surface-container-high: #383c44;
+  --surface-container-highest: #444850;
+  --error: #ffb4ab;
+  --on-error: #690005;
+  --error-container: #93000a;
+  --on-error-container: #ffdad6;
+  --outline: #8a9486;
+  --outline-variant: #41493e;
+  --on-background: #e1e3e4;
+  --inverse-surface: #e1e3e4;
+  --inverse-on-surface: #2e3132;
+  --inverse-primary: #2e7d32;
+  --surface-tint: #8ed4a0;
+  --surface-dim: #1e2024;
+  --surface-bright: #4a4e56;
+  --surface-variant: #41493e;
+  --primary-fixed: #acf4a4;
+  --primary-fixed-dim: #91d78a;
+  --secondary-fixed: #d9e2ff;
+  --secondary-fixed-dim: #b0c6ff;
+  --tertiary-fixed: #e9ddff;
+  --tertiary-fixed-dim: #cfbcff;
+
+  --shadow-soft: 0 4px 20px rgba(0, 0, 0, 0.32);
+
+  --text-main: var(--on-surface);
+  --text-muted: var(--on-surface-variant);
+  --surface-muted: var(--surface-container-low);
+  --surface-card: var(--surface-container-lowest);
+  --border: var(--outline-variant);
+  --border-strong: var(--outline);
+  --glass-bg: var(--surface-container);
+  --glass-border: var(--outline-variant);
+  --glass-shadow: var(--shadow-soft);
+  --accent: var(--primary);
+  --accent-warm: #f5a97a;
+  --primary-hover: #a0dfb0;
+  --primary-ring: rgba(142, 212, 160, 0.25);
+  --primary-shadow: rgba(142, 212, 160, 0.15);
+  --primary-light: #0d2b12;
+  --primary-faint: rgba(142, 212, 160, 0.08);
+  --fab-bg: #5b8bd5;
+  --fab-text: #ffffff;
+  --fab-shadow: rgba(91, 139, 213, 0.35);
+  --warning: #f59e0b;
+  --warning-container: rgba(245, 158, 11, 0.15);
+  --suggestion-1: #2c3038;
+  --suggestion-2: #252d40;
+  --suggestion-3: #25334a;
+  --suggestion-4: #253a55;
+  --suggestion-border-1: #333637;
+  --suggestion-border-2: #2a4080;
+  --suggestion-border-3: #2a4a8a;
+  --suggestion-border-4: #3060a0;
+  --suggestion-text: #e1e3e4;
+  --suggestion-icon-bg: rgba(96, 165, 250, 0.12);
+  --suggestion-icon-color: #60a5fa;
 }
 
 * {
@@ -79,6 +174,14 @@
   box-sizing: border-box;
 }
 
+html {
+  color-scheme: light;
+}
+
+[data-theme="dark"] {
+  color-scheme: dark;
+}
+
 html, body {
   height: 100%;
   overflow: hidden;
@@ -117,6 +220,15 @@ body::after {
   z-index: -1;
 }
 
+[data-theme="dark"] body::before {
+  background-image: url('./assets/bg_dark.png');
+  opacity: 0.55;
+}
+
+[data-theme="dark"] body::after {
+  background-color: rgba(0, 0, 0, 0.25);
+}
+
 #root {
   height: 100dvh;
   overflow: hidden;

apps/frontend/src/main.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
+import ErrorBoundary from './components/ErrorBoundary';
 import './index.css';
 import { initNativeShell } from './utils/native';
 import { initFaro } from './utils/faro';
@@ -9,9 +10,19 @@ import { initFaro } from './utils/faro';
 // No-op if VITE_FARO_ENDPOINT is not configured.
 initFaro();
 
+// Global unhandled promise rejection handler — report to Faro
+window.addEventListener('unhandledrejection', (event) => {
+  console.warn('[unhandledrejection]', event.reason);
+  try {
+    window.__faro?.api?.pushError(event.reason, { type: 'unhandled-rejection' });
+  } catch { /* Faro must never break the app */ }
+});
+
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
-    <App />
+    <ErrorBoundary>
+      <App />
+    </ErrorBoundary>
   </React.StrictMode>
 );
 

apps/frontend/src/utils/faro.js

@@ -17,6 +17,11 @@ import { TracingInstrumentation } from '@grafana/faro-web-tracing';
 import { OtlpHttpTransport } from '@grafana/faro-transport-otlp-http';
 
 let initialized = false;
+let faroApi = null;
+
+export function getFaro() {
+  return faroApi;
+}
 
 export function initFaro() {
   if (initialized) return;
@@ -34,7 +39,7 @@ export function initFaro() {
   const version = import.meta.env.VITE_FARO_APP_VERSION || '1.0.0';
 
   try {
-    initializeFaro({
+    const faro = initializeFaro({
       url: `${endpoint.replace(/\/$/, '')}/v1/traces`,
       app: {
         name: appName,
@@ -61,6 +66,9 @@ export function initFaro() {
         url: `${endpoint.replace(/\/$/, '')}/v1/traces`,
       }),
     });
+    faroApi = faro.api;
+    // Expose for ErrorBoundary and manual reporting
+    window.__faro = faro;
   } catch (err) {
     // Never let Faro init failure break the app.
     // eslint-disable-next-line no-console

apps/frontend/src/utils/geo.js

@@ -10,7 +10,87 @@ export function haversineKm(lat1, lon1, lat2, lon2) {
   return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
 }
 
-export function getUserPosition() {
+// --- Position Cache (localStorage) ---
+const POSITION_CACHE_KEY = 'farmafinder_last_position';
+const POSITION_CACHE_MAX_AGE = 5 * 60 * 1000; // 5 minutes
+
+function getCachedPosition() {
+  try {
+    const raw = localStorage.getItem(POSITION_CACHE_KEY);
+    if (!raw) return null;
+    const cached = JSON.parse(raw);
+    if (Date.now() - cached.timestamp > POSITION_CACHE_MAX_AGE) return null;
+    return { lat: cached.lat, lon: cached.lon };
+  } catch {
+    return null;
+  }
+}
+
+function setCachedPosition(lat, lon) {
+  try {
+    localStorage.setItem(POSITION_CACHE_KEY, JSON.stringify({ lat, lon, timestamp: Date.now() }));
+  } catch {}
+}
+
+function clearCachedPosition() {
+  try {
+    localStorage.removeItem(POSITION_CACHE_KEY);
+  } catch {}
+}
+
+// --- Position Manager ---
+let pendingPositionRequest = null;
+
+/**
+ * Get user position with caching strategy:
+ * 1. Return cached position if fresh (< 5 min)
+ * 2. Request browser geolocation in background
+ * 3. If browser fails, fall back to cached (up to 15 min)
+ *
+ * This makes the first request nearly instant for repeat users.
+ */
+export function getUserPosition({ timeout = 15000, maximumAge = 300000, retries = 1 } = {}) {
+  // Cancel any pending request before starting a new one
+  if (pendingPositionRequest) {
+    pendingPositionRequest.cancel();
+    pendingPositionRequest = null;
+  }
+
+  // 1. Fast path: return fresh cached position immediately
+  const cached = getCachedPosition();
+  if (cached) {
+    // Also refresh in background (don't await)
+    refreshPositionInBackground(timeout, maximumAge);
+    return Promise.resolve(cached);
+  }
+
+  // 2. Slow path: request from browser
+  return requestBrowserPosition({ timeout, maximumAge, retries }).then(pos => {
+    setCachedPosition(pos.lat, pos.lon);
+    return pos;
+  });
+}
+
+/**
+ * Refresh position silently in background — updates cache for next call.
+ */
+function refreshPositionInBackground(timeout, maximumAge) {
+  if (!navigator.geolocation) return;
+
+  navigator.geolocation.getCurrentPosition(
+    pos => {
+      const newPos = { lat: pos.coords.latitude, lon: pos.coords.longitude };
+      setCachedPosition(newPos.lat, newPos.lon);
+    },
+    () => {}, // silently fail — we already have a cached position
+    { timeout, maximumAge, enableHighAccuracy: false }
+  );
+}
+
+/**
+ * Core browser geolocation request with retry logic.
+ */
+function requestBrowserPosition({ timeout = 15000, maximumAge = 300000, retries = 1 } = {}) {
   return new Promise((resolve, reject) => {
     if (!navigator.geolocation) {
       reject(new Error('Geolocalización no compatible con este navegador'));
@@ -20,17 +100,82 @@ export function getUserPosition() {
       reject(new Error('La geolocalización requiere HTTPS (o localhost)'));
       return;
     }
-    navigator.geolocation.getCurrentPosition(
-      pos => resolve({ lat: pos.coords.latitude, lon: pos.coords.longitude }),
-      err => {
-        console.error('[geo] getCurrentPosition failed — code:', err && err.code, 'message:', err && err.message);
+
+    let attempts = 0;
+    let watchId = null;
+    let settled = false;
+
+    function cleanup() {
+      if (watchId !== null) {
+        navigator.geolocation.clearWatch(watchId);
+        watchId = null;
+      }
+      if (pendingPositionRequest?.id === requestId) {
+        pendingPositionRequest = null;
+      }
+    }
+
+    function succeed(pos) {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      const newPos = { lat: pos.coords.latitude, lon: pos.coords.longitude };
+      setCachedPosition(newPos.lat, newPos.lon);
+      resolve(newPos);
+    }
+
+    function fail(err) {
+      if (settled) return;
+      attempts++;
+      if (attempts <= retries && err?.code === 3) {
+        const delay = Math.min(1000 * Math.pow(2, attempts - 1), 5000);
+        console.warn(`[geo] timeout, retrying in ${delay}ms (attempt ${attempts}/${retries})`);
+        setTimeout(() => {
+          if (!settled) startWatching();
+        }, delay);
+      } else {
+        settled = true;
+        cleanup();
+        console.error('[geo] getCurrentPosition failed — code:', err?.code, 'message:', err?.message);
         reject(err);
-      },
-      { timeout: 15000, maximumAge: 60000, enableHighAccuracy: false }
-    );
+      }
+    }
+
+    function startWatching() {
+      if (settled) return;
+      watchId = navigator.geolocation.watchPosition(succeed, fail, {
+        timeout,
+        maximumAge,
+        enableHighAccuracy: false,
+      });
+      setTimeout(() => {
+        if (!settled && watchId !== null) {
+          fail({ code: 3, message: 'Timeout' });
+        }
+      }, timeout + 2000);
+    }
+
+    const requestId = Date.now();
+    pendingPositionRequest = { id: requestId, cancel: () => { settled = true; cleanup(); } };
+
+    startWatching();
   });
 }
 
+/**
+ * Clear cached position (e.g. on logout or when user explicitly wants fresh location).
+ */
+export function clearPositionCache() {
+  clearCachedPosition();
+}
+
+/**
+ * Check if we have any cached position (for UI hints).
+ */
+export function hasCachedPosition() {
+  return getCachedPosition() !== null;
+}
+
 export function formatDistance(km) {
   if (km < 1) return `${Math.round(km * 1000)} m`;
   if (km < 10) return `${km.toFixed(1)} km`;

apps/frontend/src/views/AdminView.jsx

@@ -5,6 +5,7 @@ import LoginForm from '../components/admin/LoginForm';
 import PharmacyManagement from '../components/admin/PharmacyManagement';
 import MedicineManagement from '../components/admin/MedicineManagement';
 import PharmacyMedicineLink from '../components/admin/PharmacyMedicineLink';
+import PharmacyProductLink from '../components/admin/PharmacyProductLink';
 
 function AdminView() {
   const [authenticated, setAuthenticated] = useState(false);
@@ -115,12 +116,19 @@ function AdminView() {
           >
             🔗 Vincular Medicamento a Farmacia
           </button>
+          <button 
+            className={`admin-tab ${activeTab === 'link-product' ? 'active' : ''}`}
+            onClick={() => setActiveTab('link-product')}
+          >
+            🍎 Vincular Producto a Farmacia
+          </button>
         </div>
 
         <div className="admin-content">
           {activeTab === 'pharmacies' && <PharmacyManagement />}
           {activeTab === 'medicines' && <MedicineManagement />}
           {activeTab === 'link' && <PharmacyMedicineLink />}
+          {activeTab === 'link-product' && <PharmacyProductLink />}
         </div>
       </main>
     </>

apps/frontend/src/views/AlertsView.css

@@ -130,6 +130,42 @@
   background: var(--surface-container-high);
 }
 
+/* Dark mode adaptations */
+[data-theme="dark"] .alert-card {
+  background: var(--surface-container);
+}
+
+[data-theme="dark"] .alert-badge--primary {
+  background: rgba(239, 68, 68, 0.2);
+  color: #fca5a5;
+}
+
+[data-theme="dark"] .alert-badge--tertiary {
+  background: rgba(167, 139, 250, 0.2);
+  color: #c4b5fd;
+}
+
+[data-theme="dark"] .alert-icon--primary {
+  background: rgba(142, 212, 160, 0.15);
+  color: #8ed4a0;
+}
+
+[data-theme="dark"] .alert-icon--tertiary {
+  background: rgba(167, 139, 250, 0.15);
+  color: #a78bfa;
+}
+
+[data-theme="dark"] .alert-delete {
+  border-color: var(--border);
+  color: var(--text-muted);
+}
+
+[data-theme="dark"] .alert-delete:hover {
+  background: rgba(239, 68, 68, 0.12);
+  color: #fca5a5;
+  border-color: #f87171;
+}
+
 @media (max-width: 400px) {
   .alerts-title {
     font-size: 1.5rem;

apps/frontend/src/views/AlertsView.jsx

@@ -14,7 +14,7 @@ const iconMap = {
   ),
 };
 
-function AlertsView({ onNotificationChange }) {
+function AlertsView({ onNotificationChange, onNavigateToMedicine }) {
   const [availability, setAvailability] = useState([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
@@ -122,7 +122,13 @@ function AlertsView({ onNotificationChange }) {
                             {iconMap[cardIcon]}
                           </div>
                           <div className="alert-info">
-                            <h3 className="alert-title">{alert.medicine_name || alert.medicine_nregistro}</h3>
+                            <h3
+                              className="alert-title"
+                              style={{ cursor: 'pointer', textDecoration: 'underline', color: 'var(--primary, #6750a4)' }}
+                              onClick={() => onNavigateToMedicine?.(alert.medicine_name || alert.medicine_nregistro)}
+                            >
+                              {alert.medicine_name || alert.medicine_nregistro}
+                            </h3>
                             {alert.scope === 'pharmacy' ? (
                               <div style={{ display: 'flex', flexDirection: 'column', gap: '0.25rem', marginTop: '0.25rem' }}>
                                 <span className={`alert-badge alert-badge--${cardColor}`} style={{ width: 'fit-content' }}>

apps/frontend/src/views/HomeView.css

@@ -192,9 +192,9 @@
 
 .home-card--scan {
   /* Keep the scan button vivid and easy to find (intentionally prominent) */
-  background: #2b5bb5; /* vivid blue to stand out */
-  color: #ffffff;
-  box-shadow: 0 8px 28px rgba(43, 91, 181, 0.28);
+  background: var(--fab-bg);
+  color: var(--fab-text);
+  box-shadow: 0 8px 28px var(--fab-shadow);
   transform: translateY(0);
 }
 
@@ -204,7 +204,7 @@
 
 .home-card--scan:focus {
   outline: none;
-  box-shadow: 0 0 0 6px rgba(43,91,181,0.12), 0 8px 28px rgba(43,91,181,0.28);
+  box-shadow: 0 0 0 6px rgba(43,91,181,0.12), 0 8px 28px var(--fab-shadow);
 }
 
 .home-card-icon {

apps/frontend/src/views/HomeView.jsx

@@ -6,7 +6,7 @@ function HomeView({ onScanClick, onSearchClick }) {
     <div className="home-view">
       <div className="home-hero">
         <div className="home-logo-wrapper">
-          <img src="/farmaclic_logo.png" alt="FarmaClic" className="home-logo" />
+          <img src="/farmaclic_logo_home.png" alt="FarmaClic" className="home-logo" />
           <img src="/farmaclic_text.png" alt="FarmaClic" className="home-brand-name" />
         </div>
         <p className="home-desc">Encuentra tus medicamentos en farmacias cercanas</p>

apps/frontend/src/views/ProductView.css

@@ -0,0 +1,185 @@
+.product-view {
+  width: 100%;
+  max-width: 48rem;
+  margin: 0 auto;
+  padding: 1rem var(--margin-main) 2rem;
+  animation: fadeInUp 0.3s ease-out;
+}
+
+.back-btn {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.5rem 0;
+  margin-bottom: 1rem;
+  background: none;
+  border: none;
+  color: var(--primary, #2563eb);
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+}
+
+.back-btn:hover {
+  opacity: 0.8;
+}
+
+.product-loading,
+.product-error {
+  text-align: center;
+  padding: 3rem 1rem;
+  color: var(--on-surface-variant, #6b7280);
+  font-size: 1rem;
+}
+
+.product-header {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 1.5rem;
+}
+
+.product-image {
+  width: 120px;
+  height: 120px;
+  object-fit: contain;
+  border-radius: var(--radius-md, 0.75rem);
+  margin-bottom: 1rem;
+}
+
+.source-badge {
+  display: inline-block;
+  padding: 0.25rem 0.75rem;
+  border-radius: 9999px;
+  color: white;
+  font-size: 0.75rem;
+  font-weight: 600;
+}
+
+.product-name {
+  font-size: 1.5rem;
+  font-weight: 700;
+  color: var(--on-surface);
+  text-align: center;
+  margin-bottom: 0.25rem;
+}
+
+.product-brand {
+  font-size: 1rem;
+  color: var(--on-surface-variant, #6b7280);
+  text-align: center;
+  margin-bottom: 1.5rem;
+}
+
+.product-details {
+  background: var(--surface-container-lowest, #f9fafb);
+  border-radius: var(--radius-md, 0.75rem);
+  padding: 1rem;
+}
+
+.detail-row {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+  padding: 0.75rem 0;
+  border-bottom: 1px solid var(--outline-variant, #e5e7eb);
+}
+
+.detail-row:last-child {
+  border-bottom: none;
+}
+
+.detail-label {
+  font-size: 0.75rem;
+  font-weight: 600;
+  color: var(--on-surface-variant, #9ca3af);
+  text-transform: uppercase;
+}
+
+.detail-value {
+  font-size: 0.9375rem;
+  color: var(--on-surface);
+}
+
+.product-pharmacies {
+  margin-top: 2rem;
+}
+
+.pharmacies-loading {
+  text-align: center;
+  padding: 2rem 1rem;
+  color: var(--on-surface-variant, #6b7280);
+  font-size: 0.875rem;
+}
+
+.pharmacies-title {
+  font-size: 1.125rem;
+  font-weight: 600;
+  color: var(--on-surface);
+  margin-bottom: 1rem;
+}
+
+.pharmacies-grid {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.product-pharmacy-card {
+  background: var(--surface-container-lowest, #f9fafb);
+  border-radius: var(--radius-md, 0.75rem);
+  padding: 1rem;
+}
+
+.product-pharmacy-name {
+  font-size: 0.9375rem;
+  font-weight: 600;
+  color: var(--on-surface);
+  margin-bottom: 0.25rem;
+}
+
+.product-pharmacy-address {
+  font-size: 0.8125rem;
+  color: var(--on-surface-variant, #6b7280);
+  margin-bottom: 0.25rem;
+}
+
+.product-pharmacy-phone {
+  font-size: 0.8125rem;
+  color: var(--on-surface-variant, #6b7280);
+  margin-bottom: 0.5rem;
+}
+
+.product-pharmacy-status {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.product-pharmacy-price {
+  font-size: 0.9375rem;
+  font-weight: 600;
+  color: var(--primary, #2563eb);
+}
+
+.product-pharmacy-stock {
+  font-size: 0.75rem;
+  font-weight: 600;
+  padding: 0.15rem 0.5rem;
+  border-radius: 9999px;
+}
+
+.product-pharmacy-stock.in-stock {
+  background: #dcfce7;
+  color: #166534;
+}
+
+.product-pharmacy-stock.low-stock {
+  background: #fef9c3;
+  color: #854d0e;
+}
+
+.product-pharmacy-stock.out-of-stock {
+  background: #fee2e2;
+  color: #991b1b;
+}

apps/frontend/src/views/ProductView.jsx

@@ -0,0 +1,180 @@
+import React, { useState, useEffect } from 'react';
+import './ProductView.css';
+
+export default function ProductView({ source, id, onBack }) {
+  const [product, setProduct] = useState(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [pharmacies, setPharmacies] = useState([]);
+  const [loadingPharmacies, setLoadingPharmacies] = useState(false);
+
+  useEffect(() => {
+    loadProduct();
+  }, [source, id]);
+
+  async function loadProduct() {
+    setLoading(true);
+    setError(null);
+    setPharmacies([]);
+    try {
+      const response = await fetch(`/api/products/${source}/${id}`);
+      if (!response.ok) {
+        throw new Error('Producto no encontrado');
+      }
+      const data = await response.json();
+      setProduct(data);
+      loadPharmacies(source, data.id);
+    } catch (err) {
+      setError(err.message);
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  async function loadPharmacies(productSource, productId) {
+    setLoadingPharmacies(true);
+    try {
+      const response = await fetch(`/api/products/${productSource}/${productId}/pharmacies`);
+      if (response.ok) {
+        const data = await response.json();
+        setPharmacies(data);
+      }
+    } catch {
+      // Pharmacies are optional — don't block on failure
+    } finally {
+      setLoadingPharmacies(false);
+    }
+  }
+
+  if (loading) {
+    return (
+      <div className="product-view">
+        <div className="product-loading">Cargando...</div>
+      </div>
+    );
+  }
+
+  if (error) {
+    return (
+      <div className="product-view">
+        <button className="back-btn" onClick={onBack}>
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
+            <path d="M19 12H5M12 19l-7-7 7-7" />
+          </svg>
+          Volver
+        </button>
+        <div className="product-error">{error}</div>
+      </div>
+    );
+  }
+
+  if (!product) return null;
+
+  const isCima = product.source === 'cima';
+  const sourceColor = isCima ? '#2563eb' : '#16a34a';
+  const sourceLabel = isCima ? 'CIMA' : 'Open Food Facts';
+
+  return (
+    <div className="product-view">
+      <button className="back-btn" onClick={onBack}>
+        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
+          <path d="M19 12H5M12 19l-7-7 7-7" />
+        </svg>
+        Volver
+      </button>
+
+      <div className="product-header">
+        {product.image_url && (
+          <img src={product.image_url} alt={product.name} className="product-image" />
+        )}
+        <span className="source-badge" style={{ backgroundColor: sourceColor }}>
+          {sourceLabel}
+        </span>
+      </div>
+
+      <h1 className="product-name">{product.name}</h1>
+      <p className="product-brand">{product.brand}</p>
+
+      <div className="product-details">
+        {isCima ? (
+          <>
+            {product.active_ingredient && (
+              <DetailRow label="Principio activo" value={product.active_ingredient} />
+            )}
+            {product.dosage && (
+              <DetailRow label="Dosis" value={product.dosage} />
+            )}
+            {product.form && (
+              <DetailRow label="Forma farmacéutica" value={product.form} />
+            )}
+            {product.prescription && (
+              <DetailRow label="Prescripción" value={product.prescription} />
+            )}
+            {product.commercialized !== undefined && (
+              <DetailRow label="Comercializado" value={product.commercialized ? 'Sí' : 'No'} />
+            )}
+          </>
+        ) : (
+          <>
+            {product.nutriscore && product.nutriscore !== 'not-applicable' && product.nutriscore !== 'unknown' && (
+              <DetailRow label="Nutri-Score" value={product.nutriscore.toUpperCase()} />
+            )}
+            {product.nova_group && (
+              <DetailRow label="NOVA" value={`Grupo ${product.nova_group}`} />
+            )}
+            {product.eco_score && product.eco_score !== 'unknown' && (
+              <DetailRow label="Eco-Score" value={product.eco_score.toUpperCase()} />
+            )}
+            {product.ingredients && (
+              <DetailRow label="Ingredientes" value={product.ingredients} />
+            )}
+          </>
+        )}
+      </div>
+
+      <div className="product-pharmacies">
+        {loadingPharmacies ? (
+          <div className="pharmacies-loading">Cargando farmacias...</div>
+        ) : pharmacies.length > 0 ? (
+          <>
+            <h3 className="pharmacies-title">
+              Disponible en {pharmacies.length} {pharmacies.length === 1 ? 'farmacia' : 'farmacias'}
+            </h3>
+            <div className="pharmacies-grid">
+              {pharmacies.map((pharmacy) => (
+                <div key={pharmacy.id} className="product-pharmacy-card">
+                  <h4 className="product-pharmacy-name">{pharmacy.name}</h4>
+                  <p className="product-pharmacy-address">{pharmacy.address}</p>
+                  {pharmacy.phone && (
+                    <p className="product-pharmacy-phone">{pharmacy.phone}</p>
+                  )}
+                  <div className="product-pharmacy-status">
+                    {pharmacy.price && (
+                      <span className="product-pharmacy-price">
+                        {parseFloat(pharmacy.price).toFixed(2)} &euro;
+                      </span>
+                    )}
+                    {pharmacy.stock !== undefined && (
+                      <span className={`product-pharmacy-stock ${pharmacy.stock > 20 ? 'in-stock' : pharmacy.stock > 0 ? 'low-stock' : 'out-of-stock'}`}>
+                        {pharmacy.stock > 20 ? 'En Stock' : pharmacy.stock > 0 ? `Stock Bajo (${pharmacy.stock})` : 'Sin Stock'}
+                      </span>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+          </>
+        ) : null}
+      </div>
+    </div>
+  );
+}
+
+function DetailRow({ label, value }) {
+  return (
+    <div className="detail-row">
+      <span className="detail-label">{label}</span>
+      <span className="detail-value">{value}</span>
+    </div>
+  );
+}

apps/frontend/src/views/ProfileView.css

@@ -845,3 +845,63 @@
     align-self: flex-end;
   }
 }
+
+/* Theme Toggle */
+.menu-item-theme-label {
+  font-size: 0.8rem;
+  font-weight: 500;
+  color: var(--on-surface-variant);
+}
+
+.profile-theme-options {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.profile-theme-btn {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  padding: 0.85rem 1rem;
+  background: var(--surface);
+  border: 2px solid var(--outline-variant);
+  border-radius: var(--radius);
+  cursor: pointer;
+  color: var(--on-surface-variant);
+  font-family: inherit;
+  text-align: left;
+  transition: border-color 0.15s, color 0.15s, background 0.15s;
+}
+
+.profile-theme-btn:hover {
+  border-color: var(--primary);
+  color: var(--on-surface);
+}
+
+.profile-theme-btn--active {
+  border-color: var(--primary);
+  background: var(--primary-faint);
+  color: var(--primary);
+}
+
+.profile-theme-btn--active .profile-theme-btn-label {
+  color: var(--primary);
+  font-weight: 700;
+}
+
+.profile-theme-btn-label {
+  flex: 1;
+  font-size: 1rem;
+  font-weight: 600;
+  color: var(--on-surface);
+}
+
+.profile-theme-btn-desc {
+  font-size: 0.8rem;
+  color: var(--on-surface-variant);
+}
+
+.profile-modal-theme {
+  max-width: 24rem;
+}

apps/frontend/src/views/ProfileView.jsx

@@ -34,7 +34,7 @@ function resolveAvatarUrl(url) {
   return url;
 }
 
-function ProfileView({ currentUser, onProfileSaved, onLogout, onAdminClick }) {
+function ProfileView({ currentUser, onProfileSaved, onLogout, onAdminClick, theme, onThemeChange }) {
   const [firstName, setFirstName] = useState(currentUser?.first_name || '');
   const [lastName, setLastName] = useState(currentUser?.last_name || '');
   const [avatarUrl, setAvatarUrl] = useState(resolveAvatarUrl(currentUser?.avatar_url));
@@ -57,6 +57,9 @@ function ProfileView({ currentUser, onProfileSaved, onLogout, onAdminClick }) {
   const [configSaving, setConfigSaving] = useState(false);
   const [configFeedback, setConfigFeedback] = useState(null);
 
+  // Theme modal state
+  const [showTheme, setShowTheme] = useState(false);
+
   // Addresses modal state
   const [showAddresses, setShowAddresses] = useState(false);
   const [addresses, setAddresses] = useState([]);
@@ -410,6 +413,21 @@ function ProfileView({ currentUser, onProfileSaved, onLogout, onAdminClick }) {
           </svg>
         </button>
 
+        <button className="profile-menu-item" onClick={() => setShowTheme(true)}>
+          <div className="menu-item-icon menu-item-icon--tertiary">
+            <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+              <path d="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9c0-.46-.04-.92-.1-1.36-.98 1.37-2.58 2.26-4.4 2.26-2.98 0-5.4-2.42-5.4-5.4 0-1.81.89-3.42 2.26-4.4-.44-.06-.9-.1-1.36-.1z" />
+            </svg>
+          </div>
+          <span className="menu-item-label">Tema</span>
+          <span className="menu-item-theme-label">
+            {theme === 'auto' ? 'Automático' : theme === 'light' ? 'Claro' : 'Oscuro'}
+          </span>
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" className="menu-item-chevron">
+            <polyline points="9 18 15 12 9 6" />
+          </svg>
+        </button>
+
         {searchHistory.length > 0 && (
           <div className="profile-search-history">
             <p className="profile-section-sub">Tus búsquedas recientes:</p>
@@ -718,6 +736,44 @@ function ProfileView({ currentUser, onProfileSaved, onLogout, onAdminClick }) {
           </div>
         </div>
       )}
+
+      {/* Theme Modal */}
+      {showTheme && (
+        <div className="profile-modal-backdrop" onClick={() => setShowTheme(false)}>
+          <div className="profile-modal profile-modal-theme" onClick={(e) => e.stopPropagation()}>
+            <div className="profile-modal-header">
+              <h3>Tema de visualización</h3>
+              <button className="profile-modal-close" onClick={() => setShowTheme(false)}>×</button>
+            </div>
+            <div className="profile-modal-body">
+              <p className="profile-section-sub">Elige cómo se ve la aplicación. En modo automático, se adapta al tema de tu dispositivo.</p>
+              <div className="profile-theme-options">
+                {[
+                  { value: 'auto', label: 'Automático', desc: 'Seguir sistema', icon: 'M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9c0-.46-.04-.92-.1-1.36-.98 1.37-2.58 2.26-4.4 2.26-2.98 0-5.4-2.42-5.4-5.4 0-1.81.89-3.42 2.26-4.4-.44-.06-.9-.1-1.36-.1z' },
+                  { value: 'light', label: 'Claro', desc: 'Siempre claro', icon: 'M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zM2 13h2c.55 0 1-.45 1-1s-.45-1-1-1H2c-.55 0-1 .45-1 1s.45 1 1 1zm18 0h2c.55 0 1-.45 1-1s-.45-1-1-1h-2c-.55 0-1 .45-1 1s.45 1 1 1zM11 2v2c0 .55.45 1 1 1s1-.45 1-1V2c0-.55-.45-1-1-1s-1 .45-1 1zm0 18v2c0 .55.45 1 1 1s1-.45 1-1v-2c0-.55-.45-1-1-1s-1 .45-1 1zM5.99 4.58c-.39-.39-1.03-.39-1.42 0-.39.39-.39 1.03 0 1.42l1.06 1.06c.39.39 1.03.39 1.42 0s.39-1.03 0-1.42L5.99 4.58zm12.37 12.37c-.39-.39-1.03-.39-1.42 0-.39.39-.39 1.03 0 1.42l1.06 1.06c.39.39 1.03.39 1.42 0 .39-.39.39-1.03 0-1.42l-1.06-1.06zm1.06-10.96c.39-.39.39-1.03 0-1.42-.39-.39-1.03-.39-1.42 0l-1.06 1.06c-.39.39-.39 1.03 0 1.42s1.03.39 1.42 0l1.06-1.06zM7.05 18.36c.39-.39.39-1.03 0-1.42-.39-.39-1.03-.39-1.42 0l-1.06 1.06c-.39.39-.39 1.03 0 1.42s1.03.39 1.42 0l1.06-1.06z' },
+                  { value: 'dark', label: 'Oscuro', desc: 'Siempre oscuro', icon: 'M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9c0-.46-.04-.92-.1-1.36-.98 1.37-2.58 2.26-4.4 2.26-2.98 0-5.4-2.42-5.4-5.4 0-1.81.89-3.42 2.26-4.4-.44-.06-.9-.1-1.36-.1z' },
+                ].map(({ value, label, desc, icon }) => (
+                  <button
+                    key={value}
+                    type="button"
+                    className={`profile-theme-btn ${theme === value ? 'profile-theme-btn--active' : ''}`}
+                    onClick={() => {
+                      onThemeChange(value);
+                      setShowTheme(false);
+                    }}
+                  >
+                    <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+                      <path d={icon} />
+                    </svg>
+                    <span className="profile-theme-btn-label">{label}</span>
+                    <span className="profile-theme-btn-desc">{desc}</span>
+                  </button>
+                ))}
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }

apps/frontend/src/views/PublicView.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useMemo } from 'react';
 import '../App.css';
 import SearchBar from '../components/SearchBar';
 import MedicineResults from '../components/MedicineResults';
+import ProductResults from '../components/ProductResults';
 import PharmacyList from '../components/PharmacyList';
 import PharmacyMap from '../components/PharmacyMap';
 import HomeView from './HomeView';
@@ -22,6 +23,8 @@ function PublicView({
 
   const [searchQuery, setSearchQuery] = useState('');
   const [medicines, setMedicines] = useState([]);
+  const [products, setProducts] = useState([]);
+  const [searchMode, setSearchMode] = useState('all'); // 'all' | 'medicines' | 'products'
   const [selectedMedicine, setSelectedMedicine] = useState(null);
   const [pharmacies, setPharmacies] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -35,6 +38,7 @@ function PublicView({
     const searchMedicines = async () => {
       if (searchQuery.trim().length < 2) {
         setMedicines([]);
+        setProducts([]);
         setSelectedMedicine(null);
         setPharmacies([]);
         return;
@@ -50,6 +54,16 @@ function PublicView({
       } finally {
         setLoading(false);
       }
+
+      try {
+        const productsResponse = await fetch(`/api/products/search?q=${encodeURIComponent(searchQuery)}`);
+        if (productsResponse.ok) {
+          const productsData = await productsResponse.json();
+          setProducts(productsData.results || []);
+        }
+      } catch (err) {
+        console.error('Product search error:', err);
+      }
     };
 
     const timeoutId = setTimeout(searchMedicines, 300);
@@ -219,7 +233,42 @@ function PublicView({
 
         {loading && <div className="loading">Buscando...</div>}
 
-        {searchQuery && !selectedMedicine && (
+        {searchQuery && (
+          <div className="flex gap-2 mb-4">
+            <button
+              onClick={() => setSearchMode('all')}
+              className={`px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
+                searchMode === 'all'
+                  ? 'bg-blue-600 text-white'
+                  : 'bg-gray-100 text-gray-600 hover:bg-gray-200'
+              }`}
+            >
+              Todos
+            </button>
+            <button
+              onClick={() => setSearchMode('medicines')}
+              className={`px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
+                searchMode === 'medicines'
+                  ? 'bg-blue-600 text-white'
+                  : 'bg-gray-100 text-gray-600 hover:bg-gray-200'
+              }`}
+            >
+              Medicamentos
+            </button>
+            <button
+              onClick={() => setSearchMode('products')}
+              className={`px-3 py-1.5 rounded-full text-sm font-medium transition-colors ${
+                searchMode === 'products'
+                  ? 'bg-blue-600 text-white'
+                  : 'bg-gray-100 text-gray-600 hover:bg-gray-200'
+              }`}
+            >
+              Parafarmacia
+            </button>
+          </div>
+        )}
+
+        {searchQuery && !selectedMedicine && (searchMode === 'all' || searchMode === 'medicines') && (
           <MedicineResults
             medicines={medicines}
             onSelect={setSelectedMedicine}
@@ -229,6 +278,18 @@ function PublicView({
           />
         )}
 
+        {(searchMode === 'all' || searchMode === 'products') && products.length > 0 && (
+          <div className="mt-6">
+            <h3 className="text-lg font-semibold mb-3">Parafarmacia y Bebé</h3>
+            <ProductResults
+              products={products}
+              onSelect={(product) => {
+                window.location.href = `/product/${product.source}/${product.id}`;
+              }}
+            />
+          </div>
+        )}
+
         {selectedMedicine && (
           <div className="selected-medicine-section">
             <div className="medicine-info">

apps/frontend/src/views/SearchView.css

@@ -2,6 +2,7 @@
   width: 100%;
   max-width: 48rem;
   margin: 0 auto;
+  overflow-x: hidden;
 }
 
 @media (min-width: 1024px) {
@@ -13,6 +14,7 @@
 .search-content {
   padding: 1rem var(--margin-main) 2rem;
   animation: fadeInUp 0.5s ease-out;
+  overflow-x: hidden;
 }
 
 .section-title {
@@ -55,36 +57,44 @@
   font-weight: 700;
 }
 
+[data-theme="dark"] .suggestion-btn:hover {
+  background: #07243d;
+}
+
 .suggestion-btn--neutral-1 {
-  background: #ffffff;
-  color: #1e293b;
-  border: 1px solid #e2e8f0;
+  background: var(--suggestion-1);
+  color: var(--suggestion-text);
+  border: 1px solid var(--suggestion-border-1);
+}
+
+[data-theme="dark"] .suggestion-btn--neutral-1:hover {
+  background: #1e2225;
 }
 
 .suggestion-btn--neutral-2 {
-  background: #f0f7ff;
-  color: #1e293b;
-  border: 1px solid #dbeafe;
+  background: var(--suggestion-2);
+  color: var(--suggestion-text);
+  border: 1px solid var(--suggestion-border-2);
 }
 
 .suggestion-btn--neutral-3 {
-  background: #e0f0ff;
-  color: #1e293b;
-  border: 1px solid #bfdbfe;
+  background: var(--suggestion-3);
+  color: var(--suggestion-text);
+  border: 1px solid var(--suggestion-border-3);
 }
 
 .suggestion-btn--neutral-4 {
-  background: #d4ebff;
-  color: #1e293b;
-  border: 1px solid #93c5fd;
+  background: var(--suggestion-4);
+  color: var(--suggestion-text);
+  border: 1px solid var(--suggestion-border-4);
 }
 
 .suggestion-icon {
   width: 2.5rem;
   height: 2.5rem;
   border-radius: var(--radius);
-  background: rgba(59, 130, 246, 0.08);
-  color: #3b82f6;
+  background: var(--suggestion-icon-bg);
+  color: var(--suggestion-icon-color);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -147,6 +157,10 @@
   white-space: nowrap;
 }
 
+[data-theme="dark"] .recent-tag {
+  background: #2c3038;
+}
+
 .recent-distance {
   display: flex;
   align-items: center;
@@ -173,6 +187,10 @@
   transition: opacity 0.15s;
 }
 
+[data-theme="dark"] .recent-btn {
+  background: #053d13;
+}
+
 .recent-btn:active {
   opacity: 0.85;
 }
@@ -203,6 +221,7 @@
   margin-top: 1.5rem;
   max-height: 70vh;
   overflow-y: auto;
+  overflow-x: hidden;
   overscroll-behavior: contain;
 }
 
@@ -310,9 +329,71 @@
 .location-error {
   color: var(--error);
   font-size: 0.85rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  flex-wrap: wrap;
+}
+
+.retry-location-btn {
+  background: var(--error);
+  color: var(--on-error);
+  border: none;
+  padding: 0.25rem 0.6rem;
+  border-radius: var(--radius);
+  font-size: 0.8rem;
+  font-weight: 600;
+  cursor: pointer;
+  white-space: nowrap;
+  transition: opacity 0.15s;
+}
+
+.retry-location-btn:hover {
+  opacity: 0.85;
 }
 
 .location-source {
   color: var(--primary);
   font-size: 0.85rem;
 }
+
+/* Filter tabs */
+.filter-tabs {
+  display: flex;
+  gap: 0.5rem;
+  margin-bottom: 1rem;
+  flex-wrap: wrap;
+}
+
+.filter-tab {
+  padding: 0.5rem 1rem;
+  border-radius: 9999px;
+  border: none;
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+  background: var(--surface-container-lowest, #f3f4f6);
+  color: var(--on-surface-variant, #6b7280);
+  transition: all 0.15s;
+}
+
+.filter-tab:hover {
+  background: var(--surface-container-low, #e5e7eb);
+}
+
+.filter-tab--active {
+  background: var(--primary, #2563eb);
+  color: white;
+}
+
+/* Products section */
+.products-section {
+  margin-top: 1.5rem;
+}
+
+.section-subtitle {
+  font-size: 1.125rem;
+  font-weight: 600;
+  color: var(--on-surface);
+  margin-bottom: 0.75rem;
+}

apps/frontend/src/views/SearchView.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect, useMemo, useCallback } from 'react';
 import SearchBar from '../components/SearchBar';
 import MedicineResults from '../components/MedicineResults';
+import ProductResults from '../components/ProductResults';
 import PharmacyList from '../components/PharmacyList';
 import PharmacyMap from '../components/PharmacyMap';
-import { haversineKm, getUserPosition } from '../utils/geo';
+import { haversineKm, getUserPosition, hasCachedPosition } from '../utils/geo';
 import './SearchView.css';
 
 const suggestions = [
@@ -13,9 +14,11 @@ const suggestions = [
   { name: 'Omeprazol', icon: 'emergency_home', color: 'neutral-4' },
 ];
 
-function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
+function SearchView({ currentUser, onLoginRequest, initialQuery = '', onNavigateToProduct }) {
   const [searchQuery, setSearchQuery] = useState(initialQuery);
   const [medicines, setMedicines] = useState([]);
+  const [products, setProducts] = useState([]);
+  const [searchMode, setSearchMode] = useState('all');
   const [selectedMedicine, setSelectedMedicine] = useState(null);
   const [pharmacies, setPharmacies] = useState([]);
   const [loading, setLoading] = useState(false);
@@ -26,6 +29,15 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
   const [locationError, setLocationError] = useState('');
   const [recentSearches, setRecentSearches] = useState([]);
 
+  // Precache position on mount — makes first "sort by distance" nearly instant
+  useEffect(() => {
+    if (hasCachedPosition()) {
+      getUserPosition().then(pos => {
+        setUserPosition(pos);
+      }).catch(() => {});
+    }
+  }, []);
+
   // Fetch recent searches when user is logged in
   useEffect(() => {
     if (!currentUser) {
@@ -59,30 +71,48 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
           timestamp: Date.now(),
         },
         ...filtered,
-      ].slice(0, 10);
+      ].slice(0, 5);
     });
   }, [currentUser]);
 
   useEffect(() => {
-    const searchMedicines = async () => {
+    const searchAll = async () => {
       if (searchQuery.trim().length < 2) {
         setMedicines([]);
+        setProducts([]);
         setSelectedMedicine(null);
         setPharmacies([]);
         return;
       }
       setLoading(true);
+      const query = searchQuery.trim();
+
       try {
-        const response = await fetch(`/api/medicines/search?q=${encodeURIComponent(searchQuery)}`);
-        const data = await response.json();
-        setMedicines(data);
+        // Run both searches in parallel for speed
+        const [medicinesRes, productsRes] = await Promise.allSettled([
+          fetch(`/api/medicines/search?q=${encodeURIComponent(query)}`),
+          fetch(`/api/products/search?q=${encodeURIComponent(query)}`),
+        ]);
+
+        // Only update if this search is still the current one
+        if (query !== searchQuery.trim()) return;
+
+        if (medicinesRes.status === 'fulfilled' && medicinesRes.value.ok) {
+          const medicinesData = await medicinesRes.value.json();
+          setMedicines(medicinesData);
+        }
+
+        if (productsRes.status === 'fulfilled' && productsRes.value.ok) {
+          const productsData = await productsRes.value.json();
+          setProducts(productsData.results || []);
+        }
       } catch (error) {
-        console.error('Error searching medicines:', error);
+        console.error('Search error:', error);
       } finally {
         setLoading(false);
       }
     };
-    const timeoutId = setTimeout(searchMedicines, 300);
+    const timeoutId = setTimeout(searchAll, 300);
     return () => clearTimeout(timeoutId);
   }, [searchQuery]);
 
@@ -139,6 +169,7 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
     }
     if (userPosition) {
       setSortByDistance(true);
+      setPositionSource('cached');
       return;
     }
     setLocating(true);
@@ -165,9 +196,9 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
     } catch (err) {
       let msg = 'No se pudo obtener tu ubicación';
       if (err && typeof err.code === 'number') {
-        if (err.code === 1) msg = 'Permiso de ubicación denegado';
-        else if (err.code === 2) msg = 'Ubicación no disponible';
-        else if (err.code === 3) msg = 'La solicitud de ubicación expiró';
+        if (err.code === 1) msg = 'Permiso de ubicación denegado. Permite el acceso a la ubicación en tu navegador.';
+        else if (err.code === 2) msg = 'Ubicación no disponible. Verifica que el GPS esté activado.';
+        else if (err.code === 3) msg = 'La ubicación tardó demasiado. Intenta de nuevo o verifica tu conexión.';
       }
       setLocationError(msg);
     } finally {
@@ -266,16 +297,57 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
         )}
 
         {searchQuery && !selectedMedicine && (
-          <MedicineResults
-            medicines={medicines}
-            onSelect={(m) => {
-              saveToRecent(m);
-              setSelectedMedicine(m);
-            }}
-            query={searchQuery}
-            currentUser={currentUser}
-            onLoginRequest={onLoginRequest}
-          />
+          <>
+            <div className="filter-tabs">
+              <button
+                className={`filter-tab ${searchMode === 'all' ? 'filter-tab--active' : ''}`}
+                onClick={() => setSearchMode('all')}
+              >
+                Todos ({medicines.length + products.length})
+              </button>
+              <button
+                className={`filter-tab ${searchMode === 'medicines' ? 'filter-tab--active' : ''}`}
+                onClick={() => setSearchMode('medicines')}
+              >
+                Medicamentos ({medicines.length})
+              </button>
+              <button
+                className={`filter-tab ${searchMode === 'products' ? 'filter-tab--active' : ''}`}
+                onClick={() => setSearchMode('products')}
+              >
+                Parafarmacia ({products.length})
+              </button>
+            </div>
+
+            {(searchMode === 'all' || searchMode === 'medicines') && (
+              <MedicineResults
+                medicines={medicines}
+                onSelect={(m) => {
+                  saveToRecent(m);
+                  setSelectedMedicine(m);
+                }}
+                query={searchQuery}
+                currentUser={currentUser}
+                onLoginRequest={onLoginRequest}
+              />
+            )}
+
+            {(searchMode === 'all' || searchMode === 'products') && products.length > 0 && (
+              <div className="products-section">
+                <h3 className="section-subtitle">Parafarmacia y Bebé</h3>
+                <ProductResults
+                  products={products}
+                  onSelect={(p) => {
+                    if (onNavigateToProduct) {
+                      onNavigateToProduct(p.source, p.id);
+                    } else {
+                      window.location.href = `/product/${p.source}/${p.id}`;
+                    }
+                  }}
+                />
+              </div>
+            )}
+          </>
         )}
 
         {selectedMedicine && (
@@ -316,8 +388,16 @@ function SearchView({ currentUser, onLoginRequest, initialQuery = '' }) {
                 {sortByDistance && positionSource === 'profile' && (
                   <span className="location-source">Usando tu dirección guardada</span>
                 )}
+                {sortByDistance && positionSource === 'cached' && (
+                  <span className="location-source">Usando ubicación reciente</span>
+                )}
                 {locationError && (
-                  <span className="location-error">{locationError}</span>
+                  <span className="location-error">
+                    {locationError}
+                    <button className="retry-location-btn" onClick={handleSortByDistance}>
+                      Reintentar
+                    </button>
+                  </span>
                 )}
               </div>
             )}