Cleanup folders & hotfixes on ci/cd
@@ -10,26 +10,36 @@ jobs:
|
|||||||
test-backend:
|
test-backend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
cache: 'npm'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: cd backend && npm ci
|
run: npm ci
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: cd backend && npm test -- --ci
|
run: npm test --workspace=farma-clic-backend -- --ci
|
||||||
|
|
||||||
test-frontend:
|
test-frontend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
cache: 'npm'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: cd frontend && npm ci
|
run: npm ci
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: cd frontend && npm test -- --run --reporter=basic
|
run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
|
||||||
|
|
||||||
build-backend:
|
build-backend:
|
||||||
needs: [ test-backend, test-frontend ]
|
needs: [ test-backend, test-frontend ]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Log in to Gitea registry
|
- name: Log in to Gitea registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
@@ -40,7 +50,7 @@ jobs:
|
|||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./backend/Dockerfile
|
file: ./apps/backend/Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
git.hacecalor.net/ichitux/farmafinder-backend:latest
|
git.hacecalor.net/ichitux/farmafinder-backend:latest
|
||||||
@@ -50,7 +60,7 @@ jobs:
|
|||||||
needs: [ test-backend, test-frontend ]
|
needs: [ test-backend, test-frontend ]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Log in to Gitea registry
|
- name: Log in to Gitea registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
@@ -60,14 +70,14 @@ jobs:
|
|||||||
- name: Build and push frontend image
|
- name: Build and push frontend image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: ./frontend
|
context: ./apps/frontend
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
git.hacecalor.net/ichitux/farmafinder-frontend:latest
|
git.hacecalor.net/ichitux/farmafinder-frontend:latest
|
||||||
git.hacecalor.net/ichitux/farmafinder-frontend:${{ gitea.sha }}
|
git.hacecalor.net/ichitux/farmafinder-frontend:${{ gitea.sha }}
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
needs: [ build ]
|
needs: [ build-backend, build-frontend ]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: SSH to remote server
|
- name: SSH to remote server
|
||||||
|
|||||||
@@ -11,37 +11,35 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: '20'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
cache-dependency-path: backend/package-lock.json
|
|
||||||
|
|
||||||
- name: Install Backend Dependencies
|
- name: Install Dependencies
|
||||||
run: cd backend && npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Run Backend Tests
|
- name: Run Backend Tests
|
||||||
run: cd backend && npm test -- --ci
|
run: npm test --workspace=farma-clic-backend -- --ci
|
||||||
|
|
||||||
test-frontend:
|
test-frontend:
|
||||||
name: Frontend Tests
|
name: Frontend Tests
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: '20'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
cache-dependency-path: frontend/package-lock.json
|
|
||||||
|
|
||||||
- name: Install Frontend Dependencies
|
- name: Install Dependencies
|
||||||
run: cd frontend && npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Run Frontend Tests
|
- name: Run Frontend Tests
|
||||||
run: cd frontend && npm test -- --run --reporter=basic
|
run: npm test --workspace=farma-clic-frontend -- --run --reporter=basic
|
||||||
|
|||||||
@@ -1,184 +0,0 @@
|
|||||||
name: iOS Build & Deploy
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- "ios-v*"
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
upload_to_testflight:
|
|
||||||
description: "Upload to TestFlight after build"
|
|
||||||
required: false
|
|
||||||
default: "true"
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- "true"
|
|
||||||
- "false"
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ios-build-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
name: Test
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: "22"
|
|
||||||
cache: "npm"
|
|
||||||
|
|
||||||
- name: Install backend dependencies & test
|
|
||||||
run: cd backend && npm ci && npm test -- --ci
|
|
||||||
|
|
||||||
- name: Install frontend dependencies & test
|
|
||||||
run: cd frontend && npm ci && npm test -- --run --reporter=basic
|
|
||||||
|
|
||||||
build-ios:
|
|
||||||
name: Build iOS App
|
|
||||||
needs: test
|
|
||||||
runs-on: macos-14
|
|
||||||
env:
|
|
||||||
SCHEME: App
|
|
||||||
WORKSPACE: ios/App/App.xcworkspace
|
|
||||||
ARCHIVE_PATH: build/App.xcarchive
|
|
||||||
EXPORT_OPTIONS: scripts/export-options.plist
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: "22"
|
|
||||||
cache: "npm"
|
|
||||||
|
|
||||||
- name: Install root dependencies
|
|
||||||
run: npm ci
|
|
||||||
|
|
||||||
- name: Install frontend dependencies
|
|
||||||
run: cd frontend && npm ci
|
|
||||||
|
|
||||||
- name: Build web bundle
|
|
||||||
run: npm run build:web
|
|
||||||
|
|
||||||
- name: Ensure iOS platform & sync Capacitor
|
|
||||||
run: |
|
|
||||||
if [ ! -d "ios/App/App.xcodeproj" ]; then
|
|
||||||
echo "Adding iOS platform..."
|
|
||||||
npx cap add ios
|
|
||||||
fi
|
|
||||||
npx cap sync ios
|
|
||||||
|
|
||||||
- name: Install CocoaPods
|
|
||||||
run: cd ios/App && pod install --repo-update
|
|
||||||
|
|
||||||
- name: Install Apple certificates & provisioning profile
|
|
||||||
uses: apple-actions/import-codesign-certs@v2
|
|
||||||
with:
|
|
||||||
p12-file-base64: ${{ secrets.IOS_P12_BASE64 }}
|
|
||||||
p12-password: ${{ secrets.IOS_P12_PASSWORD }}
|
|
||||||
|
|
||||||
- name: Install provisioning profile
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
|
|
||||||
echo "${{ secrets.IOS_PROVISION_PROFILE_BASE64 }}" | base64 --decode > ~/Library/MobileDevice/Provisioning\ Profiles/${{ secrets.IOS_PROVISION_PROFILE_UUID }}.mobileprovision
|
|
||||||
|
|
||||||
- name: Set version from tag
|
|
||||||
if: startsWith(github.ref, 'refs/tags/ios-v')
|
|
||||||
run: |
|
|
||||||
TAG_VERSION="${GITHUB_REF#refs/tags/ios-v}"
|
|
||||||
|
|
||||||
if ! echo "$TAG_VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+$'; then
|
|
||||||
echo "::error::Invalid tag format '$TAG_VERSION'. Expected semver: X.Y.Z"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
MAJOR=$(echo "$TAG_VERSION" | cut -d. -f1)
|
|
||||||
MINOR=$(echo "$TAG_VERSION" | cut -d. -f2)
|
|
||||||
PATCH=$(echo "$TAG_VERSION" | cut -d. -f3)
|
|
||||||
BUILD=${{ github.run_number }}
|
|
||||||
|
|
||||||
echo "Setting MARKETING_VERSION=$MAJOR.$MINOR.$PATCH"
|
|
||||||
echo "Setting CURRENT_PROJECT_VERSION=$BUILD"
|
|
||||||
|
|
||||||
sed -i '' "s/MARKETING_VERSION = [^;]*;/MARKETING_VERSION = $MAJOR.$MINOR.$PATCH;/" ios/App/App.xcodeproj/project.pbxproj
|
|
||||||
sed -i '' "s/CURRENT_PROJECT_VERSION = [^;]*;/CURRENT_PROJECT_VERSION = $BUILD;/" ios/App/App.xcodeproj/project.pbxproj
|
|
||||||
|
|
||||||
- name: Build Xcode archive
|
|
||||||
run: |
|
|
||||||
set -o pipefail
|
|
||||||
xcodebuild archive \
|
|
||||||
-workspace "$WORKSPACE" \
|
|
||||||
-scheme "$SCHEME" \
|
|
||||||
-configuration Release \
|
|
||||||
-destination "generic/platform=iOS" \
|
|
||||||
-archivePath "$ARCHIVE_PATH" \
|
|
||||||
-allowProvisioningUpdates \
|
|
||||||
CODE_SIGN_STYLE=Manual \
|
|
||||||
DEVELOPMENT_TEAM="${{ secrets.IOS_TEAM_ID }}" \
|
|
||||||
PROVISIONING_PROFILE_SPECIFIER="${{ secrets.IOS_PROVISION_PROFILE_NAME }}" \
|
|
||||||
2>&1 | xcpretty --color
|
|
||||||
|
|
||||||
- name: Export IPA
|
|
||||||
run: |
|
|
||||||
plutil -replace teamID -string "${{ secrets.IOS_TEAM_ID }}" "$EXPORT_OPTIONS"
|
|
||||||
plutil -replace provisioningProfiles.net.hacecalor.farmafinder -string "${{ secrets.IOS_PROVISION_PROFILE_NAME }}" "$EXPORT_OPTIONS"
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
xcodebuild -exportArchive \
|
|
||||||
-archivePath "$ARCHIVE_PATH" \
|
|
||||||
-exportOptionsPlist "$EXPORT_OPTIONS" \
|
|
||||||
-exportPath build \
|
|
||||||
-allowProvisioningUpdates \
|
|
||||||
2>&1 | xcpretty --color
|
|
||||||
|
|
||||||
- name: Upload artifact (IPA)
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: FarmaFinder-iOS
|
|
||||||
path: build/*.ipa
|
|
||||||
retention-days: 30
|
|
||||||
|
|
||||||
- name: Upload to TestFlight
|
|
||||||
if: >
|
|
||||||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/ios-v')) ||
|
|
||||||
(github.event_name == 'workflow_dispatch' && inputs.upload_to_testflight == 'true')
|
|
||||||
env:
|
|
||||||
APP_STORE_API_KEY_ID: ${{ secrets.APP_STORE_API_KEY_ID }}
|
|
||||||
APP_STORE_API_ISSUER_ID: ${{ secrets.APP_STORE_API_ISSUER_ID }}
|
|
||||||
run: |
|
|
||||||
IPA_PATH=$(find build -name "*.ipa" -maxdepth 1 | head -1)
|
|
||||||
if [ -z "$IPA_PATH" ]; then
|
|
||||||
echo "::error::No IPA found in build/"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
API_PRIVATE_KEY_PATH="$RUNNER_TEMP/app_store_api_key.p8"
|
|
||||||
echo "${{ secrets.APP_STORE_API_PRIVATE_KEY }}" > "$API_PRIVATE_KEY_PATH"
|
|
||||||
|
|
||||||
xcrun notarytool submit "$IPA_PATH" \
|
|
||||||
--key-id "$APP_STORE_API_KEY_ID" \
|
|
||||||
--issuer "$APP_STORE_API_ISSUER_ID" \
|
|
||||||
--key "$API_PRIVATE_KEY_PATH" \
|
|
||||||
--wait
|
|
||||||
|
|
||||||
rm -f "$API_PRIVATE_KEY_PATH"
|
|
||||||
|
|
||||||
- name: Summary
|
|
||||||
run: |
|
|
||||||
IPA_PATH=$(find build -name "*.ipa" -maxdepth 1 | head -1)
|
|
||||||
if [ -n "$IPA_PATH" ]; then
|
|
||||||
IPA_SIZE=$(du -h "$IPA_PATH" | cut -f1)
|
|
||||||
echo "### iOS Build Summary" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| Item | Value |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "|------|-------|" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| IPA Size | $IPA_SIZE |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| Tag | ${GITHUB_REF#refs/tags/} |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "| Build # | ${{ github.run_number }} |" >> $GITHUB_STEP_SUMMARY
|
|
||||||
else
|
|
||||||
echo "::error::IPA not found in build/"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
@@ -2,6 +2,7 @@ node_modules/
|
|||||||
dist/
|
dist/
|
||||||
dev-dist/
|
dev-dist/
|
||||||
build/
|
build/
|
||||||
|
.turbo/
|
||||||
*.sqlite
|
*.sqlite
|
||||||
*.sqlite3
|
*.sqlite3
|
||||||
.env
|
.env
|
||||||
|
|||||||
@@ -1,209 +0,0 @@
|
|||||||
# FarmaFinder — TSI Barcode Scanning + Capacitor 8 Upgrade
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Two sequential phases:
|
|
||||||
1. **Phase A** — Upgrade Capacitor 6 → 8 (prerequisite for latest barcode scanner plugin)
|
|
||||||
2. **Phase B** — Implement real TSI barcode scanning with manual CIP entry fallback
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Phase A: Upgrade Capacitor 6 → 8
|
|
||||||
|
|
||||||
### A1. Upgrade Capacitor packages (root)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm install @capacitor/cli@latest @capacitor/core@latest \
|
|
||||||
@capacitor/android@latest @capacitor/ios@latest \
|
|
||||||
@capacitor/app@latest @capacitor/splash-screen@latest \
|
|
||||||
@capacitor/status-bar@latest
|
|
||||||
```
|
|
||||||
|
|
||||||
This bumps all `@capacitor/*` from `^6.x` to `^8.x` in `package.json`.
|
|
||||||
|
|
||||||
### A2. Update `android/variables.gradle`
|
|
||||||
|
|
||||||
Replace all 13 version variables to meet Capacitor 8 minimums:
|
|
||||||
|
|
||||||
| Variable | Current | New |
|
|
||||||
|---|---|---|
|
|
||||||
| `minSdkVersion` | 22 | **24** |
|
|
||||||
| `compileSdkVersion` | 34 | **36** |
|
|
||||||
| `targetSdkVersion` | 34 | **36** |
|
|
||||||
| `androidxActivityVersion` | 1.8.0 | **1.11.0** |
|
|
||||||
| `androidxAppCompatVersion` | 1.6.1 | **1.7.1** |
|
|
||||||
| `androidxCoordinatorLayoutVersion` | 1.2.0 | **1.3.0** |
|
|
||||||
| `androidxCoreVersion` | 1.12.0 | **1.17.0** |
|
|
||||||
| `androidxFragmentVersion` | 1.6.2 | **1.8.9** |
|
|
||||||
| `coreSplashScreenVersion` | 1.0.1 | **1.2.0** |
|
|
||||||
| `androidxWebkitVersion` | 1.9.0 | **1.14.0** |
|
|
||||||
| `junitVersion` | 4.13.2 | 4.13.2 (same) |
|
|
||||||
| `androidxJunitVersion` | 1.1.5 | **1.3.0** |
|
|
||||||
| `androidxEspressoCoreVersion` | 3.5.1 | **3.7.0** |
|
|
||||||
| `cordovaAndroidVersion` | 10.1.1 | **14.0.1** |
|
|
||||||
|
|
||||||
### A3. Update `ios/App/Podfile`
|
|
||||||
|
|
||||||
- Line 3: Change `platform :ios, '13.0'` → `platform :ios, '15.0'`
|
|
||||||
|
|
||||||
### A4. Update `android/app/src/main/AndroidManifest.xml`
|
|
||||||
|
|
||||||
- Add `density` to `android:configChanges` on line 13:
|
|
||||||
```
|
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|density"
|
|
||||||
```
|
|
||||||
|
|
||||||
### A5. Update `android/build.gradle` (Gradle plugin)
|
|
||||||
|
|
||||||
- Update Android Gradle Plugin from `8.2.1` → `8.13.0`
|
|
||||||
- Update Google Services plugin from `4.4.0` → `4.4.4`
|
|
||||||
- Update Gradle wrapper to `8.14.3` in `android/gradle/wrapper/gradle-wrapper.properties`
|
|
||||||
|
|
||||||
### A6. Run Capacitor sync
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npx cap sync
|
|
||||||
```
|
|
||||||
|
|
||||||
### A7. Verify build
|
|
||||||
|
|
||||||
- Open `android/` in Android Studio — confirm Gradle sync succeeds
|
|
||||||
- Open `ios/App` in Xcode — confirm pod install succeeds and build compiles
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Phase B: Real TSI Barcode Scanning
|
|
||||||
|
|
||||||
### B1. Install barcode scanning plugin
|
|
||||||
|
|
||||||
From `frontend/`:
|
|
||||||
```bash
|
|
||||||
npm install @capacitor-mlkit/barcode-scanning@^8.1.0
|
|
||||||
npm install barcode-detector # web polyfill for PWA browser fallback
|
|
||||||
```
|
|
||||||
|
|
||||||
From root:
|
|
||||||
```bash
|
|
||||||
npx cap sync
|
|
||||||
```
|
|
||||||
|
|
||||||
**Plugin:** `@capacitor-mlkit/barcode-scanning` v8.1.0 — Google ML Kit engine, 91K+ weekly npm downloads, supports Code 128 (TSI physical card barcode) and QR Code (virtual TSI card).
|
|
||||||
|
|
||||||
### B2. Native manifest verification (no changes expected)
|
|
||||||
|
|
||||||
| Platform | File | Required | Status |
|
|
||||||
|---|---|---|---|
|
|
||||||
| Android | `AndroidManifest.xml:44` | `CAMERA` permission | Already present |
|
|
||||||
| iOS | `Info.plist:52-53` | `NSCameraUsageDescription` | Already present |
|
|
||||||
|
|
||||||
### B3. Rewrite `frontend/src/views/ScannerView.jsx`
|
|
||||||
|
|
||||||
**Remove:**
|
|
||||||
- `MOCK_TSI_CARDS` array and all mock card state/UI
|
|
||||||
- `navigator.mediaDevices.getUserMedia()` camera logic (lines 40-73)
|
|
||||||
- Auto-scan `setTimeout` simulation (lines 98-105)
|
|
||||||
- Simulated scan fallback panel (lines 170-198)
|
|
||||||
- `selectedMockCard` state
|
|
||||||
|
|
||||||
**Add:**
|
|
||||||
- Import `BarcodeScanner`, `BarcodeFormat`, `LensFacing` from `@capacitor-mlkit/barcode-scanning`
|
|
||||||
- Import `Capacitor` from `@capacitor/core` (platform detection)
|
|
||||||
- Import `barcode-detector/polyfill` at top (web fallback)
|
|
||||||
|
|
||||||
**New scan flow:**
|
|
||||||
```
|
|
||||||
1. Component mounts → show "Start Scanning" button + manual CIP input
|
|
||||||
2. User taps "Start Scanning":
|
|
||||||
a. Check BarcodeScanner.isSupported() → error if not
|
|
||||||
b. Check/request camera permission via BarcodeScanner.checkPermissions() / requestPermissions()
|
|
||||||
c. Call BarcodeScanner.scan({ formats: [BarcodeFormat.Code128, BarcodeFormat.QrCode], autoZoom: true })
|
|
||||||
d. Extract barcodes[0].rawValue (NOTE: can be undefined per v8 breaking change — handle gracefully)
|
|
||||||
e. Validate CIP format: /^[A-Z0-9]{16}$/i
|
|
||||||
f. If valid → fetchPrescriptions(cip) → show prescriptions
|
|
||||||
g. If invalid → show error "Invalid card barcode. Try manual entry."
|
|
||||||
3. Manual CIP input:
|
|
||||||
- Text input field with placeholder "Enter CIP code manually"
|
|
||||||
- "Submit" button → validates format → fetchPrescriptions(cip)
|
|
||||||
4. PWA/browser fallback:
|
|
||||||
- Detect: !Capacitor.isNativePlatform()
|
|
||||||
- Show message: "Barcode scanning requires the mobile app. Enter your CIP code manually below."
|
|
||||||
- Show only the manual CIP input (no scan button)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Phases (simplified):**
|
|
||||||
- `idle` — initial state, scan button + manual input visible
|
|
||||||
- `scanning` — ML Kit native UI active (camera takes over)
|
|
||||||
- `prescriptions` — results display (keep existing prescription card UI)
|
|
||||||
- `error` — permission denied / unsupported / invalid barcode
|
|
||||||
|
|
||||||
**Keep unchanged:**
|
|
||||||
- `playBeep()` function
|
|
||||||
- `fetchPrescriptions(cip)` function
|
|
||||||
- `handlePickPrescription(rx)` function
|
|
||||||
- `handleBack()` function
|
|
||||||
- Prescription display UI (lines 201-249)
|
|
||||||
- `onSelectMedicine` callback prop
|
|
||||||
|
|
||||||
### B4. Rewrite `frontend/src/views/ScannerView.css`
|
|
||||||
|
|
||||||
**Remove:**
|
|
||||||
- `.scanner-viewport-wrap`, `.scanner-camera-container`, `.scanner-video`, `.scanner-frame`, `.scanner-laser`, `.scanner-hint` (old camera overlay)
|
|
||||||
- `.scanner-simulate-panel`, `.mock-cards-list`, `.mock-card-btn`, `.simulate-scan-btn`, `.simulate-label`, `.mock-card-icon`, `.mock-card-info` (mock card panel)
|
|
||||||
- `.scanner-placeholder` with spinner (old loading state)
|
|
||||||
|
|
||||||
**Add:**
|
|
||||||
- `.scan-start-btn` — large centered button with camera icon, teal background (`#0f766e`), full-width
|
|
||||||
- `.manual-cip-section` — input group with text field + submit button
|
|
||||||
- `.cip-input` — text input styled to match existing dark theme, monospace font
|
|
||||||
- `.cip-submit-btn` — teal button matching scan button style
|
|
||||||
- `.pwa-notice` — info banner for browser users
|
|
||||||
- `.scan-error-panel` — error state with icon and retry button
|
|
||||||
|
|
||||||
### B5. No changes to other files
|
|
||||||
|
|
||||||
- `HomeView.jsx` — "Scan TSI Card" button still navigates to ScannerView
|
|
||||||
- `PublicView.jsx` — screen routing and `onSelectMedicine` handoff unchanged
|
|
||||||
- `backend/server.js` — user handles `/api/tsi/:cip/prescriptions`
|
|
||||||
- `capacitor.config.json` — no scanner-specific config needed
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Files Modified (summary)
|
|
||||||
|
|
||||||
| File | Phase | Change |
|
|
||||||
|---|---|---|
|
|
||||||
| `package.json` | A1 | Bump all `@capacitor/*` to ^8.x |
|
|
||||||
| `frontend/package.json` | B1 | Add `@capacitor-mlkit/barcode-scanning@^8.1.0` + `barcode-detector` |
|
|
||||||
| `android/variables.gradle` | A2 | Update all 13 SDK/library versions |
|
|
||||||
| `ios/App/Podfile` | A3 | iOS deployment target 13.0 → 15.0 |
|
|
||||||
| `android/app/src/main/AndroidManifest.xml` | A4 | Add `density` to configChanges |
|
|
||||||
| `android/build.gradle` | A5 | AGP 8.2.1 → 8.13.0, Google Services 4.4.0 → 4.4.4 |
|
|
||||||
| `android/gradle/wrapper/gradle-wrapper.properties` | A5 | Gradle wrapper → 8.14.3 |
|
|
||||||
| `frontend/src/views/ScannerView.jsx` | B3 | Full rewrite — real barcode scanning + manual input |
|
|
||||||
| `frontend/src/views/ScannerView.css` | B4 | Remove old camera/mock styles, add new scan UI |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Known Issues
|
|
||||||
|
|
||||||
- **Android NullPointerException bug** (GitHub capawesome-team/capacitor-mlkit #160/#324) — affects `startScan()` in v8.0.1. Workaround: use `scan()` method (built-in native UI) instead of `startScan()` (custom WebView mode). Plan uses `scan()`, so this shouldn't hit us.
|
|
||||||
- **`rawValue` can be undefined** in v8.x — handle with null check before CIP validation.
|
|
||||||
- **Capacitor 8 requires Xcode 26+** — must have latest Xcode installed.
|
|
||||||
- **Gradle 8.14.3 requires JDK 21+** — confirm JDK 21 is available.
|
|
||||||
- **`@capacitor-mlkit/barcode-scanning` v6.x.x is deprecated** — this is why we upgrade to Capacitor 8 first (v8.x.x plugin requires Cap 8).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation Order
|
|
||||||
|
|
||||||
| Step | Phase | Estimated Time |
|
|
||||||
|---|---|---|
|
|
||||||
| A1-A6 | Capacitor upgrade | ~30 min |
|
|
||||||
| A7 | Verify build (Android + iOS) | ~30 min |
|
|
||||||
| B1 | Install barcode plugin | ~5 min |
|
|
||||||
| B3 | Rewrite ScannerView.jsx | ~2 hrs |
|
|
||||||
| B4 | Update ScannerView.css | ~30 min |
|
|
||||||
| B5 | Test on Android device | ~30 min |
|
|
||||||
| B5 | Test on iOS device | ~30 min |
|
|
||||||
|
|
||||||
Total: ~4-5 hours
|
|
||||||
@@ -1,79 +1,161 @@
|
|||||||
# 💊 FarmaFinder
|
# FarmaFinder
|
||||||
|
|
||||||
A web application to search for medicines from the official Spanish CIMA database and find which pharmacies sell them.
|
A web application to search for medicines from the official Spanish CIMA database and find which pharmacies sell them.
|
||||||
|
|
||||||
## ✨ Features
|
## Features
|
||||||
|
|
||||||
### Web App (Desktop/PWA)
|
### Web App (Desktop/PWA)
|
||||||
- 🔍 **Real-time medicine search** from CIMA API (Agencia Española de Medicamentos)
|
- Real-time medicine search from CIMA API (Agencia Espanola de Medicamentos)
|
||||||
- 💾 **Redis caching** for improved performance
|
- Redis caching for improved performance
|
||||||
- 📍 View pharmacies that sell a specific medicine
|
- View pharmacies that sell a specific medicine
|
||||||
- 💰 See prices and stock availability
|
- See prices and stock availability
|
||||||
- 📱 Responsive design for mobile and desktop
|
- Responsive design for mobile and desktop
|
||||||
- ⚙️ **Admin Panel** - Manage pharmacies and link medicines
|
- Admin Panel - Manage pharmacies and link medicines
|
||||||
- 🔐 **Secure authentication** - Login required to access admin features
|
- Secure authentication - Login required to access admin features
|
||||||
- Add, edit, and delete pharmacies
|
- Add, edit, and delete pharmacies
|
||||||
- Search medicines from CIMA database
|
- Search medicines from CIMA database
|
||||||
- Link medicines to pharmacies with prices and stock
|
- Link medicines to pharmacies with prices and stock
|
||||||
|
|
||||||
### Mobile App (React Native)
|
### Mobile App (React Native)
|
||||||
- 📱 **Native iOS/Android** experience with Expo
|
- Native iOS/Android experience with Expo
|
||||||
- 🔍 **Medicine search** with real-time results
|
- Medicine search with real-time results
|
||||||
- 🗺️ **Interactive map** with pharmacy markers
|
- Interactive map with pharmacy markers
|
||||||
- 📷 **Barcode scanner** for quick medicine lookup
|
- Barcode scanner for quick medicine lookup
|
||||||
- 🔔 **Push notifications** for availability alerts
|
- Push notifications for availability alerts
|
||||||
- 🔐 **Biometric authentication** (Face ID / Touch ID)
|
- Biometric authentication (Face ID / Touch ID)
|
||||||
- 💾 **Offline cache** for favorite medicines
|
- Offline cache for favorite medicines
|
||||||
|
|
||||||
## 🛠️ Tech Stack
|
## Tech Stack
|
||||||
|
|
||||||
### Backend
|
| App | Stack |
|
||||||
- **Runtime**: Node.js + Express
|
|-----|-------|
|
||||||
- **Database**: SQLite (for pharmacies and relationships)
|
| Backend | Node.js + Express, SQLite, Redis |
|
||||||
- **Cache**: Redis
|
| Frontend (Web) | React + Vite, Capacitor |
|
||||||
- **External API**: CIMA (Centro de Información online de Medicamentos de la AEMPS)
|
| Frontend (Mobile) | Expo SDK 57 + React Native, Zustand, Axios + TanStack Query |
|
||||||
|
| Build system | Turborepo |
|
||||||
|
| Package manager | npm workspaces |
|
||||||
|
|
||||||
### Frontend (Web/PWA)
|
## Prerequisites
|
||||||
- **Framework**: React + Vite
|
|
||||||
- **Mobile wrapper**: Capacitor (for hybrid mobile builds)
|
|
||||||
|
|
||||||
### Frontend (Mobile - React Native)
|
- Node.js v20+
|
||||||
- **Framework**: Expo SDK 57 + React Native
|
- npm v9+
|
||||||
- **Navigation**: Expo Router v4
|
- Redis server v6.0+ (or use Docker)
|
||||||
- **State**: Zustand
|
- Docker + Docker Compose v2 (optional, for containerized deployment)
|
||||||
- **HTTP**: Axios + TanStack Query
|
|
||||||
- **Maps**: react-native-maps
|
|
||||||
- **Camera**: expo-camera (barcode scanning)
|
|
||||||
- **Auth**: expo-local-authentication (biometrics)
|
|
||||||
- **Notifications**: expo-notifications
|
|
||||||
- **Build**: EAS Build
|
|
||||||
|
|
||||||
## 📋 Prerequisites
|
## Project Structure
|
||||||
|
|
||||||
- Node.js (v18 or higher)
|
This is a **Turborepo monorepo**. All applications live under `apps/`:
|
||||||
- npm or yarn
|
|
||||||
- **Redis server** (v6.0 or higher)
|
|
||||||
|
|
||||||
## 🐳 Docker Setup (Recommended)
|
```
|
||||||
|
FarmaFinder/
|
||||||
|
├── package.json # Root: workspaces + turbo scripts
|
||||||
|
├── turbo.json # Turborepo task configuration
|
||||||
|
├── docker-compose.yml # Full stack: backend + frontend + Redis + Postgres
|
||||||
|
│
|
||||||
|
├── apps/
|
||||||
|
│ ├── backend/ # Node.js + Express API
|
||||||
|
│ │ ├── Dockerfile
|
||||||
|
│ │ ├── server.js # Express server and API routes
|
||||||
|
│ │ ├── cima-service.js # CIMA API integration with Redis cache
|
||||||
|
│ │ ├── redis-client.js # Redis connection configuration
|
||||||
|
│ │ ├── seed.js # Database seeding script
|
||||||
|
│ │ ├── create-admin.js # Admin user creation script
|
||||||
|
│ │ └── package.json
|
||||||
|
│ │
|
||||||
|
│ ├── frontend/ # React + Vite (Desktop/PWA)
|
||||||
|
│ │ ├── Dockerfile
|
||||||
|
│ │ ├── nginx.conf # Nginx config for Docker
|
||||||
|
│ │ ├── src/
|
||||||
|
│ │ │ ├── components/ # React components
|
||||||
|
│ │ │ ├── views/ # View components (Public/Admin)
|
||||||
|
│ │ │ ├── App.jsx
|
||||||
|
│ │ │ └── main.jsx
|
||||||
|
│ │ └── package.json
|
||||||
|
│ │
|
||||||
|
│ ├── frontend-mobile/ # Expo + React Native (iOS/Android)
|
||||||
|
│ │ ├── app/ # Expo Router screens
|
||||||
|
│ │ ├── components/
|
||||||
|
│ │ ├── services/
|
||||||
|
│ │ ├── store/
|
||||||
|
│ │ └── package.json
|
||||||
|
│ │
|
||||||
|
│ ├── scraper/ # Puppeteer scraper (standalone)
|
||||||
|
│ │ └── package.json
|
||||||
|
│ │
|
||||||
|
│ └── pip-platform/ # Python FastAPI platform (separate docker-compose)
|
||||||
|
│ ├── Dockerfile
|
||||||
|
│ ├── docker-compose.yml
|
||||||
|
│ └── pyproject.toml
|
||||||
|
│
|
||||||
|
├── API/ # Shared API source files
|
||||||
|
├── scripts/ # Build/utility scripts
|
||||||
|
└── docs/ # Documentation
|
||||||
|
```
|
||||||
|
|
||||||
Runs the full stack (backend, frontend, Redis) with a single command.
|
## Quick Start
|
||||||
|
|
||||||
**Prerequisites**: Docker and Docker Compose v2.
|
### Install dependencies
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Copy and configure environment (optional — defaults work for local dev)
|
npm install
|
||||||
cp backend/.env.example backend/.env
|
```
|
||||||
# Edit backend/.env to set SESSION_SECRET and any other vars
|
|
||||||
|
This installs all workspace dependencies (backend, frontend, mobile, scraper) via npm workspaces.
|
||||||
|
|
||||||
|
### Development
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Start everything (backend + frontend)
|
||||||
|
npm run dev
|
||||||
|
|
||||||
|
# Start only backend
|
||||||
|
npm run dev:backend
|
||||||
|
|
||||||
|
# Start only frontend
|
||||||
|
npm run dev:frontend
|
||||||
|
|
||||||
|
# Start mobile app
|
||||||
|
npx turbo run dev --filter=frontend-mobile
|
||||||
|
```
|
||||||
|
|
||||||
|
### Build
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build all apps
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
# Build only frontend
|
||||||
|
npm run build:web
|
||||||
|
```
|
||||||
|
|
||||||
|
### Test
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Run all tests
|
||||||
|
npm test
|
||||||
|
|
||||||
|
# Test specific app
|
||||||
|
npm test --workspace=farma-clic-backend
|
||||||
|
npm test --workspace=farma-clic-frontend
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Setup
|
||||||
|
|
||||||
|
Runs the full stack (backend, frontend, Redis, Postgres) with a single command.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Copy and configure environment (optional - defaults work for local dev)
|
||||||
|
cp apps/backend/.env.example apps/backend/.env
|
||||||
|
|
||||||
docker compose up --build
|
docker compose up --build
|
||||||
```
|
```
|
||||||
|
|
||||||
App available at `http://localhost:3000`.
|
App available at `http://localhost:4000` (frontend) and `http://localhost:3001` (backend API).
|
||||||
|
|
||||||
**First run — create an admin user:**
|
**First run - create an admin user:**
|
||||||
```bash
|
```bash
|
||||||
docker compose exec backend node create-admin.js
|
docker compose exec backend node create-admin.js
|
||||||
# Default: admin / admin123 — change after first login
|
# Default: admin / admin123 - change after first login
|
||||||
```
|
```
|
||||||
|
|
||||||
**Seed sample pharmacies:**
|
**Seed sample pharmacies:**
|
||||||
@@ -86,62 +168,37 @@ docker compose exec backend node seed.js
|
|||||||
docker compose down
|
docker compose down
|
||||||
```
|
```
|
||||||
|
|
||||||
Database is persisted in a named Docker volume (`backend_data`). To wipe it:
|
Database is persisted in named Docker volumes (`backend_data`, `postgres_data`). To wipe:
|
||||||
```bash
|
```bash
|
||||||
docker compose down -v
|
docker compose down -v
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
## Manual Setup
|
||||||
|
|
||||||
## 🚀 Manual Setup Instructions
|
|
||||||
|
|
||||||
### 1. Install Redis
|
### 1. Install Redis
|
||||||
|
|
||||||
**On Ubuntu/Debian:**
|
**Ubuntu/Debian:**
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install redis-server
|
sudo apt-get install redis-server
|
||||||
sudo systemctl start redis-server
|
sudo systemctl start redis-server
|
||||||
sudo systemctl enable redis-server
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**On macOS (using Homebrew):**
|
**macOS:**
|
||||||
```bash
|
```bash
|
||||||
brew install redis
|
brew install redis
|
||||||
brew services start redis
|
brew services start redis
|
||||||
```
|
```
|
||||||
|
|
||||||
**On Windows:**
|
**Docker:**
|
||||||
Download and install from: https://redis.io/download
|
|
||||||
|
|
||||||
**Using Docker:**
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 6379:6379 redis:alpine
|
docker run -d -p 6379:6379 redis:alpine
|
||||||
```
|
```
|
||||||
|
|
||||||
Verify Redis is running:
|
Verify: `redis-cli ping` should respond `PONG`.
|
||||||
```bash
|
|
||||||
redis-cli ping
|
|
||||||
# Should respond with: PONG
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Install Application Dependencies
|
### 2. Configure Environment (Optional)
|
||||||
|
|
||||||
**Install backend dependencies:**
|
Create `apps/backend/.env`:
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
|
|
||||||
**Install frontend dependencies:**
|
|
||||||
```bash
|
|
||||||
cd ../frontend
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Configure Environment (Optional)
|
|
||||||
|
|
||||||
Create a `.env` file in the `backend` directory if you need custom Redis settings:
|
|
||||||
|
|
||||||
```env
|
```env
|
||||||
REDIS_HOST=localhost
|
REDIS_HOST=localhost
|
||||||
@@ -150,246 +207,79 @@ REDIS_PASSWORD=
|
|||||||
SESSION_SECRET=your-secret-key-here
|
SESSION_SECRET=your-secret-key-here
|
||||||
```
|
```
|
||||||
|
|
||||||
### 4. Initialize Database
|
### 3. Initialize Database
|
||||||
|
|
||||||
**Seed the database with sample pharmacies:**
|
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
# Seed sample pharmacies
|
||||||
npm run seed
|
npm run dev --workspace=farma-clic-backend -- run seed
|
||||||
|
|
||||||
|
# Create admin user (default: admin / admin123)
|
||||||
|
npm run dev --workspace=farma-clic-backend -- run create-admin
|
||||||
```
|
```
|
||||||
|
|
||||||
**Create admin user:**
|
### 4. Run
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run create-admin
|
|
||||||
```
|
|
||||||
This creates a default admin user with:
|
|
||||||
- Username: `admin`
|
|
||||||
- Password: `admin123`
|
|
||||||
|
|
||||||
⚠️ **Important**: Change the default password after first login!
|
|
||||||
|
|
||||||
You can customize credentials using environment variables:
|
|
||||||
```bash
|
|
||||||
ADMIN_USERNAME=myadmin ADMIN_PASSWORD=mypassword npm run create-admin
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Running the Application
|
|
||||||
|
|
||||||
**Start Redis** (if not running):
|
|
||||||
```bash
|
|
||||||
redis-server
|
|
||||||
```
|
|
||||||
|
|
||||||
**Start the backend server:**
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
npm start
|
|
||||||
```
|
|
||||||
The backend will run on `http://localhost:3001`
|
|
||||||
|
|
||||||
**Start the frontend development server:**
|
|
||||||
```bash
|
|
||||||
cd frontend
|
|
||||||
npm run dev
|
npm run dev
|
||||||
```
|
```
|
||||||
The frontend will run on `http://localhost:3000`
|
|
||||||
|
|
||||||
**Open your browser** and navigate to `http://localhost:3000`
|
## API Endpoints
|
||||||
|
|
||||||
## 🎯 How to Use
|
### Public
|
||||||
|
- `GET /api/medicines/search?q=<query>` - Search medicines (CIMA API, cached in Redis)
|
||||||
|
- `GET /api/medicines/:nregistro` - Medicine details
|
||||||
|
- `GET /api/medicines/:nregistro/pharmacies` - Pharmacies selling a medicine
|
||||||
|
- `GET /api/pharmacies` - All pharmacies
|
||||||
|
|
||||||
### Public Search
|
### Auth
|
||||||
1. Type the name of a medicine in the search bar
|
- `POST /api/auth/login` - Login
|
||||||
2. The app will search the CIMA database in real-time
|
|
||||||
3. Click on a medicine to see which pharmacies have it
|
|
||||||
4. View prices and stock availability
|
|
||||||
|
|
||||||
### Admin Panel
|
|
||||||
1. Click the "⚙️ Admin Panel" button
|
|
||||||
2. Login with your credentials (default: `admin` / `admin123`)
|
|
||||||
3. **Pharmacies Tab**: Add, edit, or delete pharmacies
|
|
||||||
4. **Medicines Tab**: Search medicines from the CIMA database
|
|
||||||
5. **Link Medicine Tab**: Associate medicines with pharmacies and set prices/stock
|
|
||||||
|
|
||||||
## 📁 Project Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
FarmaFinder/
|
|
||||||
├── docker-compose.yml # Full stack: backend + frontend + Redis
|
|
||||||
├── backend/
|
|
||||||
│ ├── Dockerfile
|
|
||||||
│ ├── server.js # Express server and API routes
|
|
||||||
│ ├── cima-service.js # CIMA API integration with Redis cache
|
|
||||||
│ ├── redis-client.js # Redis connection configuration
|
|
||||||
│ ├── seed.js # Database seeding script
|
|
||||||
│ ├── create-admin.js # Admin user creation script
|
|
||||||
│ ├── .env.example # Environment variable template
|
|
||||||
│ └── package.json
|
|
||||||
├── frontend/ # React + Vite (Desktop/PWA)
|
|
||||||
│ ├── Dockerfile
|
|
||||||
│ ├── nginx.conf # Nginx config (Docker): serves SPA + proxies /api
|
|
||||||
│ ├── src/
|
|
||||||
│ │ ├── components/ # React components
|
|
||||||
│ │ │ ├── admin/ # Admin panel components
|
|
||||||
│ │ │ ├── PharmacyMap.jsx # Leaflet map (OpenStreetMap)
|
|
||||||
│ │ │ └── ...
|
|
||||||
│ │ ├── views/ # View components (Public/Admin)
|
|
||||||
│ │ ├── App.jsx # Main app component
|
|
||||||
│ │ └── main.jsx # Entry point
|
|
||||||
│ ├── index.html
|
|
||||||
│ └── package.json
|
|
||||||
├── frontend-mobile/ # Expo + React Native (iOS/Android)
|
|
||||||
│ ├── app/
|
|
||||||
│ │ ├── _layout.tsx # Root layout with providers
|
|
||||||
│ │ ├── (tabs)/ # Bottom tab navigation
|
|
||||||
│ │ │ ├── index.tsx # Home (medicine search)
|
|
||||||
│ │ │ ├── map.tsx # Pharmacy map
|
|
||||||
│ │ │ └── profile.tsx # User profile
|
|
||||||
│ │ ├── medicine/[id].tsx # Medicine detail
|
|
||||||
│ │ ├── pharmacy/[id].tsx # Pharmacy detail
|
|
||||||
│ │ ├── auth/ # Login/Register screens
|
|
||||||
│ │ └── scanner.tsx # Barcode scanner
|
|
||||||
│ ├── components/ # Reusable UI components
|
|
||||||
│ ├── services/ # API and business logic
|
|
||||||
│ ├── store/ # Zustand state management
|
|
||||||
│ ├── hooks/ # Custom React hooks
|
|
||||||
│ ├── constants/ # Theme and config
|
|
||||||
│ ├── types/ # TypeScript types
|
|
||||||
│ ├── eas.json # EAS Build configuration
|
|
||||||
│ └── package.json
|
|
||||||
├── android/ # Capacitor Android project
|
|
||||||
├── ios/ # Capacitor iOS project
|
|
||||||
└── README.md
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔌 API Endpoints
|
|
||||||
|
|
||||||
### Public API
|
|
||||||
- `GET /api/medicines/search?q=<query>` - Search medicines from CIMA API (cached in Redis)
|
|
||||||
- `GET /api/medicines/:nregistro` - Get medicine details from CIMA
|
|
||||||
- `GET /api/medicines/:nregistro/pharmacies` - Get pharmacies selling a medicine
|
|
||||||
- `GET /api/pharmacies` - Get all pharmacies
|
|
||||||
|
|
||||||
### Authentication API
|
|
||||||
- `POST /api/auth/login` - Login (requires username and password)
|
|
||||||
- `POST /api/auth/logout` - Logout
|
- `POST /api/auth/logout` - Logout
|
||||||
- `GET /api/auth/check` - Check authentication status
|
- `GET /api/auth/check` - Check auth status
|
||||||
|
|
||||||
### Admin API (All require authentication)
|
### Admin (requires authentication)
|
||||||
- `POST /api/admin/pharmacies` - Add a new pharmacy
|
- `POST /api/admin/pharmacies` - Add pharmacy
|
||||||
- `PUT /api/admin/pharmacies/:id` - Update a pharmacy
|
- `PUT /api/admin/pharmacies/:id` - Update pharmacy
|
||||||
- `DELETE /api/admin/pharmacies/:id` - Delete a pharmacy
|
- `DELETE /api/admin/pharmacies/:id` - Delete pharmacy
|
||||||
- `GET /api/admin/medicines?q=<query>` - Search medicines from CIMA (for admin)
|
- `GET /api/admin/medicines?q=<query>` - Search medicines
|
||||||
- `GET /api/admin/pharmacies/:id/medicines` - Get medicines linked to a pharmacy
|
- `GET /api/admin/pharmacies/:id/medicines` - Linked medicines
|
||||||
- `POST /api/admin/pharmacy-medicines` - Link medicine to pharmacy
|
- `POST /api/admin/pharmacy-medicines` - Link medicine to pharmacy
|
||||||
- `PUT /api/admin/pharmacy-medicines/:id` - Update price/stock
|
- `PUT /api/admin/pharmacy-medicines/:id` - Update price/stock
|
||||||
- `DELETE /api/admin/pharmacy-medicines/:id` - Remove medicine from pharmacy
|
- `DELETE /api/admin/pharmacy-medicines/:id` - Remove link
|
||||||
|
|
||||||
## 💾 Database Schema
|
## Database Schema
|
||||||
|
|
||||||
### SQLite Tables
|
### SQLite Tables
|
||||||
|
|
||||||
**pharmacies**
|
**pharmacies**: `id`, `name`, `address`, `phone`, `latitude`, `longitude`
|
||||||
- `id`: Integer (Primary Key)
|
|
||||||
- `name`: Text (Pharmacy name)
|
|
||||||
- `address`: Text (Full address)
|
|
||||||
- `phone`: Text (Contact phone)
|
|
||||||
- `latitude`: Real (GPS coordinate)
|
|
||||||
- `longitude`: Real (GPS coordinate)
|
|
||||||
|
|
||||||
**pharmacy_medicines**
|
**pharmacy_medicines**: `id`, `pharmacy_id`, `medicine_nregistro`, `medicine_name`, `price`, `stock`
|
||||||
- `id`: Integer (Primary Key)
|
|
||||||
- `pharmacy_id`: Integer (Foreign Key → pharmacies.id)
|
|
||||||
- `medicine_nregistro`: Text (CIMA medicine registration number)
|
|
||||||
- `medicine_name`: Text (Cached medicine name)
|
|
||||||
- `price`: Real (Price in EUR)
|
|
||||||
- `stock`: Integer (Available units)
|
|
||||||
|
|
||||||
**users**
|
**users**: `id`, `username`, `password_hash`, `created_at`
|
||||||
- `id`: Integer (Primary Key)
|
|
||||||
- `username`: Text (Unique)
|
|
||||||
- `password_hash`: Text (Bcrypt hashed)
|
|
||||||
- `created_at`: DateTime
|
|
||||||
|
|
||||||
### Redis Cache Structure
|
### Redis Cache
|
||||||
|
|
||||||
- `medicines:search:{query}` - Search results (TTL: 1 hour)
|
- `medicines:search:{query}` - Search results (TTL: 1h)
|
||||||
- `medicine:{nregistro}` - Medicine details (TTL: 24 hours)
|
- `medicine:{nregistro}` - Medicine details (TTL: 24h)
|
||||||
|
|
||||||
## 🔧 Architecture Changes
|
## Mobile App Setup
|
||||||
|
|
||||||
### Migration from Local Database to CIMA API
|
|
||||||
|
|
||||||
The application now uses the **CIMA (Centro de Información online de Medicamentos)** API as the source of truth for medicine data, with Redis caching for performance:
|
|
||||||
|
|
||||||
**Benefits:**
|
|
||||||
- ✅ Always up-to-date medicine information
|
|
||||||
- ✅ Official data from Spanish health authorities
|
|
||||||
- ✅ Reduced database maintenance
|
|
||||||
- ✅ Fast responses thanks to Redis cache
|
|
||||||
- ✅ Fallback to stale cache if API is down
|
|
||||||
|
|
||||||
**Changes:**
|
|
||||||
- Medicines are no longer stored locally in SQLite
|
|
||||||
- Medicine searches query the CIMA API
|
|
||||||
- Results are cached in Redis for performance
|
|
||||||
- `pharmacy_medicines` now uses `medicine_nregistro` (CIMA registration number) instead of local `medicine_id`
|
|
||||||
|
|
||||||
## 📱 Mobile App Setup (React Native)
|
|
||||||
|
|
||||||
### Prerequisites
|
### Prerequisites
|
||||||
|
|
||||||
- Node.js (v18 or higher)
|
- Node.js v20+
|
||||||
- npm or yarn
|
- Expo CLI: `npm install -g expo-cli`
|
||||||
- **Expo CLI**: `npm install -g expo-cli`
|
- EAS CLI: `npm install -g eas-cli`
|
||||||
- **EAS CLI**: `npm install -g eas-cli`
|
- iOS: Xcode + CocoaPods (Mac only)
|
||||||
- **iOS**: Xcode (Mac only) + CocoaPods
|
- Android: Android Studio + SDK
|
||||||
- **Android**: Android Studio + Android SDK
|
|
||||||
|
|
||||||
### Quick Start
|
### Development
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Install all dependencies (backend + web + mobile)
|
# Install dependencies (already done via npm install at root)
|
||||||
npm run install:all
|
|
||||||
|
|
||||||
# Start mobile development server
|
# Start mobile dev server
|
||||||
npm run dev:mobile
|
npx turbo run dev --filter=frontend-mobile
|
||||||
|
|
||||||
# Scan QR code with Expo Go app (iOS/Android)
|
# Scan QR code with Expo Go app
|
||||||
```
|
|
||||||
|
|
||||||
### Development Build
|
|
||||||
|
|
||||||
For native features (camera, biometrics, notifications), use a development build:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Install EAS CLI
|
|
||||||
npm install -g eas-cli
|
|
||||||
|
|
||||||
# Login to Expo
|
|
||||||
eas login
|
|
||||||
|
|
||||||
# Create development build
|
|
||||||
eas build --profile development --platform ios
|
|
||||||
eas build --profile development --platform android
|
|
||||||
```
|
|
||||||
|
|
||||||
### Project Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
frontend-mobile/
|
|
||||||
├── app/ # Expo Router screens
|
|
||||||
│ ├── (tabs)/ # Bottom tab navigation
|
|
||||||
│ ├── auth/ # Login/Register
|
|
||||||
│ ├── medicine/ # Medicine detail
|
|
||||||
│ ├── pharmacy/ # Pharmacy detail
|
|
||||||
│ └── scanner.tsx # Barcode scanner
|
|
||||||
├── components/ # Reusable UI components
|
|
||||||
├── services/ # API and business logic
|
|
||||||
├── store/ # Zustand state management
|
|
||||||
├── hooks/ # Custom React hooks
|
|
||||||
├── constants/ # Theme and config
|
|
||||||
└── types/ # TypeScript types
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Native Features
|
### Native Features
|
||||||
@@ -402,217 +292,72 @@ frontend-mobile/
|
|||||||
| Maps | `react-native-maps` |
|
| Maps | `react-native-maps` |
|
||||||
| Secure Storage | `expo-secure-store` |
|
| Secure Storage | `expo-secure-store` |
|
||||||
|
|
||||||
### EAS Build Profiles
|
### EAS Build
|
||||||
|
|
||||||
| Profile | Platform | Build Type | Use Case |
|
|
||||||
|---------|----------|------------|----------|
|
|
||||||
| `development` | iOS | Simulator | Local testing on Mac |
|
|
||||||
| `development` | Android | APK | Local testing on device |
|
|
||||||
| `preview` | Android | APK | Internal testing & sharing |
|
|
||||||
| `production` | Android | AAB | Google Play Store submission |
|
|
||||||
|
|
||||||
**Note:** iOS builds require Apple Developer account ($99/year) and are configured separately.
|
|
||||||
|
|
||||||
### Environment Configuration
|
|
||||||
|
|
||||||
The mobile app uses the same backend API as the web app. Configure the API URL in:
|
|
||||||
|
|
||||||
```typescript
|
|
||||||
// frontend-mobile/constants/config.ts
|
|
||||||
const ENV = {
|
|
||||||
development: {
|
|
||||||
API_BASE_URL: 'http://localhost:3001/api',
|
|
||||||
},
|
|
||||||
production: {
|
|
||||||
API_BASE_URL: 'https://your-production-api.com/api',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🚀 Production Deployment (Mobile)
|
|
||||||
|
|
||||||
### Distribution Flow
|
|
||||||
|
|
||||||
```
|
|
||||||
Development → EAS Build → App Store / Google Play → User Device
|
|
||||||
```
|
|
||||||
|
|
||||||
The mobile app is a **native application** that runs directly on the device. No Docker or server needed - users download it from the app stores.
|
|
||||||
|
|
||||||
### Step 1: Setup Expo Account
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Install EAS CLI
|
cd apps/frontend-mobile
|
||||||
npm install -g eas-cli
|
|
||||||
|
|
||||||
# Create account at https://expo.dev
|
# Development build
|
||||||
|
eas build --profile development --platform ios
|
||||||
|
eas build --profile development --platform android
|
||||||
|
|
||||||
# Login
|
# Production build
|
||||||
eas login
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 2: Initialize EAS Project
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd frontend-mobile
|
|
||||||
eas init
|
|
||||||
```
|
|
||||||
|
|
||||||
This generates a `projectId` - add it to `app.json`:
|
|
||||||
```json
|
|
||||||
"extra": {
|
|
||||||
"eas": {
|
|
||||||
"projectId": "your-project-id"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 3: Configure Credentials
|
|
||||||
|
|
||||||
**Android (Google Play):**
|
|
||||||
1. Create developer account ($25 one-time fee)
|
|
||||||
2. Create project in Google Cloud Console
|
|
||||||
3. Enable Play Developer API
|
|
||||||
4. Download `google-service-account.json`
|
|
||||||
5. Place in `frontend-mobile/` directory
|
|
||||||
|
|
||||||
**iOS (App Store):**
|
|
||||||
1. Join Apple Developer Program ($99/year)
|
|
||||||
2. Create App ID in Apple Developer portal
|
|
||||||
3. Generate certificates and provisioning profiles
|
|
||||||
4. Update `eas.json` with your credentials
|
|
||||||
|
|
||||||
### Step 4: Build for Production
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Android (Google Play)
|
|
||||||
eas build --profile production --platform android
|
eas build --profile production --platform android
|
||||||
|
|
||||||
# iOS (App Store)
|
|
||||||
eas build --profile production --platform ios
|
eas build --profile production --platform ios
|
||||||
```
|
|
||||||
|
|
||||||
### Step 5: Submit to Stores
|
# Submit to stores
|
||||||
|
|
||||||
```bash
|
|
||||||
# Submit to Google Play
|
|
||||||
eas submit --profile production --platform android
|
eas submit --profile production --platform android
|
||||||
|
|
||||||
# Submit to App Store
|
|
||||||
eas submit --profile production --platform ios
|
eas submit --profile production --platform ios
|
||||||
```
|
```
|
||||||
|
|
||||||
### OTA Updates (Without App Store Review)
|
### Environment Configuration
|
||||||
|
|
||||||
Push updates directly to users without going through store review:
|
```typescript
|
||||||
|
// apps/frontend-mobile/constants/config.ts
|
||||||
```bash
|
const ENV = {
|
||||||
# Install expo-updates
|
development: { API_BASE_URL: 'http://localhost:3001/api' },
|
||||||
npx expo install expo-updates
|
production: { API_BASE_URL: 'https://your-production-api.com/api' },
|
||||||
|
};
|
||||||
# Send update
|
|
||||||
eas update --branch production --message "Fix: improved search"
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Useful Commands
|
## Troubleshooting
|
||||||
|
|
||||||
| Command | Description |
|
|
||||||
|---------|-------------|
|
|
||||||
| `eas build:list` | View previous builds |
|
|
||||||
| `eas build:cancel <id>` | Cancel a build |
|
|
||||||
| `eas submit:list` | View previous submissions |
|
|
||||||
| `eas update` | Send OTA update |
|
|
||||||
|
|
||||||
## 🐛 Troubleshooting
|
|
||||||
|
|
||||||
### Redis Connection Issues
|
### Redis Connection Issues
|
||||||
|
|
||||||
If you see "Redis Client Error":
|
|
||||||
```bash
|
```bash
|
||||||
# Check if Redis is running
|
redis-cli ping # Should respond: PONG
|
||||||
redis-cli ping
|
redis-server # Start if not running
|
||||||
|
redis-cli FLUSHALL # Clear cache
|
||||||
# Start Redis if needed
|
|
||||||
redis-server
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### CIMA API Timeout
|
### CIMA API Timeout
|
||||||
|
- Check internet connection
|
||||||
|
- CIMA API may be temporarily unavailable
|
||||||
|
- App falls back to cached data
|
||||||
|
|
||||||
If medicine searches are slow or failing:
|
### Database Reset
|
||||||
- Check your internet connection
|
|
||||||
- The CIMA API may be temporarily unavailable
|
|
||||||
- The app will use cached data if available
|
|
||||||
|
|
||||||
### Database Issues
|
|
||||||
|
|
||||||
Reset the database:
|
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
cd apps/backend
|
||||||
rm database.sqlite
|
rm database.sqlite
|
||||||
npm run seed
|
npm run seed
|
||||||
npm run create-admin
|
npm run create-admin
|
||||||
```
|
```
|
||||||
|
|
||||||
## 📝 Development
|
### Turborepo Cache Issues
|
||||||
|
|
||||||
### Backend
|
|
||||||
|
|
||||||
**Start with auto-reload:**
|
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
npx turbo clean # Clear Turbo cache
|
||||||
npm run dev
|
rm -rf node_modules # Full reset
|
||||||
|
npm install
|
||||||
```
|
```
|
||||||
|
|
||||||
### Frontend (Web/PWA)
|
## External Resources
|
||||||
|
|
||||||
**Start development server:**
|
- [CIMA API](https://cima.aemps.es/)
|
||||||
```bash
|
- [Turborepo](https://turbo.build/repo)
|
||||||
cd frontend
|
- [Redis](https://redis.io/documentation)
|
||||||
npm run dev
|
- [React](https://react.dev)
|
||||||
```
|
- [Express](https://expressjs.com)
|
||||||
|
- [Expo](https://docs.expo.dev)
|
||||||
|
|
||||||
### Frontend (Mobile - React Native)
|
## License
|
||||||
|
|
||||||
**Install all dependencies:**
|
|
||||||
```bash
|
|
||||||
npm run install:all
|
|
||||||
```
|
|
||||||
|
|
||||||
**Start Expo dev server:**
|
|
||||||
```bash
|
|
||||||
npm run dev:mobile
|
|
||||||
```
|
|
||||||
|
|
||||||
**Start for specific platform:**
|
|
||||||
```bash
|
|
||||||
npm run dev:mobile:android # Android emulator
|
|
||||||
npm run dev:mobile:ios # iOS simulator
|
|
||||||
```
|
|
||||||
|
|
||||||
**Build with EAS:**
|
|
||||||
```bash
|
|
||||||
npm run build:mobile # Production build
|
|
||||||
```
|
|
||||||
|
|
||||||
**Submit to stores:**
|
|
||||||
```bash
|
|
||||||
npm run submit:android # Google Play
|
|
||||||
npm run submit:ios # App Store
|
|
||||||
```
|
|
||||||
|
|
||||||
### Clear Redis cache
|
|
||||||
```bash
|
|
||||||
redis-cli FLUSHALL
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🌐 External Resources
|
|
||||||
|
|
||||||
- **CIMA API**: https://cima.aemps.es/
|
|
||||||
- **Redis Documentation**: https://redis.io/documentation
|
|
||||||
- **React Documentation**: https://react.dev
|
|
||||||
- **Express Documentation**: https://expressjs.com
|
|
||||||
|
|
||||||
## 📄 License
|
|
||||||
|
|
||||||
ISC
|
ISC
|
||||||
|
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
|
|
||||||
|
|
||||||
# Built application files
|
|
||||||
*.apk
|
|
||||||
*.aar
|
|
||||||
*.ap_
|
|
||||||
*.aab
|
|
||||||
|
|
||||||
# Files for the ART/Dalvik VM
|
|
||||||
*.dex
|
|
||||||
|
|
||||||
# Java class files
|
|
||||||
*.class
|
|
||||||
|
|
||||||
# Generated files
|
|
||||||
bin/
|
|
||||||
gen/
|
|
||||||
out/
|
|
||||||
# Uncomment the following line in case you need and you don't have the release build type files in your app
|
|
||||||
# release/
|
|
||||||
|
|
||||||
# Gradle files
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
|
|
||||||
# Local configuration file (sdk path, etc)
|
|
||||||
local.properties
|
|
||||||
|
|
||||||
# Proguard folder generated by Eclipse
|
|
||||||
proguard/
|
|
||||||
|
|
||||||
# Log Files
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Android Studio Navigation editor temp files
|
|
||||||
.navigation/
|
|
||||||
|
|
||||||
# Android Studio captures folder
|
|
||||||
captures/
|
|
||||||
|
|
||||||
# IntelliJ
|
|
||||||
*.iml
|
|
||||||
.idea/workspace.xml
|
|
||||||
.idea/tasks.xml
|
|
||||||
.idea/gradle.xml
|
|
||||||
.idea/assetWizardSettings.xml
|
|
||||||
.idea/dictionaries
|
|
||||||
.idea/libraries
|
|
||||||
# Android Studio 3 in .gitignore file.
|
|
||||||
.idea/caches
|
|
||||||
.idea/modules.xml
|
|
||||||
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
|
|
||||||
.idea/navEditor.xml
|
|
||||||
|
|
||||||
# Keystore files
|
|
||||||
# Uncomment the following lines if you do not want to check your keystore files in.
|
|
||||||
#*.jks
|
|
||||||
#*.keystore
|
|
||||||
|
|
||||||
# External native build folder generated in Android Studio 2.2 and later
|
|
||||||
.externalNativeBuild
|
|
||||||
.cxx/
|
|
||||||
|
|
||||||
# Google Services (e.g. APIs or Firebase)
|
|
||||||
# google-services.json
|
|
||||||
|
|
||||||
# Freeline
|
|
||||||
freeline.py
|
|
||||||
freeline/
|
|
||||||
freeline_project_description.json
|
|
||||||
|
|
||||||
# fastlane
|
|
||||||
fastlane/report.xml
|
|
||||||
fastlane/Preview.html
|
|
||||||
fastlane/screenshots
|
|
||||||
fastlane/test_output
|
|
||||||
fastlane/readme.md
|
|
||||||
|
|
||||||
# Version control
|
|
||||||
vcs.xml
|
|
||||||
|
|
||||||
# lint
|
|
||||||
lint/intermediates/
|
|
||||||
lint/generated/
|
|
||||||
lint/outputs/
|
|
||||||
lint/tmp/
|
|
||||||
# lint/reports/
|
|
||||||
|
|
||||||
# Android Profiling
|
|
||||||
*.hprof
|
|
||||||
|
|
||||||
# Cordova plugins for Capacitor
|
|
||||||
capacitor-cordova-android-plugins
|
|
||||||
|
|
||||||
# Copied web assets
|
|
||||||
app/src/main/assets/public
|
|
||||||
|
|
||||||
# Generated Config files
|
|
||||||
app/src/main/assets/capacitor.config.json
|
|
||||||
app/src/main/assets/capacitor.plugins.json
|
|
||||||
app/src/main/res/xml/config.xml
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="AndroidProjectSystem">
|
|
||||||
<option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CompilerConfiguration">
|
|
||||||
<bytecodeTargetLevel target="21" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="deploymentTargetSelector">
|
|
||||||
<selectionStates>
|
|
||||||
<SelectionState runConfigName="app">
|
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
|
||||||
<DialogSelection />
|
|
||||||
</SelectionState>
|
|
||||||
</selectionStates>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="DeviceTable">
|
|
||||||
<option name="columnSorters">
|
|
||||||
<list>
|
|
||||||
<ColumnSorterState>
|
|
||||||
<option name="column" value="Name" />
|
|
||||||
<option name="order" value="ASCENDING" />
|
|
||||||
</ColumnSorterState>
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectMigrations">
|
|
||||||
<option name="MigrateToGradleLocalJavaHome">
|
|
||||||
<set>
|
|
||||||
<option value="$PROJECT_DIR$" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectType">
|
|
||||||
<option name="id" value="Android" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="PlanningModeManager">
|
|
||||||
<option name="approvalStates">
|
|
||||||
<map>
|
|
||||||
<entry key="20260630-090134-081bb55a-1053-43ab-950d-e13c6adcdde9" value="true" />
|
|
||||||
<entry key="20260630-090415-b044c503-d35a-4112-8a57-02da5e73f9d9" value="true" />
|
|
||||||
<entry key="20260630-090515-c7bb6ec8-96fa-4399-98d4-5e18af72de07" value="true" />
|
|
||||||
<entry key="20260630-090813-d485fedc-ebae-4bad-85e8-8c07f2842ed0" value="true" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
|
|
||||||
<option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
|
|
||||||
<option value="com.intellij.execution.junit.PatternConfigurationProducer" />
|
|
||||||
<option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
|
|
||||||
<option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
|
|
||||||
<option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
|
|
||||||
<option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
|
|
||||||
<option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="StudioBotProjectSettings">
|
|
||||||
<option name="shareContext" value="OptedIn" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
/build/*
|
|
||||||
!/build/.npmkeep
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
apply plugin: 'com.android.application'
|
|
||||||
|
|
||||||
def keystorePropertiesFile = rootProject.file('keystore.properties')
|
|
||||||
def keystoreProperties = new Properties()
|
|
||||||
if (keystorePropertiesFile.exists()) {
|
|
||||||
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
namespace "net.hacecalor.farmaclic"
|
|
||||||
compileSdk rootProject.ext.compileSdkVersion
|
|
||||||
defaultConfig {
|
|
||||||
applicationId "net.hacecalor.farmaclic"
|
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
|
||||||
versionCode 1
|
|
||||||
versionName "1.0"
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
|
||||||
aaptOptions {
|
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
|
||||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
|
||||||
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
signingConfigs {
|
|
||||||
release {
|
|
||||||
if (keystorePropertiesFile.exists()) {
|
|
||||||
storeFile file(keystoreProperties['storeFile'])
|
|
||||||
storePassword keystoreProperties['storePassword']
|
|
||||||
keyAlias keystoreProperties['keyAlias']
|
|
||||||
keyPassword keystoreProperties['keyPassword']
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
minifyEnabled true
|
|
||||||
shrinkResources true
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
|
||||||
if (keystorePropertiesFile.exists()) {
|
|
||||||
signingConfig signingConfigs.release
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
|
|
||||||
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
|
|
||||||
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
|
|
||||||
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
|
|
||||||
implementation project(':capacitor-android')
|
|
||||||
testImplementation "junit:junit:$junitVersion"
|
|
||||||
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
|
|
||||||
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
|
|
||||||
implementation project(':capacitor-cordova-android-plugins')
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: 'capacitor.build.gradle'
|
|
||||||
|
|
||||||
try {
|
|
||||||
def servicesJSON = file('google-services.json')
|
|
||||||
if (servicesJSON.text) {
|
|
||||||
apply plugin: 'com.google.gms.google-services'
|
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
|
||||||
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility JavaVersion.VERSION_21
|
|
||||||
targetCompatibility JavaVersion.VERSION_21
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
|
|
||||||
dependencies {
|
|
||||||
implementation project(':capacitor-mlkit-barcode-scanning')
|
|
||||||
implementation project(':capacitor-app')
|
|
||||||
implementation project(':capacitor-splash-screen')
|
|
||||||
implementation project(':capacitor-status-bar')
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (hasProperty('postBuildExtras')) {
|
|
||||||
postBuildExtras()
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
# Add project specific ProGuard rules here.
|
|
||||||
# You can control the set of applied configuration files using the
|
|
||||||
# proguardFiles setting in build.gradle.
|
|
||||||
#
|
|
||||||
# For more details, see
|
|
||||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
|
||||||
|
|
||||||
# If your project uses WebView with JS, uncomment the following
|
|
||||||
# and specify the fully qualified class name to the JavaScript interface
|
|
||||||
# class:
|
|
||||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
|
||||||
# public *;
|
|
||||||
#}
|
|
||||||
|
|
||||||
# Uncomment this to preserve the line number information for
|
|
||||||
# debugging stack traces.
|
|
||||||
#-keepattributes SourceFile,LineNumberTable
|
|
||||||
|
|
||||||
# If you keep the line number information, uncomment this to
|
|
||||||
# hide the original source file name.
|
|
||||||
#-renamesourcefileattribute SourceFile
|
|
||||||
|
|
||||||
# --- Capacitor 6 ---
|
|
||||||
# Plugins are discovered + invoked by reflection from the JS bridge.
|
|
||||||
-keep class com.getcapacitor.** { *; }
|
|
||||||
-keep @com.getcapacitor.annotation.CapacitorPlugin class * { *; }
|
|
||||||
-keepclassmembers class * extends com.getcapacitor.Plugin {
|
|
||||||
@com.getcapacitor.PluginMethod public *;
|
|
||||||
}
|
|
||||||
-keepclassmembers @com.getcapacitor.annotation.CapacitorPlugin class * {
|
|
||||||
@com.getcapacitor.PluginMethod public *;
|
|
||||||
}
|
|
||||||
|
|
||||||
# --- Cordova compatibility layer (capacitor-cordova-android-plugins) ---
|
|
||||||
-keep class org.apache.cordova.** { *; }
|
|
||||||
-keep public class * extends org.apache.cordova.CordovaPlugin
|
|
||||||
|
|
||||||
# --- WebView JS interface ---
|
|
||||||
-keepclassmembers class * {
|
|
||||||
@android.webkit.JavascriptInterface <methods>;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Helpful stack traces from release builds.
|
|
||||||
-keepattributes SourceFile,LineNumberTable
|
|
||||||
-renamesourcefileattribute SourceFile
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
package com.getcapacitor.myapp;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
|
||||||
import androidx.test.platform.app.InstrumentationRegistry;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instrumented test, which will execute on an Android device.
|
|
||||||
*
|
|
||||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
|
||||||
*/
|
|
||||||
@RunWith(AndroidJUnit4.class)
|
|
||||||
public class ExampleInstrumentedTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void useAppContext() throws Exception {
|
|
||||||
// Context of the app under test.
|
|
||||||
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
|
||||||
|
|
||||||
assertEquals("com.getcapacitor.app", appContext.getPackageName());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
|
|
||||||
<application
|
|
||||||
android:allowBackup="true"
|
|
||||||
android:icon="@mipmap/ic_launcher"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
|
||||||
android:supportsRtl="true"
|
|
||||||
android:theme="@style/AppTheme">
|
|
||||||
|
|
||||||
<activity
|
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|density"
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:label="@string/title_activity_main"
|
|
||||||
android:theme="@style/AppTheme.NoActionBarLaunch"
|
|
||||||
android:launchMode="singleTask"
|
|
||||||
android:exported="true">
|
|
||||||
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<provider
|
|
||||||
android:name="androidx.core.content.FileProvider"
|
|
||||||
android:authorities="${applicationId}.fileprovider"
|
|
||||||
android:exported="false"
|
|
||||||
android:grantUriPermissions="true">
|
|
||||||
<meta-data
|
|
||||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
|
||||||
android:resource="@xml/file_paths"></meta-data>
|
|
||||||
</provider>
|
|
||||||
|
|
||||||
<meta-data
|
|
||||||
android:name="com.google.mlkit.vision.DEPENDENCIES"
|
|
||||||
android:value="barcode_ui" />
|
|
||||||
</application>
|
|
||||||
|
|
||||||
<!-- Permissions -->
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
|
||||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
|
||||||
</manifest>
|
|
||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package net.hacecalor.farmaclic;
|
|
||||||
|
|
||||||
import com.getcapacitor.BridgeActivity;
|
|
||||||
|
|
||||||
public class MainActivity extends BridgeActivity {}
|
|
||||||
|
Before Width: | Height: | Size: 7.5 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 17 KiB |
@@ -1,34 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:aapt="http://schemas.android.com/aapt"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportHeight="108"
|
|
||||||
android:viewportWidth="108">
|
|
||||||
<path
|
|
||||||
android:fillType="evenOdd"
|
|
||||||
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
|
|
||||||
android:strokeColor="#00000000"
|
|
||||||
android:strokeWidth="1">
|
|
||||||
<aapt:attr name="android:fillColor">
|
|
||||||
<gradient
|
|
||||||
android:endX="78.5885"
|
|
||||||
android:endY="90.9159"
|
|
||||||
android:startX="48.7653"
|
|
||||||
android:startY="61.0927"
|
|
||||||
android:type="linear">
|
|
||||||
<item
|
|
||||||
android:color="#44000000"
|
|
||||||
android:offset="0.0" />
|
|
||||||
<item
|
|
||||||
android:color="#00000000"
|
|
||||||
android:offset="1.0" />
|
|
||||||
</gradient>
|
|
||||||
</aapt:attr>
|
|
||||||
</path>
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFFFFF"
|
|
||||||
android:fillType="nonZero"
|
|
||||||
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
|
|
||||||
android:strokeColor="#00000000"
|
|
||||||
android:strokeWidth="1" />
|
|
||||||
</vector>
|
|
||||||
@@ -1,170 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportHeight="108"
|
|
||||||
android:viewportWidth="108">
|
|
||||||
<path
|
|
||||||
android:fillColor="#26A69A"
|
|
||||||
android:pathData="M0,0h108v108h-108z" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M9,0L9,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,0L19,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M29,0L29,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M39,0L39,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M49,0L49,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M59,0L59,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M69,0L69,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M79,0L79,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M89,0L89,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M99,0L99,108"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,9L108,9"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,19L108,19"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,29L108,29"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,39L108,39"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,49L108,49"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,59L108,59"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,69L108,69"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,79L108,79"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,89L108,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,99L108,99"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,29L89,29"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,39L89,39"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,49L89,49"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,59L89,59"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,69L89,69"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,79L89,79"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M29,19L29,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M39,19L39,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M49,19L49,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M59,19L59,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M69,19L69,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M79,19L79,89"
|
|
||||||
android:strokeColor="#33FFFFFF"
|
|
||||||
android:strokeWidth="0.8" />
|
|
||||||
</vector>
|
|
||||||
|
Before Width: | Height: | Size: 3.9 KiB |
@@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".MainActivity">
|
|
||||||
|
|
||||||
<WebView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent" />
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 16 KiB |
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_launcher_background">#FFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
|
||||||
<resources>
|
|
||||||
<string name="app_name">FarmaClic</string>
|
|
||||||
<string name="title_activity_main">FarmaClic</string>
|
|
||||||
<string name="package_name">net.hacecalor.farmaclic</string>
|
|
||||||
<string name="custom_url_scheme">net.hacecalor.farmaclic</string>
|
|
||||||
</resources>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
|
|
||||||
<!-- Base application theme. -->
|
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
|
||||||
<!-- Customize your theme here. -->
|
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
|
|
||||||
<item name="windowActionBar">false</item>
|
|
||||||
<item name="windowNoTitle">true</item>
|
|
||||||
<item name="android:background">@null</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
||||||
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
|
|
||||||
<item name="android:background">@drawable/splash</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<external-path name="my_images" path="." />
|
|
||||||
<cache-path name="my_cache_images" path="." />
|
|
||||||
</paths>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package com.getcapacitor.myapp;
|
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Example local unit test, which will execute on the development machine (host).
|
|
||||||
*
|
|
||||||
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
|
||||||
*/
|
|
||||||
public class ExampleUnitTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void addition_isCorrect() throws Exception {
|
|
||||||
assertEquals(4, 2 + 2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
|
||||||
|
|
||||||
buildscript {
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath 'com.android.tools.build:gradle:9.2.1'
|
|
||||||
classpath 'com.google.gms:google-services:4.4.4'
|
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
|
||||||
// in the individual module build.gradle files
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: "variables.gradle"
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task clean(type: Delete) {
|
|
||||||
delete rootProject.buildDir
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
|
||||||
include ':capacitor-android'
|
|
||||||
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
|
|
||||||
|
|
||||||
include ':capacitor-mlkit-barcode-scanning'
|
|
||||||
project(':capacitor-mlkit-barcode-scanning').projectDir = new File('../node_modules/@capacitor-mlkit/barcode-scanning/android')
|
|
||||||
|
|
||||||
include ':capacitor-app'
|
|
||||||
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
|
|
||||||
|
|
||||||
include ':capacitor-splash-screen'
|
|
||||||
project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android')
|
|
||||||
|
|
||||||
include ':capacitor-status-bar'
|
|
||||||
project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
# Project-wide Gradle settings.
|
|
||||||
|
|
||||||
# IDE (e.g. Android Studio) users:
|
|
||||||
# Gradle settings configured through the IDE *will override*
|
|
||||||
# any settings specified in this file.
|
|
||||||
|
|
||||||
# For more details on how to configure your build environment visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
|
||||||
|
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
|
||||||
org.gradle.jvmargs=-Xmx1536m
|
|
||||||
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
|
||||||
# org.gradle.parallel=true
|
|
||||||
|
|
||||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
|
||||||
# Android operating system, and which are packaged with your app's APK
|
|
||||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
|
||||||
android.useAndroidX=true
|
|
||||||
android.defaults.buildfeatures.resvalues=false
|
|
||||||
android.uniquePackageNames=false
|
|
||||||
android.dependency.useConstraints=true
|
|
||||||
android.r8.strictFullModeForKeepRules=false
|
|
||||||
android.newDsl=true
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
#This file is generated by updateDaemonJvm
|
|
||||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
|
|
||||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
|
|
||||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
|
|
||||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
|
|
||||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect
|
|
||||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect
|
|
||||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
|
|
||||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
|
|
||||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect
|
|
||||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect
|
|
||||||
toolchainVendor=JETBRAINS
|
|
||||||
toolchainVersion=21
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
|
|
||||||
networkTimeout=10000
|
|
||||||
retries=0
|
|
||||||
retryBackOffMs=500
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
@@ -1,248 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015 the original authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# gradlew start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh gradlew
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# This is normally unused
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
if ! command -v java >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
||||||
# and any embedded shellness will be escaped.
|
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
||||||
# treated as '${Hostname}' itself on the command line.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem gradlew startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables, and ensure extensions are enabled
|
|
||||||
setlocal EnableExtensions
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
"%COMSPEC%" /c exit 1
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute gradlew
|
|
||||||
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
|
||||||
@rem which allows us to clear the local environment before executing the java command
|
|
||||||
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
|
||||||
|
|
||||||
:exitWithErrorLevel
|
|
||||||
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
|
||||||
"%COMSPEC%" /c exit %ERRORLEVEL%
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
|
|
||||||
}
|
|
||||||
include ':app'
|
|
||||||
include ':capacitor-cordova-android-plugins'
|
|
||||||
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
|
|
||||||
|
|
||||||
apply from: 'capacitor.settings.gradle'
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
ext {
|
|
||||||
minSdkVersion = 24
|
|
||||||
compileSdkVersion = 36
|
|
||||||
targetSdkVersion = 36
|
|
||||||
androidxActivityVersion = '1.11.0'
|
|
||||||
androidxAppCompatVersion = '1.7.1'
|
|
||||||
androidxCoordinatorLayoutVersion = '1.3.0'
|
|
||||||
androidxCoreVersion = '1.17.0'
|
|
||||||
androidxFragmentVersion = '1.8.9'
|
|
||||||
coreSplashScreenVersion = '1.2.0'
|
|
||||||
androidxWebkitVersion = '1.14.0'
|
|
||||||
junitVersion = '4.13.2'
|
|
||||||
androidxJunitVersion = '1.3.0'
|
|
||||||
androidxEspressoCoreVersion = '3.7.0'
|
|
||||||
cordovaAndroidVersion = '14.0.1'
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
FROM node:18-slim
|
FROM node:18-slim
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY backend/package*.json ./
|
COPY apps/backend/package*.json ./
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ && rm -rf /var/lib/apt/lists/*
|
||||||
RUN npm ci --omit=dev
|
RUN npm ci --omit=dev
|
||||||
COPY backend/ .
|
COPY apps/backend/ .
|
||||||
COPY API/ /API/
|
COPY API/ /API/
|
||||||
RUN mkdir -p /app/data
|
RUN mkdir -p /app/data
|
||||||
EXPOSE 3001
|
EXPOSE 3001
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
"typescript": "~6.0.3"
|
"typescript": "~6.0.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"dev": "expo start",
|
||||||
"start": "expo start",
|
"start": "expo start",
|
||||||
"android": "expo run:android",
|
"android": "expo run:android",
|
||||||
"ios": "expo run:ios",
|
"ios": "expo run:ios",
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
"@grafana/faro-web-sdk": "^1.7.0",
|
"@grafana/faro-web-sdk": "^1.7.0",
|
||||||
"@grafana/faro-web-tracing": "^1.7.0",
|
"@grafana/faro-web-tracing": "^1.7.0",
|
||||||
"@zxing/browser": "^0.2.0",
|
"@zxing/browser": "^0.2.0",
|
||||||
"@zxing/library": "^0.22.0",
|
"@zxing/library": "^0.23.0",
|
||||||
"leaflet": "^1.9.4",
|
"leaflet": "^1.9.4",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"description": "",
|
"description": "",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"dev": "node index.js",
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
PORT=3001
|
|
||||||
SESSION_SECRET=change-me-in-production
|
|
||||||
CORS_ORIGIN=http://localhost:3000
|
|
||||||
FARMACIAS_WEBHOOK_URL=
|
|
||||||
REDIS_HOST=localhost
|
|
||||||
REDIS_PORT=6379
|
|
||||||
REDIS_PASSWORD=
|
|
||||||
|
|
||||||
# PostgreSQL for user accounts (leave unset to fallback to SQLite — dev/test only)
|
|
||||||
PG_URL=postgresql://farmaclic:change-me@localhost:5432/farmaclic
|
|
||||||
PG_PASSWORD=change-me
|
|
||||||
|
|
||||||
# Web Push (VAPID). Generate with:
|
|
||||||
# node -e "import('web-push').then(w => console.log(w.default.generateVAPIDKeys()))"
|
|
||||||
VAPID_PUBLIC_KEY=
|
|
||||||
VAPID_PRIVATE_KEY=
|
|
||||||
VAPID_SUBJECT=mailto:admin@example.com
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
FROM node:18-slim
|
|
||||||
WORKDIR /app
|
|
||||||
COPY backend/package*.json ./
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ && rm -rf /var/lib/apt/lists/*
|
|
||||||
RUN npm ci --omit=dev
|
|
||||||
COPY backend/ .
|
|
||||||
COPY API/ /API/
|
|
||||||
RUN mkdir -p /app/data
|
|
||||||
EXPOSE 3001
|
|
||||||
CMD ["node", "server.js"]
|
|
||||||
@@ -1,144 +0,0 @@
|
|||||||
# 🔧 Solución Rápida - Error: no such column: medicine_id
|
|
||||||
|
|
||||||
## ❌ El Error
|
|
||||||
|
|
||||||
```
|
|
||||||
Error: SQLITE_ERROR: no such column: medicine_id
|
|
||||||
```
|
|
||||||
|
|
||||||
Este error ocurre porque la base de datos tiene la estructura antigua que usa `medicine_id`, pero el código actualizado ahora usa `medicine_nregistro`.
|
|
||||||
|
|
||||||
## ✅ Soluciones
|
|
||||||
|
|
||||||
### Opción 1: Reset Completo (Recomendado para desarrollo)
|
|
||||||
|
|
||||||
**Esto eliminará todos los datos actuales:**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
|
|
||||||
# Método 1: Usando el script
|
|
||||||
npm run reset-db
|
|
||||||
|
|
||||||
# Método 2: Manual
|
|
||||||
rm database.sqlite
|
|
||||||
node seed.js
|
|
||||||
node create-admin.js
|
|
||||||
```
|
|
||||||
|
|
||||||
### Opción 2: Migración (Mantiene farmacias, pierde vínculos medicamento-farmacia)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
node migrate.js
|
|
||||||
```
|
|
||||||
|
|
||||||
**Nota:** Esta opción mantiene las farmacias pero elimina las relaciones medicamento-farmacia porque ahora usan un esquema diferente (nregistro de CIMA en lugar de IDs locales).
|
|
||||||
|
|
||||||
### Opción 3: Manual con SQLite
|
|
||||||
|
|
||||||
Si quieres más control:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
sqlite3 database.sqlite
|
|
||||||
|
|
||||||
# Dentro de SQLite:
|
|
||||||
DROP TABLE IF EXISTS pharmacy_medicines;
|
|
||||||
DROP INDEX IF EXISTS idx_pharmacy_medicine;
|
|
||||||
|
|
||||||
CREATE TABLE pharmacy_medicines (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
pharmacy_id INTEGER NOT NULL,
|
|
||||||
medicine_nregistro TEXT NOT NULL,
|
|
||||||
medicine_name TEXT,
|
|
||||||
price REAL,
|
|
||||||
stock INTEGER DEFAULT 0,
|
|
||||||
FOREIGN KEY (pharmacy_id) REFERENCES pharmacies(id),
|
|
||||||
UNIQUE(pharmacy_id, medicine_nregistro)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX idx_pharmacy_medicine ON pharmacy_medicines(medicine_nregistro);
|
|
||||||
|
|
||||||
.quit
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🔍 Verificar la Estructura
|
|
||||||
|
|
||||||
Para verificar que la base de datos tiene la estructura correcta:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
sqlite3 database.sqlite "PRAGMA table_info(pharmacy_medicines);"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Salida esperada:**
|
|
||||||
```
|
|
||||||
0|id|INTEGER|0||1
|
|
||||||
1|pharmacy_id|INTEGER|1||0
|
|
||||||
2|medicine_nregistro|TEXT|1||0
|
|
||||||
3|medicine_name|TEXT|0||0
|
|
||||||
4|price|REAL|0||0
|
|
||||||
5|stock|INTEGER|0|0|0
|
|
||||||
```
|
|
||||||
|
|
||||||
## 🚀 Después de la Corrección
|
|
||||||
|
|
||||||
1. **Verifica que Redis esté corriendo:**
|
|
||||||
```bash
|
|
||||||
redis-cli ping
|
|
||||||
# Debe responder: PONG
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Inicia el servidor:**
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
npm start
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Vincula medicamentos en el Admin Panel:**
|
|
||||||
- Ve a http://localhost:3000
|
|
||||||
- Haz login en el Admin Panel
|
|
||||||
- Ve a la pestaña "Link Medicine"
|
|
||||||
- Busca medicamentos desde CIMA
|
|
||||||
- Vincúlalos a tus farmacias
|
|
||||||
|
|
||||||
## 📝 ¿Por qué cambió?
|
|
||||||
|
|
||||||
La aplicación ahora usa la **API oficial de CIMA** (Agencia Española de Medicamentos) en lugar de almacenar medicamentos localmente.
|
|
||||||
|
|
||||||
**Beneficios:**
|
|
||||||
- ✅ Datos siempre actualizados
|
|
||||||
- ✅ Más de 30,000 medicamentos disponibles
|
|
||||||
- ✅ Información oficial y verificada
|
|
||||||
- ✅ Menos mantenimiento de base de datos
|
|
||||||
|
|
||||||
**Estructura anterior:**
|
|
||||||
```
|
|
||||||
pharmacy_medicines
|
|
||||||
- medicine_id → ID local en tabla medicines
|
|
||||||
```
|
|
||||||
|
|
||||||
**Estructura nueva:**
|
|
||||||
```
|
|
||||||
pharmacy_medicines
|
|
||||||
- medicine_nregistro → Número de registro de CIMA
|
|
||||||
- medicine_name → Nombre cacheado para mostrar
|
|
||||||
```
|
|
||||||
|
|
||||||
## 💡 Preguntas Frecuentes
|
|
||||||
|
|
||||||
**P: ¿Perderé mis farmacias?**
|
|
||||||
R: No, las farmacias se mantienen. Solo necesitas re-vincular los medicamentos.
|
|
||||||
|
|
||||||
**P: ¿Perderé los vínculos medicamento-farmacia?**
|
|
||||||
R: Sí, porque ahora usan un sistema diferente (nregistros de CIMA). Tendrás que re-vincularlos usando el panel de admin.
|
|
||||||
|
|
||||||
**P: ¿Y si tengo muchos vínculos?**
|
|
||||||
R: La migración vale la pena por los beneficios a largo plazo. La re-vinculación es fácil con la búsqueda en tiempo real desde CIMA.
|
|
||||||
|
|
||||||
## 📚 Más Información
|
|
||||||
|
|
||||||
- Ver [MIGRATION.md](./MIGRATION.md) para guía completa de migración
|
|
||||||
- Ver [CHANGES.md](./CHANGES.md) para lista de todos los cambios
|
|
||||||
- Ver [README.md](./README.md) para documentación general
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
import { parseOsmOpeningHours } from '../../API/opening-hours-osm.js';
|
|
||||||
|
|
||||||
describe('parseOsmOpeningHours', () => {
|
|
||||||
test('returns null for empty / non-string input', () => {
|
|
||||||
expect(parseOsmOpeningHours('')).toBeNull();
|
|
||||||
expect(parseOsmOpeningHours(null)).toBeNull();
|
|
||||||
expect(parseOsmOpeningHours(undefined)).toBeNull();
|
|
||||||
expect(parseOsmOpeningHours(123)).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('24/7 → every day 00:00–24:00', () => {
|
|
||||||
expect(parseOsmOpeningHours('24/7')).toEqual({
|
|
||||||
mon: ['00:00', '24:00'],
|
|
||||||
tue: ['00:00', '24:00'],
|
|
||||||
wed: ['00:00', '24:00'],
|
|
||||||
thu: ['00:00', '24:00'],
|
|
||||||
fri: ['00:00', '24:00'],
|
|
||||||
sat: ['00:00', '24:00'],
|
|
||||||
sun: ['00:00', '24:00'],
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Mo-Fr 09:00-21:00 → weekdays set, weekend null', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-21:00');
|
|
||||||
expect(result.mon).toEqual(['09:00', '21:00']);
|
|
||||||
expect(result.fri).toEqual(['09:00', '21:00']);
|
|
||||||
expect(result.sat).toBeNull();
|
|
||||||
expect(result.sun).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Multiple rules separated by semicolons', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-21:00; Sa 09:00-14:00; Su closed');
|
|
||||||
expect(result.mon).toEqual(['09:00', '21:00']);
|
|
||||||
expect(result.fri).toEqual(['09:00', '21:00']);
|
|
||||||
expect(result.sat).toEqual(['09:00', '14:00']);
|
|
||||||
expect(result.sun).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Comma-separated day list', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo,We,Fr 10:00-14:00');
|
|
||||||
expect(result.mon).toEqual(['10:00', '14:00']);
|
|
||||||
expect(result.tue).toBeNull();
|
|
||||||
expect(result.wed).toEqual(['10:00', '14:00']);
|
|
||||||
expect(result.thu).toBeNull();
|
|
||||||
expect(result.fri).toEqual(['10:00', '14:00']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Split shifts collapsed to first-open / last-close', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-13:30,16:30-20:00');
|
|
||||||
expect(result.mon).toEqual(['09:00', '20:00']);
|
|
||||||
expect(result.fri).toEqual(['09:00', '20:00']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Wrap-around day range Sa-Mo', () => {
|
|
||||||
const result = parseOsmOpeningHours('Sa-Mo 10:00-18:00');
|
|
||||||
expect(result.sat).toEqual(['10:00', '18:00']);
|
|
||||||
expect(result.sun).toEqual(['10:00', '18:00']);
|
|
||||||
expect(result.mon).toEqual(['10:00', '18:00']);
|
|
||||||
expect(result.tue).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Public-holiday rules are ignored', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-21:00; PH off');
|
|
||||||
expect(result.mon).toEqual(['09:00', '21:00']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Parenthetical comments are stripped', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-14:00 (verano)');
|
|
||||||
expect(result.mon).toEqual(['09:00', '14:00']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('"off" applies null to those days', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo-Fr 09:00-21:00; Sa off');
|
|
||||||
expect(result.sat).toBeNull();
|
|
||||||
expect(result.mon).toEqual(['09:00', '21:00']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Returns null when nothing parses', () => {
|
|
||||||
expect(parseOsmOpeningHours('see website')).toBeNull();
|
|
||||||
expect(parseOsmOpeningHours('?')).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Single-digit hours get zero-padded', () => {
|
|
||||||
const result = parseOsmOpeningHours('Mo 9:00-18:00');
|
|
||||||
expect(result.mon).toEqual(['09:00', '18:00']);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
import { jest } from '@jest/globals'
|
|
||||||
|
|
||||||
jest.unstable_mockModule('../cima-service.js', () => ({
|
|
||||||
searchMedicines: jest.fn(async () => []),
|
|
||||||
getMedicineDetails: jest.fn(async () => null),
|
|
||||||
}))
|
|
||||||
|
|
||||||
jest.unstable_mockModule('../farmacias-webhook-import.js', () => ({
|
|
||||||
runFarmaciaWebhookImport: jest.fn(async () => ({})),
|
|
||||||
DEFAULT_FARMACIAS_WEBHOOK: '',
|
|
||||||
importPharmaciesFromRows: jest.fn(async () => ({})),
|
|
||||||
}))
|
|
||||||
|
|
||||||
jest.unstable_mockModule('../../API/index.js', () => ({
|
|
||||||
fetchPharmaciesExternal: jest.fn(async () => []),
|
|
||||||
}))
|
|
||||||
|
|
||||||
process.env.DATABASE_PATH = ':memory:'
|
|
||||||
process.env.NODE_ENV = 'test'
|
|
||||||
|
|
||||||
const { default: supertest } = await import('supertest')
|
|
||||||
const { app, initDatabase, db } = await import('../server.js')
|
|
||||||
const { default: bcrypt } = await import('bcrypt')
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
|
||||||
await initDatabase()
|
|
||||||
const hash = await bcrypt.hash('testpass', 10)
|
|
||||||
await new Promise((resolve, reject) => {
|
|
||||||
db.run(
|
|
||||||
'INSERT INTO users (username, password_hash, is_admin) VALUES (?, ?, 1)',
|
|
||||||
['testadmin', hash],
|
|
||||||
(err) => (err ? reject(err) : resolve())
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('Medicine search', () => {
|
|
||||||
test('GET /api/medicines/search with empty q returns []', async () => {
|
|
||||||
const res = await supertest(app).get('/api/medicines/search?q=')
|
|
||||||
expect(res.status).toBe(200)
|
|
||||||
expect(res.body).toEqual([])
|
|
||||||
})
|
|
||||||
|
|
||||||
test('GET /api/medicines/search with short q returns array', async () => {
|
|
||||||
const res = await supertest(app).get('/api/medicines/search?q=a')
|
|
||||||
expect(res.status).toBe(200)
|
|
||||||
expect(Array.isArray(res.body)).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('Authentication', () => {
|
|
||||||
test('POST /api/auth/login with wrong creds returns 401', async () => {
|
|
||||||
const res = await supertest(app)
|
|
||||||
.post('/api/auth/login')
|
|
||||||
.send({ username: 'nobody', password: 'wrong' })
|
|
||||||
expect(res.status).toBe(401)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('Admin routes', () => {
|
|
||||||
test('GET /api/admin/medicines without auth returns 401', async () => {
|
|
||||||
const res = await supertest(app).get('/api/admin/medicines')
|
|
||||||
expect(res.status).toBe(401)
|
|
||||||
})
|
|
||||||
|
|
||||||
test('POST /api/admin/pharmacies with valid auth returns 201', async () => {
|
|
||||||
const agent = supertest.agent(app)
|
|
||||||
const login = await agent
|
|
||||||
.post('/api/auth/login')
|
|
||||||
.send({ username: 'testadmin', password: 'testpass' })
|
|
||||||
expect(login.status).toBe(200)
|
|
||||||
|
|
||||||
const res = await agent.post('/api/admin/pharmacies').send({
|
|
||||||
name: 'Test Pharmacy',
|
|
||||||
address: 'Test Street 1',
|
|
||||||
})
|
|
||||||
expect(res.status).toBe(201)
|
|
||||||
expect(res.body).toMatchObject({ name: 'Test Pharmacy', address: 'Test Street 1' })
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
import axios from 'axios';
|
|
||||||
import redisClient from './redis-client.js';
|
|
||||||
|
|
||||||
const CIMA_API_BASE_URL = 'https://cima.aemps.es/cima/rest';
|
|
||||||
const CACHE_TTL = 3600; // 1 hora en segundos
|
|
||||||
|
|
||||||
/**
|
|
||||||
* CIMA's nombre filter is prefix-oriented; narrow to rows that contain every
|
|
||||||
* search term in the commercial name or active ingredient (full-word style).
|
|
||||||
*/
|
|
||||||
function filterMedicinesByFullQuery(medicines, searchTerm) {
|
|
||||||
const terms = searchTerm
|
|
||||||
.trim()
|
|
||||||
.toLowerCase()
|
|
||||||
.split(/\s+/)
|
|
||||||
.filter(Boolean);
|
|
||||||
if (terms.length === 0) return medicines;
|
|
||||||
return medicines.filter((m) => {
|
|
||||||
const hay = `${m.name || ''} ${m.active_ingredient || ''}`.toLowerCase();
|
|
||||||
return terms.every((term) => hay.includes(term));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Busca medicamentos en la API de CIMA con caché de Redis
|
|
||||||
* @param {string} query - Término de búsqueda
|
|
||||||
* @returns {Promise<Array>} - Lista de medicamentos encontrados
|
|
||||||
*/
|
|
||||||
export async function searchMedicines(query) {
|
|
||||||
if (!query || query.trim().length < 2) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
const searchTerm = query.trim().toLowerCase();
|
|
||||||
const cacheKey = `medicines:search:v2:${searchTerm}`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Intentar obtener del caché
|
|
||||||
const cachedData = await redisClient.get(cacheKey);
|
|
||||||
|
|
||||||
if (cachedData) {
|
|
||||||
console.log(`📦 Cache hit for: ${searchTerm}`);
|
|
||||||
return JSON.parse(cachedData);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si no está en caché, consultar la API de CIMA
|
|
||||||
console.log(`🌐 Fetching from CIMA API: ${searchTerm}`);
|
|
||||||
const response = await axios.get(`${CIMA_API_BASE_URL}/medicamentos`, {
|
|
||||||
params: {
|
|
||||||
nombre: searchTerm
|
|
||||||
},
|
|
||||||
timeout: 5000
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.data && response.data.resultados) {
|
|
||||||
// Transformar los datos de CIMA a nuestro formato
|
|
||||||
const medicines = response.data.resultados.map(med => ({
|
|
||||||
id: med.nregistro,
|
|
||||||
nregistro: med.nregistro,
|
|
||||||
name: med.nombre,
|
|
||||||
active_ingredient: 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 || []
|
|
||||||
}));
|
|
||||||
|
|
||||||
const filtered = filterMedicinesByFullQuery(medicines, searchTerm);
|
|
||||||
|
|
||||||
// Guardar en caché
|
|
||||||
await redisClient.setEx(cacheKey, CACHE_TTL, JSON.stringify(filtered));
|
|
||||||
|
|
||||||
console.log(`✅ Cached ${filtered.length} medicines for: ${searchTerm}`);
|
|
||||||
return filtered;
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error searching 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 cache data due to API error');
|
|
||||||
return JSON.parse(staleData);
|
|
||||||
}
|
|
||||||
} catch (cacheError) {
|
|
||||||
console.error('Cache fallback also failed:', cacheError);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Obtiene detalles de un medicamento específico por su número de registro
|
|
||||||
* @param {string} nregistro - Número de registro del medicamento
|
|
||||||
* @returns {Promise<Object|null>} - Datos del medicamento
|
|
||||||
*/
|
|
||||||
export async function getMedicineDetails(nregistro) {
|
|
||||||
const cacheKey = `medicine:${nregistro}`;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Intentar obtener del caché
|
|
||||||
const cachedData = await redisClient.get(cacheKey);
|
|
||||||
|
|
||||||
if (cachedData) {
|
|
||||||
console.log(`📦 Cache hit for medicine: ${nregistro}`);
|
|
||||||
return JSON.parse(cachedData);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Consultar la API de CIMA
|
|
||||||
console.log(`🌐 Fetching medicine details from CIMA: ${nregistro}`);
|
|
||||||
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 || []
|
|
||||||
};
|
|
||||||
|
|
||||||
// Guardar en caché (TTL más largo para detalles específicos)
|
|
||||||
await redisClient.setEx(cacheKey, CACHE_TTL * 24, JSON.stringify(medicineDetails));
|
|
||||||
|
|
||||||
return medicineDetails;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
} catch (error) {
|
|
||||||
console.error(`Error fetching medicine ${nregistro} from CIMA:`, error.message);
|
|
||||||
|
|
||||||
// Intentar devolver datos cacheados aunque hayan expirado
|
|
||||||
try {
|
|
||||||
const staleData = await redisClient.get(cacheKey);
|
|
||||||
if (staleData) {
|
|
||||||
console.log('⚠️ Returning stale cache data due to API error');
|
|
||||||
return JSON.parse(staleData);
|
|
||||||
}
|
|
||||||
} catch (cacheError) {
|
|
||||||
console.error('Cache fallback also failed:', cacheError);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Limpia el caché de búsquedas (útil para testing o mantenimiento)
|
|
||||||
* @param {string} pattern - Patrón de claves a eliminar (ej: 'medicines:search:*')
|
|
||||||
* @returns {Promise<number>} - Número de claves eliminadas
|
|
||||||
*/
|
|
||||||
export async function clearCache(pattern = 'medicines:*') {
|
|
||||||
try {
|
|
||||||
const keys = await redisClient.keys(pattern);
|
|
||||||
if (keys.length > 0) {
|
|
||||||
await redisClient.del(keys);
|
|
||||||
console.log(`🗑️ Cleared ${keys.length} cache entries`);
|
|
||||||
return keys.length;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error clearing cache:', error);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
import sqlite3 from 'sqlite3';
|
|
||||||
import { promisify } from 'util';
|
|
||||||
import bcrypt from 'bcrypt';
|
|
||||||
import path from 'path';
|
|
||||||
import { fileURLToPath } from 'url';
|
|
||||||
import pg from 'pg';
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
|
||||||
const __dirname = path.dirname(__filename);
|
|
||||||
|
|
||||||
const PG_URL = process.env.PG_URL;
|
|
||||||
|
|
||||||
async function createAdmin() {
|
|
||||||
const username = process.env.ADMIN_USERNAME || 'admin';
|
|
||||||
const password = process.env.ADMIN_PASSWORD || 'admin123';
|
|
||||||
const passwordHash = await bcrypt.hash(password, 10);
|
|
||||||
|
|
||||||
if (PG_URL) {
|
|
||||||
const { Pool } = pg;
|
|
||||||
const pool = new Pool({ connectionString: PG_URL });
|
|
||||||
try {
|
|
||||||
await pool.query(`
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
username TEXT UNIQUE NOT NULL,
|
|
||||||
password_hash TEXT NOT NULL,
|
|
||||||
is_admin INTEGER NOT NULL DEFAULT 0,
|
|
||||||
address TEXT,
|
|
||||||
latitude DOUBLE PRECISION,
|
|
||||||
longitude DOUBLE PRECISION,
|
|
||||||
created_at TIMESTAMPTZ DEFAULT NOW()
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
const existing = await pool.query('SELECT id FROM users WHERE username = $1', [username]);
|
|
||||||
if (existing.rows.length > 0) {
|
|
||||||
console.log(`Admin user '${username}' already exists.`);
|
|
||||||
console.log('To reset, delete the user first and re-run.');
|
|
||||||
await pool.end();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await pool.query(
|
|
||||||
'INSERT INTO users (username, password_hash, is_admin) VALUES ($1, $2, 1)',
|
|
||||||
[username, passwordHash]
|
|
||||||
);
|
|
||||||
console.log(`Admin user '${username}' created in PostgreSQL.`);
|
|
||||||
} finally {
|
|
||||||
await pool.end();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const dbPath = process.env.DATABASE_PATH || path.join(__dirname, 'database.sqlite');
|
|
||||||
const db = new sqlite3.Database(dbPath);
|
|
||||||
const dbRun = (sql, params = []) =>
|
|
||||||
new Promise((resolve, reject) =>
|
|
||||||
db.run(sql, params, function (err) { err ? reject(err) : resolve({ lastID: this.lastID }); })
|
|
||||||
);
|
|
||||||
const dbGet = promisify(db.get.bind(db));
|
|
||||||
|
|
||||||
try {
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
username TEXT UNIQUE NOT NULL,
|
|
||||||
password_hash TEXT NOT NULL,
|
|
||||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
try { await dbRun('ALTER TABLE users ADD COLUMN is_admin INTEGER NOT NULL DEFAULT 0'); } catch {}
|
|
||||||
|
|
||||||
const existing = await dbGet('SELECT id FROM users WHERE username = ?', [username]);
|
|
||||||
if (existing) {
|
|
||||||
console.log(`Admin user '${username}' already exists.`);
|
|
||||||
console.log('To reset, delete the user first and re-run.');
|
|
||||||
db.close();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await dbRun(
|
|
||||||
'INSERT INTO users (username, password_hash, is_admin) VALUES (?, ?, 1)',
|
|
||||||
[username, passwordHash]
|
|
||||||
);
|
|
||||||
console.log(`Admin user '${username}' created in SQLite.`);
|
|
||||||
} finally {
|
|
||||||
db.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`Username: ${username}`);
|
|
||||||
console.log(`Password: ${password}`);
|
|
||||||
console.log('\nIMPORTANT: Change the default password after first login!');
|
|
||||||
}
|
|
||||||
|
|
||||||
createAdmin().catch((err) => {
|
|
||||||
console.error('Error creating admin user:', err);
|
|
||||||
process.exit(1);
|
|
||||||
});
|
|
||||||
@@ -1,308 +0,0 @@
|
|||||||
/**
|
|
||||||
* Fetch pharmacy lists from an n8n (or any) HTTP webhook and map into FarmaClic rows.
|
|
||||||
* Default URL: FARMACIAS_WEBHOOK_URL env or the project webhook.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { parseOsmOpeningHours } from '../API/opening-hours-osm.js';
|
|
||||||
|
|
||||||
export const DEFAULT_FARMACIAS_WEBHOOK =
|
|
||||||
process.env.FARMACIAS_WEBHOOK_URL ||
|
|
||||||
'https://n8n.hacecalor.net/webhook/farmacias';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Append region query params, e.g. GET /webhook/farmacias?lat=41.5631&lon=2.0038&radio=1500
|
|
||||||
* @param {string} baseUrl - Absolute webhook URL (may already include other query params)
|
|
||||||
* @param {{ lat?: number|string, lon?: number|string, lng?: number|string, radio?: number|string }} region
|
|
||||||
*/
|
|
||||||
export function buildFarmaciasWebhookUrl(baseUrl, region = {}) {
|
|
||||||
const u = new URL(baseUrl);
|
|
||||||
const lat = region.lat;
|
|
||||||
const lon = region.lon ?? region.lng;
|
|
||||||
const radio = region.radio;
|
|
||||||
|
|
||||||
if (lat !== undefined && lat !== null && String(lat).trim() !== '') {
|
|
||||||
u.searchParams.set('lat', String(lat).trim());
|
|
||||||
}
|
|
||||||
if (lon !== undefined && lon !== null && String(lon).trim() !== '') {
|
|
||||||
u.searchParams.set('lon', String(lon).trim());
|
|
||||||
}
|
|
||||||
if (radio !== undefined && radio !== null && String(radio).trim() !== '') {
|
|
||||||
u.searchParams.set('radio', String(radio).trim());
|
|
||||||
}
|
|
||||||
return u.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
function pick(obj, keys) {
|
|
||||||
if (!obj || typeof obj !== 'object') return null;
|
|
||||||
for (const k of keys) {
|
|
||||||
if (Object.prototype.hasOwnProperty.call(obj, k)) {
|
|
||||||
const v = obj[k];
|
|
||||||
if (v !== undefined && v !== null && String(v).trim() !== '') {
|
|
||||||
return String(v).trim();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function toNumber(v) {
|
|
||||||
if (v === undefined || v === null || v === '') return null;
|
|
||||||
const n = typeof v === 'number' ? v : parseFloat(String(v).replace(',', '.'));
|
|
||||||
return Number.isFinite(n) ? n : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalize one raw record (Spanish / English field names, GeoJSON-ish).
|
|
||||||
*/
|
|
||||||
export function normalizePharmacyRecord(raw) {
|
|
||||||
if (!raw || typeof raw !== 'object') return null;
|
|
||||||
if (raw.json != null && typeof raw.json === 'object' && !Array.isArray(raw.json)) {
|
|
||||||
return normalizePharmacyRecord(raw.json);
|
|
||||||
}
|
|
||||||
|
|
||||||
let name = pick(raw, [
|
|
||||||
'name',
|
|
||||||
'nombre',
|
|
||||||
'farmacia',
|
|
||||||
'titular',
|
|
||||||
'denominacion',
|
|
||||||
'denominación',
|
|
||||||
'razon_social',
|
|
||||||
'razón_social',
|
|
||||||
'title',
|
|
||||||
]);
|
|
||||||
let address = pick(raw, [
|
|
||||||
'address',
|
|
||||||
'direccion',
|
|
||||||
'dirección',
|
|
||||||
'domicilio',
|
|
||||||
'ubicacion',
|
|
||||||
'ubicación',
|
|
||||||
'calle',
|
|
||||||
'full_address',
|
|
||||||
'direccion_completa',
|
|
||||||
]);
|
|
||||||
const phone = pick(raw, [
|
|
||||||
'phone',
|
|
||||||
'telefono',
|
|
||||||
'teléfono',
|
|
||||||
'tel',
|
|
||||||
'telephone',
|
|
||||||
'movil',
|
|
||||||
'móvil',
|
|
||||||
]);
|
|
||||||
|
|
||||||
let latitude = toNumber(raw.latitude ?? raw.latitud ?? raw.lat ?? raw.y);
|
|
||||||
let longitude = toNumber(raw.longitude ?? raw.longitud ?? raw.lng ?? raw.lon ?? raw.x);
|
|
||||||
|
|
||||||
const coords = raw.geometry?.coordinates;
|
|
||||||
if (Array.isArray(coords) && coords.length >= 2) {
|
|
||||||
if (longitude == null) longitude = toNumber(coords[0]);
|
|
||||||
if (latitude == null) latitude = toNumber(coords[1]);
|
|
||||||
}
|
|
||||||
if (raw.location && typeof raw.location === 'object') {
|
|
||||||
if (latitude == null) latitude = toNumber(raw.location.lat ?? raw.location.latitude);
|
|
||||||
if (longitude == null) longitude = toNumber(raw.location.lng ?? raw.location.lon ?? raw.location.longitude);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!name && pick(raw, ['properties'])) {
|
|
||||||
return normalizePharmacyRecord(raw.properties);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!address && name) {
|
|
||||||
const parts = [pick(raw, ['localidad', 'city', 'municipio']), pick(raw, ['cp', 'codigo_postal', 'postal_code'])]
|
|
||||||
.filter(Boolean)
|
|
||||||
.join(', ');
|
|
||||||
if (parts) address = parts;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
name: name || null,
|
|
||||||
address: address || null,
|
|
||||||
phone: phone || null,
|
|
||||||
latitude,
|
|
||||||
longitude,
|
|
||||||
opening_hours: extractOpeningHours(raw),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function extractOpeningHours(raw) {
|
|
||||||
if (!raw || typeof raw !== 'object') return null;
|
|
||||||
const direct = raw.opening_hours;
|
|
||||||
if (direct && typeof direct === 'object' && !Array.isArray(direct)) {
|
|
||||||
return direct;
|
|
||||||
}
|
|
||||||
const candidates = [
|
|
||||||
direct,
|
|
||||||
raw.openingHours,
|
|
||||||
raw.horario,
|
|
||||||
raw.hours,
|
|
||||||
raw.tags?.opening_hours,
|
|
||||||
raw.properties?.opening_hours,
|
|
||||||
];
|
|
||||||
for (const c of candidates) {
|
|
||||||
if (typeof c === 'string' && c.trim()) {
|
|
||||||
const parsed = parseOsmOpeningHours(c);
|
|
||||||
if (parsed) return parsed;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** n8n often returns [{ json: { ... } }, ...] */
|
|
||||||
function unwrapN8nItemArray(arr) {
|
|
||||||
if (!Array.isArray(arr) || arr.length === 0) return arr || [];
|
|
||||||
const first = arr[0];
|
|
||||||
if (
|
|
||||||
first &&
|
|
||||||
typeof first === 'object' &&
|
|
||||||
first.json != null &&
|
|
||||||
typeof first.json === 'object' &&
|
|
||||||
!Array.isArray(first.json)
|
|
||||||
) {
|
|
||||||
return arr.map((x) => x.json);
|
|
||||||
}
|
|
||||||
return arr;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function extractPharmacyRows(payload) {
|
|
||||||
if (payload == null) return [];
|
|
||||||
let list = [];
|
|
||||||
|
|
||||||
if (Array.isArray(payload)) list = payload;
|
|
||||||
else if (typeof payload === 'object') {
|
|
||||||
const candidates = [
|
|
||||||
payload.farmacias,
|
|
||||||
payload.data,
|
|
||||||
payload.results,
|
|
||||||
payload.items,
|
|
||||||
payload.rows,
|
|
||||||
payload.records,
|
|
||||||
payload.pharmacies,
|
|
||||||
payload.body,
|
|
||||||
payload.output,
|
|
||||||
];
|
|
||||||
for (const c of candidates) {
|
|
||||||
if (Array.isArray(c)) {
|
|
||||||
list = c;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (list.length === 0 && Array.isArray(payload.json)) list = payload.json;
|
|
||||||
}
|
|
||||||
|
|
||||||
return unwrapN8nItemArray(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchWebhookJson(url, fetchOptions = {}) {
|
|
||||||
const res = await fetch(url, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: { Accept: 'application/json', ...fetchOptions.headers },
|
|
||||||
...fetchOptions,
|
|
||||||
});
|
|
||||||
const text = await res.text();
|
|
||||||
let json;
|
|
||||||
try {
|
|
||||||
json = text ? JSON.parse(text) : null;
|
|
||||||
} catch {
|
|
||||||
throw new Error(
|
|
||||||
`Webhook returned non-JSON (HTTP ${res.status}): ${text.slice(0, 300)}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (!res.ok) {
|
|
||||||
const hint = json?.message || JSON.stringify(json);
|
|
||||||
throw new Error(`Webhook HTTP ${res.status}: ${hint}`);
|
|
||||||
}
|
|
||||||
return json;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {Function} dbGet - (sql, params) => Promise<row|undefined>
|
|
||||||
* @param {Function} dbRun - (sql, params) => Promise<{lastID, changes}>
|
|
||||||
* @param {object[]} rows - raw webhook items
|
|
||||||
*/
|
|
||||||
/** Insert normalized pharmacy rows; exported for OSM/Google/open-data importers */
|
|
||||||
export async function importPharmaciesFromRows(dbGet, dbRun, rows) {
|
|
||||||
let inserted = 0;
|
|
||||||
let skipped = 0;
|
|
||||||
let invalid = 0;
|
|
||||||
const errors = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < rows.length; i++) {
|
|
||||||
const normalized = normalizePharmacyRecord(rows[i]);
|
|
||||||
if (!normalized?.name || !normalized?.address) {
|
|
||||||
invalid++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { name, address, phone, latitude, longitude, opening_hours } = normalized;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const existing = await dbGet(
|
|
||||||
'SELECT id FROM pharmacies WHERE name = ? AND address = ?',
|
|
||||||
[name, address]
|
|
||||||
);
|
|
||||||
if (existing) {
|
|
||||||
skipped++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const openingHoursValue = opening_hours ? JSON.stringify(opening_hours) : null;
|
|
||||||
|
|
||||||
await dbRun(
|
|
||||||
'INSERT INTO pharmacies (name, address, phone, latitude, longitude, opening_hours) VALUES (?, ?, ?, ?, ?, ?)',
|
|
||||||
[name, address, phone || null, latitude, longitude, openingHoursValue]
|
|
||||||
);
|
|
||||||
inserted++;
|
|
||||||
} catch (err) {
|
|
||||||
errors.push({ index: i, message: err.message });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { inserted, skipped, invalid, errors };
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Full flow: GET webhook → parse rows → insert into DB.
|
|
||||||
* @param {string} [url] - Webhook base URL
|
|
||||||
* @param {{ lat?: number|string, lon?: number|string, lng?: number|string, radio?: number|string } | null} [region] - Optional; adds ?lat=&lon=&radio= (meters)
|
|
||||||
*/
|
|
||||||
export async function runFarmaciaWebhookImport(
|
|
||||||
dbGet,
|
|
||||||
dbRun,
|
|
||||||
url = DEFAULT_FARMACIAS_WEBHOOK,
|
|
||||||
region = null
|
|
||||||
) {
|
|
||||||
const finalUrl =
|
|
||||||
region && (region.lat != null || region.lon != null || region.lng != null || region.radio != null)
|
|
||||||
? buildFarmaciasWebhookUrl(url, region)
|
|
||||||
: url;
|
|
||||||
|
|
||||||
const json = await fetchWebhookJson(finalUrl);
|
|
||||||
const rows = extractPharmacyRows(json);
|
|
||||||
|
|
||||||
if (rows.length === 0) {
|
|
||||||
const keys = json && typeof json === 'object' ? Object.keys(json).join(', ') : typeof json;
|
|
||||||
const err = new Error(
|
|
||||||
`No pharmacy list found in webhook JSON (top-level keys: ${keys}). ` +
|
|
||||||
`Fix the n8n workflow so the last node returns an array or { data: [...] }.`
|
|
||||||
);
|
|
||||||
err.details = json;
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
|
|
||||||
const stats = await importPharmaciesFromRows(dbGet, dbRun, rows);
|
|
||||||
const out = {
|
|
||||||
...stats,
|
|
||||||
totalReceived: rows.length,
|
|
||||||
webhookUrl: finalUrl,
|
|
||||||
};
|
|
||||||
if (region && (region.lat != null || region.lon != null || region.lng != null || region.radio != null)) {
|
|
||||||
out.region = {
|
|
||||||
lat: region.lat ?? null,
|
|
||||||
lon: region.lon ?? region.lng ?? null,
|
|
||||||
radio: region.radio ?? null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
/**
|
|
||||||
* CLI: pull pharmacies from webhook and insert into database.sqlite
|
|
||||||
*
|
|
||||||
* npm run import-farmacias
|
|
||||||
* FARMACIAS_WEBHOOK_URL=https://... npm run import-farmacias
|
|
||||||
*
|
|
||||||
* Region (adds ?lat=&lon=&radio= in metres), e.g. your city:
|
|
||||||
* node import-farmacias.js --lat 41.5631 --lon 2.0038 --radio 1500
|
|
||||||
* 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
|
|
||||||
*/
|
|
||||||
|
|
||||||
import sqlite3 from 'sqlite3';
|
|
||||||
import { promisify } from 'util';
|
|
||||||
import path from 'path';
|
|
||||||
import { fileURLToPath } from 'url';
|
|
||||||
import {
|
|
||||||
runFarmaciaWebhookImport,
|
|
||||||
DEFAULT_FARMACIAS_WEBHOOK,
|
|
||||||
} from './farmacias-webhook-import.js';
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
|
||||||
const __dirname = path.dirname(__filename);
|
|
||||||
|
|
||||||
const dbPath = path.join(__dirname, 'database.sqlite');
|
|
||||||
const db = new sqlite3.Database(dbPath);
|
|
||||||
|
|
||||||
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 });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const dbGet = promisify(db.get.bind(db));
|
|
||||||
|
|
||||||
function parseCli(argv) {
|
|
||||||
const region = {};
|
|
||||||
const positional = [];
|
|
||||||
for (let i = 2; i < argv.length; i++) {
|
|
||||||
const a = argv[i];
|
|
||||||
if (a === '--lat' && argv[i + 1] != null) {
|
|
||||||
region.lat = argv[++i];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if ((a === '--lon' || a === '--lng') && argv[i + 1] != null) {
|
|
||||||
region.lon = argv[++i];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (a === '--radio' && argv[i + 1] != null) {
|
|
||||||
region.radio = argv[++i];
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (a.startsWith('--')) {
|
|
||||||
console.warn('Unknown flag:', a);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
positional.push(a);
|
|
||||||
}
|
|
||||||
if (process.env.FARMACIAS_IMPORT_LAT && region.lat == null) region.lat = process.env.FARMACIAS_IMPORT_LAT;
|
|
||||||
if (process.env.FARMACIAS_IMPORT_LON && region.lon == null) region.lon = process.env.FARMACIAS_IMPORT_LON;
|
|
||||||
if (process.env.FARMACIAS_IMPORT_RADIO && region.radio == null) {
|
|
||||||
region.radio = process.env.FARMACIAS_IMPORT_RADIO;
|
|
||||||
}
|
|
||||||
const url = positional[0] || DEFAULT_FARMACIAS_WEBHOOK;
|
|
||||||
const hasRegion =
|
|
||||||
region.lat != null || region.lon != null || region.radio != null;
|
|
||||||
return { url, region: hasRegion ? region : null };
|
|
||||||
}
|
|
||||||
|
|
||||||
async function main() {
|
|
||||||
const { url, region } = parseCli(process.argv);
|
|
||||||
console.log('Fetching pharmacies from:', url);
|
|
||||||
if (region) console.log('Region query:', region);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const result = await runFarmaciaWebhookImport(dbGet, dbRun, url, region);
|
|
||||||
console.log('Done.');
|
|
||||||
console.log(' Total rows in response:', result.totalReceived);
|
|
||||||
console.log(' Inserted:', result.inserted);
|
|
||||||
console.log(' Skipped (duplicate name+address):', result.skipped);
|
|
||||||
console.log(' Invalid (missing name or address):', result.invalid);
|
|
||||||
if (result.errors.length) {
|
|
||||||
console.log(' Row errors:', result.errors.length);
|
|
||||||
console.log(result.errors.slice(0, 5));
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
console.error('Import failed:', e.message);
|
|
||||||
if (e.message.includes('Unused Respond to Webhook')) {
|
|
||||||
console.error(
|
|
||||||
'\n Hint: In n8n, connect the Webhook to a single "Respond to Webhook" node, or remove unused ones.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
process.exitCode = 1;
|
|
||||||
} finally {
|
|
||||||
db.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
main();
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
export default {
|
|
||||||
testEnvironment: 'node',
|
|
||||||
transform: {},
|
|
||||||
moduleFileExtensions: ['js', 'json'],
|
|
||||||
testMatch: ['**/__tests__/**/*.test.js'],
|
|
||||||
}
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
import sqlite3 from 'sqlite3';
|
|
||||||
import path from 'path';
|
|
||||||
import { fileURLToPath } from 'url';
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
|
||||||
const __dirname = path.dirname(__filename);
|
|
||||||
|
|
||||||
const dbPath = path.join(__dirname, 'database.sqlite');
|
|
||||||
const db = new sqlite3.Database(dbPath);
|
|
||||||
|
|
||||||
console.log('🔄 Starting database migration...');
|
|
||||||
|
|
||||||
// Promisify database operations
|
|
||||||
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 });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function dbAll(sql, params = []) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
db.all(sql, params, (err, rows) => {
|
|
||||||
if (err) reject(err);
|
|
||||||
else resolve(rows);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function migrate() {
|
|
||||||
try {
|
|
||||||
// Check if old medicines table exists
|
|
||||||
const tables = await dbAll(`
|
|
||||||
SELECT name FROM sqlite_master
|
|
||||||
WHERE type='table' AND name='medicines'
|
|
||||||
`);
|
|
||||||
|
|
||||||
if (tables.length > 0) {
|
|
||||||
console.log('📋 Found old medicines table');
|
|
||||||
|
|
||||||
// Check if we need to migrate pharmacy_medicines
|
|
||||||
const columns = await dbAll(`PRAGMA table_info(pharmacy_medicines)`);
|
|
||||||
const hasMedicineId = columns.some(col => col.name === 'medicine_id');
|
|
||||||
const hasNregistro = columns.some(col => col.name === 'medicine_nregistro');
|
|
||||||
|
|
||||||
if (hasMedicineId && !hasNregistro) {
|
|
||||||
console.log('🔄 Migrating pharmacy_medicines table...');
|
|
||||||
|
|
||||||
// Create new table with updated schema
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE pharmacy_medicines_new (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
pharmacy_id INTEGER NOT NULL,
|
|
||||||
medicine_nregistro TEXT NOT NULL,
|
|
||||||
medicine_name TEXT,
|
|
||||||
price REAL,
|
|
||||||
stock INTEGER DEFAULT 0,
|
|
||||||
FOREIGN KEY (pharmacy_id) REFERENCES pharmacies(id),
|
|
||||||
UNIQUE(pharmacy_id, medicine_nregistro)
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
console.log('✅ Created new pharmacy_medicines table');
|
|
||||||
|
|
||||||
// Copy data if any exists (though it will be invalid without nregistro)
|
|
||||||
const oldData = await dbAll('SELECT * FROM pharmacy_medicines');
|
|
||||||
console.log(`📦 Found ${oldData.length} old pharmacy-medicine relationships`);
|
|
||||||
|
|
||||||
if (oldData.length > 0) {
|
|
||||||
console.log('⚠️ Warning: Old medicine relationships will be lost.');
|
|
||||||
console.log(' You will need to re-link medicines using the CIMA database.');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Drop old table
|
|
||||||
await dbRun('DROP TABLE pharmacy_medicines');
|
|
||||||
|
|
||||||
// Rename new table
|
|
||||||
await dbRun('ALTER TABLE pharmacy_medicines_new RENAME TO pharmacy_medicines');
|
|
||||||
|
|
||||||
console.log('✅ Migrated pharmacy_medicines table');
|
|
||||||
} else if (hasNregistro) {
|
|
||||||
console.log('✅ pharmacy_medicines table already migrated');
|
|
||||||
}
|
|
||||||
|
|
||||||
// We can keep the old medicines table for reference, or drop it
|
|
||||||
console.log('ℹ️ Old medicines table can be kept for reference or deleted manually');
|
|
||||||
console.log(' To delete: sqlite3 database.sqlite "DROP TABLE IF EXISTS medicines;"');
|
|
||||||
} else {
|
|
||||||
console.log('✅ No old medicines table found - creating new schema');
|
|
||||||
|
|
||||||
// Create pharmacy_medicines table with new schema
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE IF NOT EXISTS pharmacy_medicines (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
pharmacy_id INTEGER NOT NULL,
|
|
||||||
medicine_nregistro TEXT NOT NULL,
|
|
||||||
medicine_name TEXT,
|
|
||||||
price REAL,
|
|
||||||
stock INTEGER DEFAULT 0,
|
|
||||||
FOREIGN KEY (pharmacy_id) REFERENCES pharmacies(id),
|
|
||||||
UNIQUE(pharmacy_id, medicine_nregistro)
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
console.log('✅ Created pharmacy_medicines table');
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('');
|
|
||||||
console.log('✨ Migration completed successfully!');
|
|
||||||
console.log('');
|
|
||||||
console.log('Next steps:');
|
|
||||||
console.log('1. Install Redis: brew install redis (macOS) or apt-get install redis-server (Linux)');
|
|
||||||
console.log('2. Start Redis: redis-server');
|
|
||||||
console.log('3. Install dependencies: npm install');
|
|
||||||
console.log('4. Start the server: npm start');
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('❌ Migration failed:', error);
|
|
||||||
process.exit(1);
|
|
||||||
} finally {
|
|
||||||
db.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
migrate();
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "farma-clic-backend",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"description": "Backend API for FarmaClic",
|
|
||||||
"main": "server.js",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"start": "node --env-file-if-exists=.env server.js",
|
|
||||||
"dev": "node --env-file-if-exists=.env --watch server.js",
|
|
||||||
"seed": "node seed.js",
|
|
||||||
"create-admin": "node create-admin.js",
|
|
||||||
"migrate": "node migrate.js",
|
|
||||||
"reset-db": "bash reset-db.sh",
|
|
||||||
"import-farmacias": "node import-farmacias.js",
|
|
||||||
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --forceExit"
|
|
||||||
},
|
|
||||||
"keywords": [],
|
|
||||||
"author": "",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@opentelemetry/api": "^1.9.0",
|
|
||||||
"@opentelemetry/auto-instrumentations-node": "^0.52.0",
|
|
||||||
"@opentelemetry/exporter-logs-otlp-grpc": "^0.55.0",
|
|
||||||
"@opentelemetry/exporter-trace-otlp-grpc": "^0.55.0",
|
|
||||||
"@opentelemetry/instrumentation-pino": "^0.45.0",
|
|
||||||
"@opentelemetry/resources": "^1.28.0",
|
|
||||||
"@opentelemetry/sdk-logs": "^0.55.0",
|
|
||||||
"@opentelemetry/sdk-node": "^0.55.0",
|
|
||||||
"@opentelemetry/sdk-trace-base": "^1.28.0",
|
|
||||||
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
||||||
"axios": "^1.6.0",
|
|
||||||
"barcode-detector": "^3.2.0",
|
|
||||||
"bcrypt": "^5.1.1",
|
|
||||||
"connect-pg-simple": "^10.0.0",
|
|
||||||
"connect-sqlite3": "^0.9.16",
|
|
||||||
"cors": "^2.8.5",
|
|
||||||
"express": "^4.18.2",
|
|
||||||
"express-rate-limit": "^8.5.2",
|
|
||||||
"express-session": "^1.17.3",
|
|
||||||
"multer": "^2.2.0",
|
|
||||||
"pg": "^8.13.0",
|
|
||||||
"pino": "^9.4.0",
|
|
||||||
"pino-http": "^10.3.0",
|
|
||||||
"redis": "^4.6.0",
|
|
||||||
"sqlite3": "^5.1.6",
|
|
||||||
"tesseract.js": "^7.0.0",
|
|
||||||
"web-push": "^3.6.7"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"jest": "^29.7.0",
|
|
||||||
"supertest": "^7.2.2"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import { createClient } from 'redis';
|
|
||||||
|
|
||||||
// Create Redis client
|
|
||||||
const redisClient = createClient({
|
|
||||||
socket: {
|
|
||||||
host: process.env.REDIS_HOST || 'localhost',
|
|
||||||
port: process.env.REDIS_PORT || 6379
|
|
||||||
},
|
|
||||||
password: process.env.REDIS_PASSWORD || undefined
|
|
||||||
});
|
|
||||||
|
|
||||||
// Error handler
|
|
||||||
redisClient.on('error', (err) => {
|
|
||||||
console.error('Redis Client Error:', err);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Connection handler
|
|
||||||
redisClient.on('connect', () => {
|
|
||||||
console.log('✅ Connected to Redis');
|
|
||||||
});
|
|
||||||
|
|
||||||
// Connect to Redis
|
|
||||||
await redisClient.connect();
|
|
||||||
|
|
||||||
export default redisClient;
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo "🔄 FarmaClic - Quick Database Reset"
|
|
||||||
echo "===================================="
|
|
||||||
echo ""
|
|
||||||
echo "Este script eliminará la base de datos actual y creará una nueva."
|
|
||||||
echo "⚠️ ADVERTENCIA: Todos los datos actuales se perderán."
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
read -p "¿Continuar? (s/n): " -n 1 -r
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
if [[ ! $REPLY =~ ^[Ss]$ ]]
|
|
||||||
then
|
|
||||||
echo "Operación cancelada."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "1️⃣ Eliminando base de datos antigua..."
|
|
||||||
rm -f database.sqlite
|
|
||||||
|
|
||||||
echo "2️⃣ Creando nueva base de datos con estructura actualizada..."
|
|
||||||
node seed.js
|
|
||||||
|
|
||||||
echo "3️⃣ Creando usuario administrador..."
|
|
||||||
node create-admin.js
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "✅ ¡Listo! Base de datos reiniciada con éxito."
|
|
||||||
echo ""
|
|
||||||
echo "Próximos pasos:"
|
|
||||||
echo "1. Asegúrate de que Redis esté corriendo: redis-server"
|
|
||||||
echo "2. Inicia el servidor: npm start"
|
|
||||||
echo ""
|
|
||||||
@@ -1,171 +0,0 @@
|
|||||||
import sqlite3 from 'sqlite3';
|
|
||||||
import { promisify } from 'util';
|
|
||||||
import path from 'path';
|
|
||||||
import { fileURLToPath } from 'url';
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
|
||||||
const __dirname = path.dirname(__filename);
|
|
||||||
|
|
||||||
const dbPath = path.join(__dirname, 'database.sqlite');
|
|
||||||
const db = new sqlite3.Database(dbPath);
|
|
||||||
|
|
||||||
// Custom wrapper to get lastID from db.run
|
|
||||||
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 });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const dbGet = promisify(db.get.bind(db));
|
|
||||||
|
|
||||||
// Initialize database tables
|
|
||||||
async function initDatabase() {
|
|
||||||
try {
|
|
||||||
// Create pharmacies table
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE IF NOT EXISTS pharmacies (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
address TEXT NOT NULL,
|
|
||||||
phone TEXT,
|
|
||||||
latitude REAL,
|
|
||||||
longitude REAL
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
// Create medicines table
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE IF NOT EXISTS medicines (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
name TEXT NOT NULL,
|
|
||||||
active_ingredient TEXT,
|
|
||||||
dosage TEXT,
|
|
||||||
form TEXT
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
// Create junction table for pharmacy-medicine relationships
|
|
||||||
// Ahora usa nregistro (número de registro de CIMA) en lugar de medicine_id local
|
|
||||||
await dbRun(`
|
|
||||||
CREATE TABLE IF NOT EXISTS pharmacy_medicines (
|
|
||||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
||||||
pharmacy_id INTEGER NOT NULL,
|
|
||||||
medicine_nregistro TEXT NOT NULL,
|
|
||||||
medicine_name TEXT,
|
|
||||||
price REAL,
|
|
||||||
stock INTEGER DEFAULT 0,
|
|
||||||
FOREIGN KEY (pharmacy_id) REFERENCES pharmacies(id),
|
|
||||||
UNIQUE(pharmacy_id, medicine_nregistro)
|
|
||||||
)
|
|
||||||
`);
|
|
||||||
|
|
||||||
// Create indexes for better search performance
|
|
||||||
await dbRun(`CREATE INDEX IF NOT EXISTS idx_medicine_name ON medicines(name)`);
|
|
||||||
await dbRun(`CREATE INDEX IF NOT EXISTS idx_pharmacy_medicine ON pharmacy_medicines(medicine_nregistro)`);
|
|
||||||
|
|
||||||
console.log('Database tables initialized');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error initializing database:', error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sample data
|
|
||||||
const pharmacies = [
|
|
||||||
{ name: 'Farmacia Central', address: 'Av. Principal 123, Ciudad', phone: '+34 123 456 789', lat: 40.4168, lng: -3.7038 },
|
|
||||||
{ name: 'Farmacia San José', address: 'Calle Mayor 45, Ciudad', phone: '+34 987 654 321', lat: 40.4178, lng: -3.7048 },
|
|
||||||
{ name: 'Farmacia del Sol', address: 'Plaza del Sol 12, Ciudad', phone: '+34 555 123 456', lat: 40.4158, lng: -3.7028 },
|
|
||||||
{ name: 'Farmacia Salud', address: 'Calle Salud 78, Ciudad', phone: '+34 666 789 012', lat: 40.4188, lng: -3.7058 },
|
|
||||||
{ name: 'Farmacia 24h', address: 'Av. Libertad 234, Ciudad', phone: '+34 777 345 678', lat: 40.4148, lng: -3.7018 },
|
|
||||||
];
|
|
||||||
|
|
||||||
const medicines = [
|
|
||||||
{ name: 'Paracetamol 500mg', active_ingredient: 'Paracetamol', dosage: '500mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Ibuprofeno 600mg', active_ingredient: 'Ibuprofeno', dosage: '600mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Aspirina 100mg', active_ingredient: 'Ácido Acetilsalicílico', dosage: '100mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Amoxicilina 500mg', active_ingredient: 'Amoxicilina', dosage: '500mg', form: 'Cápsulas' },
|
|
||||||
{ name: 'Omeprazol 20mg', active_ingredient: 'Omeprazol', dosage: '20mg', form: 'Cápsulas' },
|
|
||||||
{ name: 'Loratadina 10mg', active_ingredient: 'Loratadina', dosage: '10mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Diclofenaco 50mg', active_ingredient: 'Diclofenaco', dosage: '50mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Metformina 850mg', active_ingredient: 'Metformina', dosage: '850mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Atorvastatina 20mg', active_ingredient: 'Atorvastatina', dosage: '20mg', form: 'Tabletas' },
|
|
||||||
{ name: 'Losartán 50mg', active_ingredient: 'Losartán', dosage: '50mg', form: 'Tabletas' },
|
|
||||||
];
|
|
||||||
|
|
||||||
async function seedDatabase() {
|
|
||||||
try {
|
|
||||||
console.log('Starting database seeding...');
|
|
||||||
|
|
||||||
// Initialize database tables first
|
|
||||||
await initDatabase();
|
|
||||||
|
|
||||||
// Clear existing data
|
|
||||||
await dbRun('DELETE FROM pharmacy_medicines');
|
|
||||||
await dbRun('DELETE FROM medicines');
|
|
||||||
await dbRun('DELETE FROM pharmacies');
|
|
||||||
|
|
||||||
// Insert pharmacies
|
|
||||||
const pharmacyIds = [];
|
|
||||||
for (const pharmacy of pharmacies) {
|
|
||||||
const result = await dbRun(
|
|
||||||
'INSERT INTO pharmacies (name, address, phone, latitude, longitude) VALUES (?, ?, ?, ?, ?)',
|
|
||||||
[pharmacy.name, pharmacy.address, pharmacy.phone, pharmacy.lat, pharmacy.lng]
|
|
||||||
);
|
|
||||||
pharmacyIds.push(result.lastID);
|
|
||||||
}
|
|
||||||
console.log(`Inserted ${pharmacyIds.length} pharmacies`);
|
|
||||||
|
|
||||||
// Insert medicines
|
|
||||||
const medicineIds = [];
|
|
||||||
for (const medicine of medicines) {
|
|
||||||
const result = await dbRun(
|
|
||||||
'INSERT INTO medicines (name, active_ingredient, dosage, form) VALUES (?, ?, ?, ?)',
|
|
||||||
[medicine.name, medicine.active_ingredient, medicine.dosage, medicine.form]
|
|
||||||
);
|
|
||||||
medicineIds.push(result.lastID);
|
|
||||||
}
|
|
||||||
console.log(`Inserted ${medicineIds.length} medicines`);
|
|
||||||
|
|
||||||
// Create pharmacy-medicine relationships
|
|
||||||
// Each medicine is available in 2-4 random pharmacies with random prices
|
|
||||||
let relationshipCount = 0;
|
|
||||||
for (let i = 0; i < medicineIds.length; i++) {
|
|
||||||
const medicineId = medicineIds[i];
|
|
||||||
const numPharmacies = Math.floor(Math.random() * 3) + 2; // 2-4 pharmacies
|
|
||||||
const selectedPharmacies = new Set();
|
|
||||||
|
|
||||||
while (selectedPharmacies.size < numPharmacies) {
|
|
||||||
selectedPharmacies.add(Math.floor(Math.random() * pharmacyIds.length));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const pharmacyIndex of selectedPharmacies) {
|
|
||||||
const pharmacyId = pharmacyIds[pharmacyIndex];
|
|
||||||
const price = (Math.random() * 20 + 5).toFixed(2); // Random price between 5-25
|
|
||||||
const stock = Math.floor(Math.random() * 50) + 10; // Random stock 10-60
|
|
||||||
|
|
||||||
// NOTA: Como ahora usamos CIMA API, este seed solo crea ejemplos
|
|
||||||
// En producción, deberías vincular usando nregistros reales de CIMA
|
|
||||||
const medicine = medicines[i];
|
|
||||||
await dbRun(
|
|
||||||
'INSERT INTO pharmacy_medicines (pharmacy_id, medicine_nregistro, medicine_name, price, stock) VALUES (?, ?, ?, ?, ?)',
|
|
||||||
[pharmacyId, `EXAMPLE_${medicineId}`, medicine.name, price, stock]
|
|
||||||
);
|
|
||||||
relationshipCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
console.log(`Created ${relationshipCount} pharmacy-medicine relationships`);
|
|
||||||
console.log('⚠️ NOTA: Los medicamentos de ejemplo usan IDs ficticios.');
|
|
||||||
|
|
||||||
console.log('Database seeding completed successfully!');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error seeding database:', error);
|
|
||||||
} finally {
|
|
||||||
db.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
seedDatabase();
|
|
||||||
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
// OpenTelemetry Node SDK bootstrap for FarmaClic backend.
|
|
||||||
// Started as a side-effect import from server.js (ESM).
|
|
||||||
//
|
|
||||||
// Env vars (set by docker-compose):
|
|
||||||
// OTEL_SERVICE_NAME — default: farmaclic-backend
|
|
||||||
// OTEL_EXPORTER_OTLP_ENDPOINT — OTLP gRPC endpoint (e.g. http://alloy:4317)
|
|
||||||
//
|
|
||||||
// Exports traces to the shared Grafana Alloy collector, where they are
|
|
||||||
// routed to Tempo.
|
|
||||||
|
|
||||||
import { NodeSDK } from '@opentelemetry/sdk-node';
|
|
||||||
import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
|
|
||||||
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
|
|
||||||
import * as resources from '@opentelemetry/resources';
|
|
||||||
import { ATTR_SERVICE_NAME, ATTR_SERVICE_NAMESPACE } from '@opentelemetry/semantic-conventions';
|
|
||||||
import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
|
|
||||||
|
|
||||||
const serviceName = process.env.OTEL_SERVICE_NAME || 'farmaclic-backend';
|
|
||||||
const otlpEndpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || 'http://localhost:4317';
|
|
||||||
|
|
||||||
const resource = typeof resources.resourceFromAttributes === 'function'
|
|
||||||
? resources.resourceFromAttributes({
|
|
||||||
[ATTR_SERVICE_NAME]: serviceName,
|
|
||||||
[ATTR_SERVICE_NAMESPACE]: 'farmaclic',
|
|
||||||
})
|
|
||||||
: new resources.Resource({
|
|
||||||
[ATTR_SERVICE_NAME]: serviceName,
|
|
||||||
[ATTR_SERVICE_NAMESPACE]: 'farmaclic',
|
|
||||||
});
|
|
||||||
|
|
||||||
const sdk = new NodeSDK({
|
|
||||||
resource,
|
|
||||||
traceExporter: new OTLPTraceExporter({ url: otlpEndpoint }),
|
|
||||||
instrumentations: [
|
|
||||||
getNodeAutoInstrumentations({
|
|
||||||
// Disable fs by default — it is noisy and rarely useful.
|
|
||||||
'@opentelemetry/instrumentation-fs': { enabled: false },
|
|
||||||
'@opentelemetry/instrumentation-dns': { enabled: false },
|
|
||||||
}),
|
|
||||||
new PinoInstrumentation(),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
if (process.env.NODE_ENV !== 'test') {
|
|
||||||
sdk.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
const shutdown = async () => {
|
|
||||||
try {
|
|
||||||
if (process.env.NODE_ENV !== 'test') {
|
|
||||||
await sdk.shutdown();
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error('OpenTelemetry shutdown failed', err);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
process.on('SIGTERM', shutdown);
|
|
||||||
process.on('SIGINT', shutdown);
|
|
||||||
@@ -17,10 +17,10 @@ services:
|
|||||||
image: git.hacecalor.net/ichitux/farmafinder-backend:latest
|
image: git.hacecalor.net/ichitux/farmafinder-backend:latest
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: backend/Dockerfile
|
dockerfile: apps/backend/Dockerfile
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file:
|
env_file:
|
||||||
- ./backend/.env
|
- ./apps/backend/.env
|
||||||
ports:
|
ports:
|
||||||
- "3001:3001"
|
- "3001:3001"
|
||||||
environment:
|
environment:
|
||||||
@@ -49,7 +49,7 @@ services:
|
|||||||
frontend:
|
frontend:
|
||||||
image: git.hacecalor.net/ichitux/farmafinder-frontend:latest
|
image: git.hacecalor.net/ichitux/farmafinder-frontend:latest
|
||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ./apps/frontend
|
||||||
args:
|
args:
|
||||||
VITE_FARO_ENDPOINT: ${VITE_FARO_ENDPOINT:-http://localhost:4318}
|
VITE_FARO_ENDPOINT: ${VITE_FARO_ENDPOINT:-http://localhost:4318}
|
||||||
VITE_FARO_APP_NAME: ${VITE_FARO_APP_NAME:-farmafinder-frontend}
|
VITE_FARO_APP_NAME: ${VITE_FARO_APP_NAME:-farmafinder-frontend}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"enabledPlugins": {
|
|
||||||
"expo@claude-plugins-official": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# FarmaFinder Mobile - Environment Variables
|
|
||||||
|
|
||||||
# API Configuration
|
|
||||||
# Change this to your production API URL
|
|
||||||
EXPO_PUBLIC_API_URL=http://localhost:3001/api
|
|
||||||
|
|
||||||
# For production builds, update this to:
|
|
||||||
# EXPO_PUBLIC_API_URL=https://api.yourdomain.com/api
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
# Expo
|
|
||||||
.expo/
|
|
||||||
dist/
|
|
||||||
web-build/
|
|
||||||
|
|
||||||
# Native
|
|
||||||
ios/
|
|
||||||
android/
|
|
||||||
*.jks
|
|
||||||
*.p8
|
|
||||||
*.p12
|
|
||||||
*.key
|
|
||||||
*.mobileprovision
|
|
||||||
*.orig.*
|
|
||||||
|
|
||||||
# Metro
|
|
||||||
.metro-health-check*
|
|
||||||
|
|
||||||
# debug
|
|
||||||
npm-debug.*
|
|
||||||
yarn-debug.*
|
|
||||||
yarn-error.*
|
|
||||||
|
|
||||||
# env files
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.production
|
|
||||||
|
|
||||||
# EAS
|
|
||||||
eas-cli.json
|
|
||||||
|
|
||||||
# Dependencies
|
|
||||||
node_modules/
|
|
||||||
|
|
||||||
# OS
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Build artifacts
|
|
||||||
*.apk
|
|
||||||
*.aab
|
|
||||||
*.ipa
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# Expo HAS CHANGED
|
|
||||||
|
|
||||||
Read the exact versioned docs at https://docs.expo.dev/versions/v57.0.0/ before writing any code.
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
import { StatusBar } from 'expo-status-bar';
|
|
||||||
import { StyleSheet, Text, View } from 'react-native';
|
|
||||||
|
|
||||||
export default function App() {
|
|
||||||
return (
|
|
||||||
<View style={styles.container}>
|
|
||||||
<Text>Open up App.tsx to start working on your app!</Text>
|
|
||||||
<StatusBar style="auto" />
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
|
||||||
container: {
|
|
||||||
flex: 1,
|
|
||||||
backgroundColor: '#fff',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
@AGENTS.md
|
|
||||||