Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dcb9174408 |
@@ -4,7 +4,7 @@ android {
|
||||
namespace = "io.ionic.starter"
|
||||
compileSdk = rootProject.ext.compileSdkVersion
|
||||
defaultConfig {
|
||||
applicationId "io.ionic.starter"
|
||||
applicationId "com.habitmode.llemba.com"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 1
|
||||
|
||||
@@ -21,6 +21,12 @@
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="io.flavorstudio.app" />
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="app_name">bringg</string>
|
||||
<string name="title_activity_main">bringg</string>
|
||||
<string name="app_name">FlavorStudio</string>
|
||||
<string name="title_activity_main">FlavorStudio</string>
|
||||
<string name="package_name">io.ionic.starter</string>
|
||||
<string name="custom_url_scheme">io.ionic.starter</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import type { CapacitorConfig } from '@capacitor/cli';
|
||||
|
||||
const config: CapacitorConfig = {
|
||||
appId: 'com.bringg.app',
|
||||
appName: 'bringg',
|
||||
appId: 'com.habitmode.llemba.com',
|
||||
appName: 'FlavorStudio',
|
||||
webDir: 'dist',
|
||||
plugins: {
|
||||
FirebaseAuthentication: {
|
||||
|
||||
@@ -55,6 +55,13 @@ workflows:
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
echo "$CM_DEBUG_KEYSTORE" | base64 --decode > /tmp/debug-keystore.p12
|
||||
fi
|
||||
- name: Check native credentials
|
||||
script: |
|
||||
if [ -n "$VITE_GOOGLE_MAPS_KEY" ]; then
|
||||
echo "VITE_GOOGLE_MAPS_KEY: set (length=${#VITE_GOOGLE_MAPS_KEY}, ends …${VITE_GOOGLE_MAPS_KEY: -4})"
|
||||
else
|
||||
echo "WARNING: VITE_GOOGLE_MAPS_KEY not set — Google Maps will not render"
|
||||
fi
|
||||
- name: Build debug APK
|
||||
script: |
|
||||
cd android
|
||||
@@ -68,6 +75,21 @@ workflows:
|
||||
else
|
||||
./gradlew assembleDebug --no-daemon
|
||||
fi
|
||||
- name: Verify manifest substitution
|
||||
script: |
|
||||
MANIFEST="android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml"
|
||||
if [ -f "$MANIFEST" ]; then
|
||||
VAL=$(grep -A1 'geo.API_KEY' "$MANIFEST" | grep -o 'android:value="[^"]*"' | cut -d'"' -f2)
|
||||
if [ -z "$VAL" ]; then
|
||||
echo "WARNING: geo.API_KEY meta-data not found in merged manifest"
|
||||
elif [ "$VAL" = '${googleMapsApiKey}' ]; then
|
||||
echo "WARNING: geo.API_KEY placeholder was not substituted — key missing from build env"
|
||||
else
|
||||
echo "geo.API_KEY substituted OK (ends …${VAL: -4})"
|
||||
fi
|
||||
else
|
||||
echo "Merged manifest not found at $MANIFEST"
|
||||
fi
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/debug/app-debug.apk
|
||||
|
||||
@@ -239,36 +261,25 @@ workflows:
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
# cap sync ios must run before Firebase config is written so that CapApp-SPM/Package.swift
|
||||
# is regenerated with the correct plugin list first. The Firebase plist is written
|
||||
# afterwards and a second sync re-runs to ensure everything is consistent.
|
||||
# First sync: regenerates CapApp-SPM/Package.swift with the correct plugin list.
|
||||
# Note: this project uses Capacitor SPM (no CocoaPods/Podfile), so cap sync replaces
|
||||
# pod install — it regenerates CapApp-SPM/Package.swift and copies web assets.
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
# GoogleService-Info.plist is injected as a base64 env var. The Ruby snippet adds the
|
||||
# file reference to the Xcode project if it isn't already there, so Xcode includes it
|
||||
# in the app bundle at build time.
|
||||
# Decode Firebase plist to disk so it is present during the second sync.
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
# Second sync ensures CapApp-SPM/Package.swift reflects any plugin changes made during
|
||||
# the Firebase config step and keeps the package graph in a consistent state.
|
||||
# Second sync ensures CapApp-SPM/Package.swift is consistent after the plist write.
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
# Run configure_xcode.rb after both syncs so its xcodeproj changes (plist file
|
||||
# reference + SPM product linking) are not overwritten by a subsequent cap sync.
|
||||
# configure_xcode.rb is stamped fresh from template on every build push.
|
||||
- name: Configure Xcode project
|
||||
script: ruby configure_xcode.rb
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
@@ -337,24 +348,15 @@ workflows:
|
||||
script: npm run build
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Write Firebase config
|
||||
- name: Configure Xcode project
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Configure Xcode project
|
||||
script: ruby configure_xcode.rb
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
#!/usr/bin/env ruby
|
||||
# configure_xcode.rb — stamped fresh from template on every build (see gitea.service.ts)
|
||||
#
|
||||
# 1. Adds GoogleService-Info.plist to the Xcode target if present (xcodeproj gem)
|
||||
# 2. Scans Swift sources for Firebase imports and injects matching products into
|
||||
# CapApp-SPM/Package.swift — the correct approach for Capacitor SPM projects
|
||||
# where all native linking goes through CapApp-SPM, not App.xcodeproj directly.
|
||||
|
||||
require 'xcodeproj'
|
||||
|
||||
PROJECT_PATH = 'ios/App/App.xcodeproj'
|
||||
TARGET_NAME = 'App'
|
||||
PLIST_SRC = 'ios/App/App/GoogleService-Info.plist'
|
||||
CAP_APP_SPM = 'ios/App/CapApp-SPM/Package.swift'
|
||||
|
||||
# ── 1. GoogleService-Info.plist ───────────────────────────────────────────────
|
||||
if File.exist?(PLIST_SRC)
|
||||
project = Xcodeproj::Project.open(PROJECT_PATH)
|
||||
target = project.targets.find { |t| t.name == TARGET_NAME }
|
||||
if target
|
||||
app_group = project.main_group['App']
|
||||
unless app_group&.files&.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
puts "Added GoogleService-Info.plist to target"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# ── 2. Scan Swift sources for Firebase imports ────────────────────────────────
|
||||
swift_files = Dir['ios/App/App/**/*.swift']
|
||||
firebase_imports = swift_files
|
||||
.flat_map { |f| File.readlines(f) rescue [] }
|
||||
.grep(/^\s*import\s+Firebase\w+/)
|
||||
.map { |l| l.strip.split(/\s+/).last }
|
||||
.uniq
|
||||
.sort
|
||||
|
||||
if firebase_imports.empty?
|
||||
puts "No Firebase imports found — skipping CapApp-SPM update"
|
||||
exit 0
|
||||
end
|
||||
|
||||
puts "Firebase imports detected: #{firebase_imports.join(', ')}"
|
||||
|
||||
unless File.exist?(CAP_APP_SPM)
|
||||
warn "WARNING: #{CAP_APP_SPM} not found — was cap sync run?"
|
||||
exit 0
|
||||
end
|
||||
|
||||
# ── 3. Detect firebase-ios-sdk URL and version from node_modules ──────────────
|
||||
# Read from the ACTUAL node_modules on this build machine (populated by npm install)
|
||||
# so the version we inject matches what @capacitor-firebase/* already resolved.
|
||||
firebase_url = nil
|
||||
firebase_version = nil
|
||||
|
||||
Dir['node_modules/@capacitor-firebase/**/Package.swift',
|
||||
'node_modules/@capacitor/push-notifications/**/Package.swift'].each do |f|
|
||||
content = File.read(f) rescue next
|
||||
url_m = content.match(/\.package\(url:\s*"(https:\/\/github\.com\/firebase\/firebase-ios-sdk[^"]*)"/)
|
||||
ver_m = content.match(/firebase-ios-sdk[^)]+from:\s*"(\d+)\.(\d+)\.(\d+)"/)
|
||||
next unless url_m && ver_m
|
||||
|
||||
firebase_url = url_m[1]
|
||||
major = ver_m[1].to_i
|
||||
firebase_version = "#{major}.0.0"
|
||||
puts "Detected firebase-ios-sdk from #{f}: url=#{firebase_url} → using from: \"#{firebase_version}\""
|
||||
break
|
||||
end
|
||||
|
||||
# Fallback — should rarely be needed
|
||||
unless firebase_url
|
||||
firebase_url = 'https://github.com/firebase/firebase-ios-sdk.git'
|
||||
firebase_version = '11.0.0'
|
||||
puts "Could not detect firebase-ios-sdk version from node_modules — using fallback #{firebase_version}"
|
||||
end
|
||||
|
||||
firebase_pkg = 'firebase-ios-sdk'
|
||||
|
||||
lines = File.read(CAP_APP_SPM).split("\n")
|
||||
|
||||
# ── 4. Inject firebase-ios-sdk as a direct package dependency if missing ──────
|
||||
# Normalise URL check to handle both with and without .git suffix
|
||||
firebase_url_base = firebase_url.sub(/\.git$/, '')
|
||||
unless lines.any? { |l| l.include?(firebase_url_base) }
|
||||
last_pkg_idx = lines.rindex { |l| l.include?('.package(') }
|
||||
if last_pkg_idx
|
||||
lines[last_pkg_idx] = lines[last_pkg_idx].rstrip
|
||||
lines[last_pkg_idx] += ',' unless lines[last_pkg_idx].end_with?(',')
|
||||
lines.insert(last_pkg_idx + 1,
|
||||
" .package(url: \"#{firebase_url}\", from: \"#{firebase_version}\")")
|
||||
puts "Added #{firebase_pkg} to CapApp-SPM package dependencies"
|
||||
else
|
||||
warn "WARNING: no .package( line found in #{CAP_APP_SPM} — cannot inject dependency"
|
||||
end
|
||||
end
|
||||
|
||||
# ── 5. Inject each detected product into the target dependencies if missing ───
|
||||
firebase_imports.each do |product|
|
||||
next if product == 'Firebase' # umbrella import — not a linkable SPM product
|
||||
|
||||
product_str = ".product(name: \"#{product}\", package: \"#{firebase_pkg}\")"
|
||||
next if lines.any? { |l| l.include?(product_str) }
|
||||
|
||||
last_prod_idx = lines.rindex { |l| l.include?('.product(') }
|
||||
if last_prod_idx
|
||||
lines[last_prod_idx] = lines[last_prod_idx].rstrip
|
||||
lines[last_prod_idx] += ',' unless lines[last_prod_idx].end_with?(',')
|
||||
lines.insert(last_prod_idx + 1, " #{product_str}")
|
||||
puts "Added #{product} to CapApp-SPM target dependencies"
|
||||
else
|
||||
warn "WARNING: no .product( line found in #{CAP_APP_SPM} — cannot inject #{product}"
|
||||
end
|
||||
end
|
||||
|
||||
File.write(CAP_APP_SPM, lines.join("\n"))
|
||||
puts "CapApp-SPM/Package.swift updated"
|
||||
@@ -305,7 +305,7 @@
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.flavorstudio.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||
SWIFT_VERSION = 5.0;
|
||||
@@ -326,7 +326,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.flavorstudio.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||
SWIFT_VERSION = 5.0;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>bringg</string>
|
||||
<string>FlavorStudio</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
@@ -51,10 +51,10 @@
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleURLName</key>
|
||||
<string>com.bringg.app</string>
|
||||
<string>io.flavorstudio.app</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>com.bringg.app</string>
|
||||
<string>io.flavorstudio.app</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
|
||||
@@ -0,0 +1,363 @@
|
||||
workflows:
|
||||
android-debug:
|
||||
name: Android – Debug APK
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
echo "Wrote google-services.json ($(wc -c < android/app/google-services.json) bytes)"
|
||||
else
|
||||
echo "GOOGLE_SERVICES_JSON is empty — skipping"
|
||||
fi
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
echo "Wrote GoogleService-Info.plist ($(wc -c < ios/App/App/GoogleService-Info.plist) bytes)"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up debug keystore
|
||||
script: |
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
echo "$CM_DEBUG_KEYSTORE" | base64 --decode > /tmp/debug-keystore.p12
|
||||
fi
|
||||
- name: Build debug APK
|
||||
script: |
|
||||
cd android
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
./gradlew assembleDebug \
|
||||
-Pandroid.injected.signing.store.file=/tmp/debug-keystore.p12 \
|
||||
-Pandroid.injected.signing.store.password=$CM_DEBUG_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=debug \
|
||||
-Pandroid.injected.signing.key.password=$CM_DEBUG_KEYSTORE_PASSWORD \
|
||||
--no-daemon
|
||||
else
|
||||
./gradlew assembleDebug --no-daemon
|
||||
fi
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/debug/app-debug.apk
|
||||
|
||||
android-release-apk:
|
||||
name: Android – Release APK
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release APK
|
||||
script: |
|
||||
cd android
|
||||
./gradlew assembleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/release/app-release.apk
|
||||
|
||||
android-release-aab:
|
||||
name: Android – Release AAB
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release AAB
|
||||
script: |
|
||||
cd android
|
||||
./gradlew bundleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
artifacts:
|
||||
- android/app/build/outputs/bundle/release/app-release.aab
|
||||
|
||||
android-release:
|
||||
name: Android – Publish to Google Play
|
||||
max_build_duration: 60
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release AAB
|
||||
script: |
|
||||
cd android
|
||||
./gradlew bundleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
publishing:
|
||||
google_play:
|
||||
credentials: $GOOGLE_PLAY_SERVICE_ACCOUNT_CREDENTIALS
|
||||
track: $GOOGLE_PLAY_TRACK
|
||||
submit_as_draft: false
|
||||
artifacts:
|
||||
- android/app/build/outputs/bundle/release/app-release.aab
|
||||
|
||||
ios-debug:
|
||||
name: iOS – Debug IPA
|
||||
max_build_duration: 60
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
xcode: latest
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
if [ -n "$APP_STORE_CONNECT_PRIVATE_KEY" ]; then
|
||||
app-store-connect fetch-signing-files \
|
||||
$(xcode-project detect-bundle-id) \
|
||||
--type IOS_APP_DEVELOPMENT \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--create
|
||||
xcode-project use-profiles
|
||||
elif [ -n "$CM_CERTIFICATE" ]; then
|
||||
echo "$CM_CERTIFICATE" | base64 --decode > /tmp/cert.p12
|
||||
keychain add-certificates \
|
||||
--certificate /tmp/cert.p12 \
|
||||
--certificate-password "$CM_CERTIFICATE_PASSWORD"
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
||||
xcode-project use-profiles
|
||||
else
|
||||
echo "No signing credentials configured — build will fail at signing"
|
||||
exit 1
|
||||
fi
|
||||
- name: Build IPA
|
||||
script: |
|
||||
xcode-project build-ipa \
|
||||
--workspace ios/App/App.xcworkspace \
|
||||
--scheme App
|
||||
artifacts:
|
||||
- build/ios/ipa/*.ipa
|
||||
|
||||
ios-release:
|
||||
name: iOS – Release IPA
|
||||
max_build_duration: 90
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
xcode: latest
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
if [ -n "$APP_STORE_CONNECT_PRIVATE_KEY" ]; then
|
||||
app-store-connect fetch-signing-files \
|
||||
$(xcode-project detect-bundle-id) \
|
||||
--type IOS_APP_STORE \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--create
|
||||
xcode-project use-profiles
|
||||
else
|
||||
echo "$CM_CERTIFICATE" | base64 --decode > /tmp/cert.p12
|
||||
keychain add-certificates \
|
||||
--certificate /tmp/cert.p12 \
|
||||
--certificate-password "$CM_CERTIFICATE_PASSWORD"
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
||||
xcode-project use-profiles
|
||||
fi
|
||||
- name: Build IPA
|
||||
script: |
|
||||
xcode-project build-ipa \
|
||||
--workspace ios/App/App.xcworkspace \
|
||||
--scheme App \
|
||||
--config Release
|
||||
- name: Publish
|
||||
script: |
|
||||
if [ "$SUBMIT_TO_TESTFLIGHT" = "true" ] || [ "$SUBMIT_TO_APP_STORE" = "true" ]; then
|
||||
app-store-connect publish \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--submit-to-testflight=$SUBMIT_TO_TESTFLIGHT \
|
||||
--submit-to-app-store=$SUBMIT_TO_APP_STORE
|
||||
fi
|
||||
artifacts:
|
||||
- build/ios/ipa/*.ipa
|
||||
@@ -11,7 +11,6 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@capacitor-firebase/authentication": "^8.0.0",
|
||||
"firebase": "^11.0.0",
|
||||
"@capacitor/android": "8.3.4",
|
||||
"@capacitor/app": "8.1.0",
|
||||
"@capacitor/core": "8.3.4",
|
||||
@@ -22,15 +21,16 @@
|
||||
"@capacitor/push-notifications": "^8.1.1",
|
||||
"@capacitor/status-bar": "8.0.2",
|
||||
"@ionic/pwa-elements": "^3.0.0",
|
||||
"@ionic/react": "^8.5.0",
|
||||
"@ionic/react-router": "^8.5.0",
|
||||
"@ionic/react": "8.8.7",
|
||||
"@ionic/react-router": "8.8.7",
|
||||
"@supabase/supabase-js": "^2.0.0",
|
||||
"firebase": "^11.0.0",
|
||||
"ionicons": "^7.4.0",
|
||||
"katex": "^0.16.0",
|
||||
"react": "18.2.0",
|
||||
"react-dom": "18.2.0",
|
||||
"react-hook-form": "^7.54.0",
|
||||
"react-katex": "^3.0.1",
|
||||
"@supabase/supabase-js": "^2.0.0",
|
||||
"react-router": "^5.3.4",
|
||||
"react-router-dom": "^5.3.4",
|
||||
"zod": "^3.24.0",
|
||||
|
||||
@@ -17,41 +17,16 @@ import '@ionic/react/css/display.css';
|
||||
import './theme/variables.css';
|
||||
|
||||
import Home from './pages/Home';
|
||||
import ProductDetail from './pages/ProductDetail';
|
||||
import Cart from './pages/Cart';
|
||||
import OrderConfirmation from './pages/OrderConfirmation';
|
||||
import MyOrders from './pages/MyOrders';
|
||||
import OrderDetail from './pages/OrderDetail';
|
||||
import Auth from './pages/Auth';
|
||||
import Profile from './pages/Profile';
|
||||
import Addresses from './pages/Addresses';
|
||||
import AdminOrders from './pages/AdminOrders';
|
||||
import AdminOrderDetail from './pages/AdminOrderDetail';
|
||||
import { AuthProvider } from './context/AuthContext';
|
||||
import HelloWorld from './pages/HelloWorld';
|
||||
|
||||
const App: React.FC = () => (
|
||||
<IonApp>
|
||||
<IonReactRouter>
|
||||
<AuthProvider>
|
||||
<IonRouterOutlet>
|
||||
<Route path="/home" component={Home} exact />
|
||||
<Route path="/auth" component={Auth} exact />
|
||||
<Route path="/product/:id" component={ProductDetail} exact />
|
||||
<Route path="/cart" component={Cart} exact />
|
||||
<Route path="/orders" component={MyOrders} exact />
|
||||
<Route path="/orders/:id" component={OrderDetail} exact />
|
||||
<Route path="/profile" component={Profile} exact />
|
||||
<Route path="/addresses" component={Addresses} exact />
|
||||
<Route path="/admin/orders" component={AdminOrders} exact />
|
||||
<Route path="/admin/orders/:id" component={AdminOrderDetail} exact />
|
||||
<Route
|
||||
path="/order-confirmation"
|
||||
component={OrderConfirmation}
|
||||
exact
|
||||
/>
|
||||
<Redirect exact from="/" to="/home" />
|
||||
</IonRouterOutlet>
|
||||
</AuthProvider>
|
||||
<IonRouterOutlet animated={true}>
|
||||
<Route path="/home" component={Home} exact />
|
||||
<Route path="/hello-world" component={HelloWorld} exact />
|
||||
<Route exact path="/" render={() => <Redirect to="/home" />} />
|
||||
</IonRouterOutlet>
|
||||
</IonReactRouter>
|
||||
</IonApp>
|
||||
);
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 839 KiB |
|
Before Width: | Height: | Size: 476 KiB |
|
Before Width: | Height: | Size: 501 KiB |
|
Before Width: | Height: | Size: 602 KiB |
|
Before Width: | Height: | Size: 554 KiB |
|
Before Width: | Height: | Size: 553 KiB |
|
Before Width: | Height: | Size: 437 KiB |
|
Before Width: | Height: | Size: 676 KiB |
|
Before Width: | Height: | Size: 673 KiB |
|
Before Width: | Height: | Size: 452 KiB |
|
Before Width: | Height: | Size: 545 KiB |
|
Before Width: | Height: | Size: 550 KiB |
|
Before Width: | Height: | Size: 461 KiB |
|
Before Width: | Height: | Size: 689 KiB |
|
Before Width: | Height: | Size: 447 KiB |
|
Before Width: | Height: | Size: 690 KiB |
|
Before Width: | Height: | Size: 599 KiB |
|
Before Width: | Height: | Size: 464 KiB |
|
Before Width: | Height: | Size: 629 KiB |
|
Before Width: | Height: | Size: 515 KiB |
|
Before Width: | Height: | Size: 655 KiB |
|
Before Width: | Height: | Size: 697 KiB |
|
Before Width: | Height: | Size: 476 KiB |
|
Before Width: | Height: | Size: 466 KiB |
@@ -1,36 +0,0 @@
|
||||
import React from 'react';
|
||||
import { Redirect, Route, RouteProps } from 'react-router-dom';
|
||||
import { IonLoading } from '@ionic/react';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
|
||||
type Props = RouteProps;
|
||||
|
||||
const AdminRoute: React.FC<Props> = ({ component: Component, ...rest }) => {
|
||||
const { user, profile, isLoading } = useAuth();
|
||||
|
||||
if (!Component) return null;
|
||||
|
||||
return (
|
||||
<Route
|
||||
{...rest}
|
||||
render={(props) => {
|
||||
if (isLoading) {
|
||||
return <IonLoading isOpen message="Loading..." />;
|
||||
}
|
||||
|
||||
if (!user) {
|
||||
return <Redirect to="/auth" />;
|
||||
}
|
||||
|
||||
if (!profile?.is_admin) {
|
||||
return <Redirect to="/home" />;
|
||||
}
|
||||
|
||||
const RouteComponent = Component as React.ComponentType<any>;
|
||||
return <RouteComponent {...props} />;
|
||||
}}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default AdminRoute;
|
||||
@@ -1,101 +0,0 @@
|
||||
import React from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonIcon,
|
||||
IonLabel,
|
||||
IonModal,
|
||||
IonRadio,
|
||||
IonRadioGroup,
|
||||
IonItem,
|
||||
IonList,
|
||||
} from '@ionic/react';
|
||||
import { funnelOutline } from 'ionicons/icons';
|
||||
|
||||
export type SortOption = 'popular' | 'price-asc' | 'price-desc' | 'name-asc';
|
||||
|
||||
type Props = {
|
||||
categories: string[];
|
||||
selectedCategory: string;
|
||||
setSelectedCategory: (value: string) => void;
|
||||
sortOption: SortOption;
|
||||
setSortOption: (value: SortOption) => void;
|
||||
isOpen: boolean;
|
||||
onClose: () => void;
|
||||
};
|
||||
|
||||
const ProductFilters: React.FC<Props> = ({
|
||||
categories,
|
||||
selectedCategory,
|
||||
setSelectedCategory,
|
||||
sortOption,
|
||||
setSortOption,
|
||||
isOpen,
|
||||
onClose,
|
||||
}) => (
|
||||
<>
|
||||
<div className="filter-row">
|
||||
<div className="filter-chip-row">
|
||||
<IonButton
|
||||
fill={selectedCategory === 'All' ? 'solid' : 'outline'}
|
||||
size="small"
|
||||
onClick={() => setSelectedCategory('All')}
|
||||
>
|
||||
All
|
||||
</IonButton>
|
||||
{categories.map((category) => (
|
||||
<IonButton
|
||||
key={category}
|
||||
fill={selectedCategory === category ? 'solid' : 'outline'}
|
||||
size="small"
|
||||
onClick={() => setSelectedCategory(category)}
|
||||
>
|
||||
{category}
|
||||
</IonButton>
|
||||
))}
|
||||
</div>
|
||||
<IonButton fill="clear" className="filter-button" onClick={onClose}>
|
||||
<IonIcon icon={funnelOutline} slot="start" />
|
||||
Filters
|
||||
</IonButton>
|
||||
</div>
|
||||
|
||||
<IonModal
|
||||
isOpen={isOpen}
|
||||
onDidDismiss={onClose}
|
||||
breakpoints={[0, 0.45]}
|
||||
initialBreakpoint={0.45}
|
||||
>
|
||||
<div className="filter-modal ion-padding">
|
||||
<h2>Sort products</h2>
|
||||
<IonRadioGroup
|
||||
value={sortOption}
|
||||
onIonChange={(e) => setSortOption(e.detail.value)}
|
||||
>
|
||||
<IonList lines="none">
|
||||
<IonItem>
|
||||
<IonLabel>Most popular</IonLabel>
|
||||
<IonRadio value="popular" />
|
||||
</IonItem>
|
||||
<IonItem>
|
||||
<IonLabel>Price: low to high</IonLabel>
|
||||
<IonRadio value="price-asc" />
|
||||
</IonItem>
|
||||
<IonItem>
|
||||
<IonLabel>Price: high to low</IonLabel>
|
||||
<IonRadio value="price-desc" />
|
||||
</IonItem>
|
||||
<IonItem>
|
||||
<IonLabel>Name: A to Z</IonLabel>
|
||||
<IonRadio value="name-asc" />
|
||||
</IonItem>
|
||||
</IonList>
|
||||
</IonRadioGroup>
|
||||
<IonButton expand="block" onClick={onClose}>
|
||||
Done
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonModal>
|
||||
</>
|
||||
);
|
||||
|
||||
export default ProductFilters;
|
||||
@@ -1,32 +0,0 @@
|
||||
import React from 'react';
|
||||
import { Redirect, Route, RouteProps } from 'react-router-dom';
|
||||
import { IonLoading } from '@ionic/react';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
|
||||
type Props = RouteProps;
|
||||
|
||||
const ProtectedRoute: React.FC<Props> = ({ component: Component, ...rest }) => {
|
||||
const { user, isLoading } = useAuth();
|
||||
|
||||
if (!Component) return null;
|
||||
|
||||
return (
|
||||
<Route
|
||||
{...rest}
|
||||
render={(props) => {
|
||||
if (isLoading) {
|
||||
return <IonLoading isOpen message="Loading..." />;
|
||||
}
|
||||
|
||||
if (!user) {
|
||||
return <Redirect to="/auth" />;
|
||||
}
|
||||
|
||||
const RouteComponent = Component as React.ComponentType<any>;
|
||||
return <RouteComponent {...props} />;
|
||||
}}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default ProtectedRoute;
|
||||
@@ -1,97 +0,0 @@
|
||||
import React, {
|
||||
createContext,
|
||||
useContext,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
} from 'react';
|
||||
import type { Session, User } from '@supabase/supabase-js';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables } from '../database.types';
|
||||
|
||||
type Profile = Tables<'profiles'>;
|
||||
|
||||
type AuthContextValue = {
|
||||
session: Session | null;
|
||||
user: User | null;
|
||||
profile: Profile | null;
|
||||
isLoading: boolean;
|
||||
refreshProfile: () => Promise<void>;
|
||||
signOut: () => Promise<void>;
|
||||
};
|
||||
|
||||
const AuthContext = createContext<AuthContextValue | undefined>(undefined);
|
||||
|
||||
export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
|
||||
children,
|
||||
}) => {
|
||||
const [session, setSession] = useState<Session | null>(null);
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
const [profile, setProfile] = useState<Profile | null>(null);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
|
||||
const loadProfile = async (userId: string | null) => {
|
||||
if (!userId) {
|
||||
setProfile(null);
|
||||
return;
|
||||
}
|
||||
|
||||
const { data } = await supabase
|
||||
.from('profiles')
|
||||
.select('*')
|
||||
.eq('id', userId)
|
||||
.maybeSingle();
|
||||
setProfile(data ?? null);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
let isMounted = true;
|
||||
|
||||
supabase.auth.getSession().then(async ({ data }) => {
|
||||
if (!isMounted) return;
|
||||
const nextSession = data.session ?? null;
|
||||
setSession(nextSession);
|
||||
setUser(nextSession?.user ?? null);
|
||||
await loadProfile(nextSession?.user?.id ?? null);
|
||||
if (isMounted) setIsLoading(false);
|
||||
});
|
||||
|
||||
const {
|
||||
data: { subscription },
|
||||
} = supabase.auth.onAuthStateChange(async (_event, nextSession) => {
|
||||
setSession(nextSession);
|
||||
setUser(nextSession?.user ?? null);
|
||||
await loadProfile(nextSession?.user?.id ?? null);
|
||||
setIsLoading(false);
|
||||
});
|
||||
|
||||
return () => {
|
||||
isMounted = false;
|
||||
subscription.unsubscribe();
|
||||
};
|
||||
}, []);
|
||||
|
||||
const value = useMemo<AuthContextValue>(
|
||||
() => ({
|
||||
session,
|
||||
user,
|
||||
profile,
|
||||
isLoading,
|
||||
refreshProfile: async () => loadProfile(user?.id ?? null),
|
||||
signOut: async () => {
|
||||
await supabase.auth.signOut();
|
||||
},
|
||||
}),
|
||||
[session, user, profile, isLoading]
|
||||
);
|
||||
|
||||
return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
|
||||
};
|
||||
|
||||
export const useAuth = () => {
|
||||
const context = useContext(AuthContext);
|
||||
if (!context) {
|
||||
throw new Error('useAuth must be used within AuthProvider');
|
||||
}
|
||||
return context;
|
||||
};
|
||||
@@ -1,314 +0,0 @@
|
||||
export type Json =
|
||||
| string
|
||||
| number
|
||||
| boolean
|
||||
| null
|
||||
| { [key: string]: Json | undefined }
|
||||
| Json[]
|
||||
|
||||
export type Database = {
|
||||
// Allows to automatically instantiate createClient with right options
|
||||
// instead of createClient<Database, { PostgrestVersion: 'XX' }>(URL, KEY)
|
||||
__InternalSupabase: {
|
||||
PostgrestVersion: "14.5"
|
||||
}
|
||||
public: {
|
||||
Tables: {
|
||||
addresses: {
|
||||
Row: {
|
||||
address_line: string
|
||||
created_at: string
|
||||
id: string
|
||||
is_default: boolean
|
||||
label: string
|
||||
notes: string | null
|
||||
phone: string
|
||||
recipient_name: string
|
||||
user_id: string
|
||||
}
|
||||
Insert: {
|
||||
address_line: string
|
||||
created_at?: string
|
||||
id?: string
|
||||
is_default?: boolean
|
||||
label: string
|
||||
notes?: string | null
|
||||
phone: string
|
||||
recipient_name: string
|
||||
user_id: string
|
||||
}
|
||||
Update: {
|
||||
address_line?: string
|
||||
created_at?: string
|
||||
id?: string
|
||||
is_default?: boolean
|
||||
label?: string
|
||||
notes?: string | null
|
||||
phone?: string
|
||||
recipient_name?: string
|
||||
user_id?: string
|
||||
}
|
||||
Relationships: []
|
||||
}
|
||||
order_items: {
|
||||
Row: {
|
||||
created_at: string
|
||||
id: string
|
||||
order_id: string
|
||||
product_id: string
|
||||
product_name: string
|
||||
quantity: number
|
||||
unit_price: number
|
||||
}
|
||||
Insert: {
|
||||
created_at?: string
|
||||
id?: string
|
||||
order_id: string
|
||||
product_id: string
|
||||
product_name: string
|
||||
quantity: number
|
||||
unit_price: number
|
||||
}
|
||||
Update: {
|
||||
created_at?: string
|
||||
id?: string
|
||||
order_id?: string
|
||||
product_id?: string
|
||||
product_name?: string
|
||||
quantity?: number
|
||||
unit_price?: number
|
||||
}
|
||||
Relationships: [
|
||||
{
|
||||
foreignKeyName: "order_items_order_id_fkey"
|
||||
columns: ["order_id"]
|
||||
isOneToOne: false
|
||||
referencedRelation: "orders"
|
||||
referencedColumns: ["id"]
|
||||
},
|
||||
]
|
||||
}
|
||||
orders: {
|
||||
Row: {
|
||||
address_id: string | null
|
||||
created_at: string
|
||||
customer_name: string | null
|
||||
customer_phone: string | null
|
||||
delivery_address: string | null
|
||||
delivery_fee: number
|
||||
delivery_notes: string | null
|
||||
id: string
|
||||
item_count: number
|
||||
order_number: string
|
||||
status: string
|
||||
subtotal: number
|
||||
total: number
|
||||
user_id: string | null
|
||||
}
|
||||
Insert: {
|
||||
address_id?: string | null
|
||||
created_at?: string
|
||||
customer_name?: string | null
|
||||
customer_phone?: string | null
|
||||
delivery_address?: string | null
|
||||
delivery_fee?: number
|
||||
delivery_notes?: string | null
|
||||
id?: string
|
||||
item_count?: number
|
||||
order_number: string
|
||||
status?: string
|
||||
subtotal?: number
|
||||
total?: number
|
||||
user_id?: string | null
|
||||
}
|
||||
Update: {
|
||||
address_id?: string | null
|
||||
created_at?: string
|
||||
customer_name?: string | null
|
||||
customer_phone?: string | null
|
||||
delivery_address?: string | null
|
||||
delivery_fee?: number
|
||||
delivery_notes?: string | null
|
||||
id?: string
|
||||
item_count?: number
|
||||
order_number?: string
|
||||
status?: string
|
||||
subtotal?: number
|
||||
total?: number
|
||||
user_id?: string | null
|
||||
}
|
||||
Relationships: [
|
||||
{
|
||||
foreignKeyName: "orders_address_id_fkey"
|
||||
columns: ["address_id"]
|
||||
isOneToOne: false
|
||||
referencedRelation: "addresses"
|
||||
referencedColumns: ["id"]
|
||||
},
|
||||
]
|
||||
}
|
||||
profiles: {
|
||||
Row: {
|
||||
created_at: string
|
||||
full_name: string | null
|
||||
id: string
|
||||
is_admin: boolean
|
||||
phone: string | null
|
||||
updated_at: string
|
||||
}
|
||||
Insert: {
|
||||
created_at?: string
|
||||
full_name?: string | null
|
||||
id: string
|
||||
is_admin?: boolean
|
||||
phone?: string | null
|
||||
updated_at?: string
|
||||
}
|
||||
Update: {
|
||||
created_at?: string
|
||||
full_name?: string | null
|
||||
id?: string
|
||||
is_admin?: boolean
|
||||
phone?: string | null
|
||||
updated_at?: string
|
||||
}
|
||||
Relationships: []
|
||||
}
|
||||
}
|
||||
Views: {
|
||||
[_ in never]: never
|
||||
}
|
||||
Functions: {
|
||||
[_ in never]: never
|
||||
}
|
||||
Enums: {
|
||||
[_ in never]: never
|
||||
}
|
||||
CompositeTypes: {
|
||||
[_ in never]: never
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">
|
||||
|
||||
type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">]
|
||||
|
||||
export type Tables<
|
||||
DefaultSchemaTableNameOrOptions extends
|
||||
| keyof (DefaultSchema["Tables"] & DefaultSchema["Views"])
|
||||
| { schema: keyof DatabaseWithoutInternals },
|
||||
TableName extends DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
|
||||
DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])
|
||||
: never = never,
|
||||
> = DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] &
|
||||
DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
|
||||
Row: infer R
|
||||
}
|
||||
? R
|
||||
: never
|
||||
: DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] &
|
||||
DefaultSchema["Views"])
|
||||
? (DefaultSchema["Tables"] &
|
||||
DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
|
||||
Row: infer R
|
||||
}
|
||||
? R
|
||||
: never
|
||||
: never
|
||||
|
||||
export type TablesInsert<
|
||||
DefaultSchemaTableNameOrOptions extends
|
||||
| keyof DefaultSchema["Tables"]
|
||||
| { schema: keyof DatabaseWithoutInternals },
|
||||
TableName extends DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
|
||||
: never = never,
|
||||
> = DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
|
||||
Insert: infer I
|
||||
}
|
||||
? I
|
||||
: never
|
||||
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
|
||||
? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
|
||||
Insert: infer I
|
||||
}
|
||||
? I
|
||||
: never
|
||||
: never
|
||||
|
||||
export type TablesUpdate<
|
||||
DefaultSchemaTableNameOrOptions extends
|
||||
| keyof DefaultSchema["Tables"]
|
||||
| { schema: keyof DatabaseWithoutInternals },
|
||||
TableName extends DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"]
|
||||
: never = never,
|
||||
> = DefaultSchemaTableNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
|
||||
Update: infer U
|
||||
}
|
||||
? U
|
||||
: never
|
||||
: DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"]
|
||||
? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
|
||||
Update: infer U
|
||||
}
|
||||
? U
|
||||
: never
|
||||
: never
|
||||
|
||||
export type Enums<
|
||||
DefaultSchemaEnumNameOrOptions extends
|
||||
| keyof DefaultSchema["Enums"]
|
||||
| { schema: keyof DatabaseWithoutInternals },
|
||||
EnumName extends DefaultSchemaEnumNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"]
|
||||
: never = never,
|
||||
> = DefaultSchemaEnumNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName]
|
||||
: DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"]
|
||||
? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions]
|
||||
: never
|
||||
|
||||
export type CompositeTypes<
|
||||
PublicCompositeTypeNameOrOptions extends
|
||||
| keyof DefaultSchema["CompositeTypes"]
|
||||
| { schema: keyof DatabaseWithoutInternals },
|
||||
CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"]
|
||||
: never = never,
|
||||
> = PublicCompositeTypeNameOrOptions extends {
|
||||
schema: keyof DatabaseWithoutInternals
|
||||
}
|
||||
? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName]
|
||||
: PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"]
|
||||
? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions]
|
||||
: never
|
||||
|
||||
export const Constants = {
|
||||
public: {
|
||||
Enums: {},
|
||||
},
|
||||
} as const
|
||||
@@ -1,254 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonPage,
|
||||
IonText,
|
||||
IonTextarea,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { trashOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import type { Tables } from '../database.types';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Address = Tables<'addresses'>;
|
||||
|
||||
const Addresses: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user } = useAuth();
|
||||
const [addresses, setAddresses] = useState<Address[]>([]);
|
||||
const [label, setLabel] = useState('Home');
|
||||
const [recipientName, setRecipientName] = useState('');
|
||||
const [phone, setPhone] = useState('');
|
||||
const [addressLine, setAddressLine] = useState('');
|
||||
const [notes, setNotes] = useState('');
|
||||
const [message, setMessage] = useState('');
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
const showMessage = (msg: string) => {
|
||||
setMessage(msg);
|
||||
window.setTimeout(() => setMessage(''), 4000);
|
||||
};
|
||||
|
||||
const loadAddresses = async () => {
|
||||
if (!user) return;
|
||||
const { data } = await supabase
|
||||
.from('addresses')
|
||||
.select('*')
|
||||
.eq('user_id', user.id)
|
||||
.order('is_default', { ascending: false })
|
||||
.order('created_at', { ascending: false });
|
||||
setAddresses(data ?? []);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadAddresses();
|
||||
}, [user?.id]);
|
||||
|
||||
const saveAddress = async () => {
|
||||
if (
|
||||
!user ||
|
||||
!recipientName.trim() ||
|
||||
!phone.trim() ||
|
||||
!addressLine.trim()
|
||||
) {
|
||||
showMessage('Complete the required address details.');
|
||||
return;
|
||||
}
|
||||
|
||||
const makeDefault = addresses.length === 0;
|
||||
|
||||
if (makeDefault) {
|
||||
await supabase
|
||||
.from('addresses')
|
||||
.update({ is_default: false })
|
||||
.eq('user_id', user.id);
|
||||
}
|
||||
|
||||
const { error } = await supabase.from('addresses').insert({
|
||||
user_id: user.id,
|
||||
label: label.trim() || 'Address',
|
||||
recipient_name: recipientName.trim(),
|
||||
phone: phone.trim(),
|
||||
address_line: addressLine.trim(),
|
||||
notes: notes.trim() || null,
|
||||
is_default: makeDefault,
|
||||
});
|
||||
|
||||
if (!error) {
|
||||
setLabel('Home');
|
||||
setRecipientName('');
|
||||
setPhone('');
|
||||
setAddressLine('');
|
||||
setNotes('');
|
||||
showMessage('Address saved.');
|
||||
loadAddresses();
|
||||
}
|
||||
};
|
||||
|
||||
const setDefaultAddress = async (addressId: string) => {
|
||||
if (!user) return;
|
||||
await supabase
|
||||
.from('addresses')
|
||||
.update({ is_default: false })
|
||||
.eq('user_id', user.id);
|
||||
await supabase
|
||||
.from('addresses')
|
||||
.update({ is_default: true })
|
||||
.eq('id', addressId);
|
||||
loadAddresses();
|
||||
};
|
||||
|
||||
const deleteAddress = async (addressId: string) => {
|
||||
await supabase.from('addresses').delete().eq('id', addressId);
|
||||
loadAddresses();
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/profile')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Saved addresses</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
{message && (
|
||||
<IonText color="medium">
|
||||
<p>{message}</p>
|
||||
</IonText>
|
||||
)}
|
||||
<div className="checkout-card">
|
||||
<div className="section-heading checkout-heading">
|
||||
<h2>Add address</h2>
|
||||
</div>
|
||||
<div className="checkout-form-grid">
|
||||
<div className="form-field">
|
||||
<IonLabel position="stacked">Label</IonLabel>
|
||||
<IonInput
|
||||
value={label}
|
||||
onIonInput={(e) => setLabel(e.detail.value ?? '')}
|
||||
className="checkout-input"
|
||||
/>
|
||||
</div>
|
||||
<div className="form-field">
|
||||
<IonLabel position="stacked">Recipient</IonLabel>
|
||||
<IonInput
|
||||
value={recipientName}
|
||||
onIonInput={(e) => setRecipientName(e.detail.value ?? '')}
|
||||
className="checkout-input"
|
||||
/>
|
||||
</div>
|
||||
<div className="form-field">
|
||||
<IonLabel position="stacked">Phone</IonLabel>
|
||||
<IonInput
|
||||
value={phone}
|
||||
onIonInput={(e) => setPhone(e.detail.value ?? '')}
|
||||
className="checkout-input"
|
||||
/>
|
||||
</div>
|
||||
<div className="form-field full-width">
|
||||
<IonLabel position="stacked">Address</IonLabel>
|
||||
<IonTextarea
|
||||
value={addressLine}
|
||||
onIonInput={(e) => setAddressLine(e.detail.value ?? '')}
|
||||
className="checkout-input checkout-textarea"
|
||||
autoGrow
|
||||
rows={3}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-field full-width">
|
||||
<IonLabel position="stacked">Notes</IonLabel>
|
||||
<IonTextarea
|
||||
value={notes}
|
||||
onIonInput={(e) => setNotes(e.detail.value ?? '')}
|
||||
className="checkout-input checkout-textarea"
|
||||
autoGrow
|
||||
rows={3}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<IonButton expand="block" onClick={saveAddress}>
|
||||
Save address
|
||||
</IonButton>
|
||||
</div>
|
||||
|
||||
{addresses.length === 0 ? (
|
||||
<div className="empty-state">
|
||||
<h3>No saved addresses</h3>
|
||||
<p className="muted-text">
|
||||
Save your first address for faster checkout.
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<IonList lines="none" className="orders-list">
|
||||
{addresses.map((address) => (
|
||||
<div key={address.id} className="order-card">
|
||||
<div className="order-card-top">
|
||||
<div>
|
||||
<span className="order-label">{address.label}</span>
|
||||
<h3>{address.recipient_name}</h3>
|
||||
</div>
|
||||
{address.is_default ? (
|
||||
<span className="default-pill">Default</span>
|
||||
) : (
|
||||
<IonButton
|
||||
size="small"
|
||||
fill="outline"
|
||||
onClick={() => setDefaultAddress(address.id)}
|
||||
>
|
||||
Make default
|
||||
</IonButton>
|
||||
)}
|
||||
</div>
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Phone</span>
|
||||
<strong>{address.phone}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Address</span>
|
||||
<strong>{address.address_line}</strong>
|
||||
</div>
|
||||
{address.notes && (
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Notes</span>
|
||||
<strong>{address.notes}</strong>
|
||||
</div>
|
||||
)}
|
||||
<IonButton
|
||||
fill="clear"
|
||||
color="danger"
|
||||
onClick={() => deleteAddress(address.id)}
|
||||
>
|
||||
<IonIcon slot="start" icon={trashOutline} />
|
||||
Delete
|
||||
</IonButton>
|
||||
</div>
|
||||
))}
|
||||
</IonList>
|
||||
)}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Addresses;
|
||||
@@ -1,117 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonPage,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { RouteComponentProps, useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables } from '../database.types';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Props = RouteComponentProps<{ id: string }>;
|
||||
type Order = Tables<'orders'>;
|
||||
type OrderItem = Tables<'order_items'>;
|
||||
const statuses = ['confirmed', 'packed', 'out_for_delivery', 'delivered'];
|
||||
|
||||
const AdminOrderDetail: React.FC<Props> = ({ match }) => {
|
||||
const history = useHistory();
|
||||
const [order, setOrder] = useState<Order | null>(null);
|
||||
const [items, setItems] = useState<OrderItem[]>([]);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
const loadOrder = async () => {
|
||||
const [{ data: orderData }, { data: itemData }] = await Promise.all([
|
||||
supabase.from('orders').select('*').eq('id', match.params.id).single(),
|
||||
supabase.from('order_items').select('*').eq('order_id', match.params.id),
|
||||
]);
|
||||
setOrder(orderData ?? null);
|
||||
setItems(itemData ?? []);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadOrder();
|
||||
}, [match.params.id]);
|
||||
|
||||
const updateStatus = async (status: string) => {
|
||||
await supabase.from('orders').update({ status }).eq('id', match.params.id);
|
||||
loadOrder();
|
||||
};
|
||||
|
||||
if (!order)
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent />
|
||||
</IonPage>
|
||||
);
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
onClick={() => history.replace('/admin/orders')}
|
||||
>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>{order.order_number}</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<div className="tracking-summary-card">
|
||||
<div className="delivery-detail-row">
|
||||
<span>Customer</span>
|
||||
<strong>{order.customer_name || '—'}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row">
|
||||
<span>Phone</span>
|
||||
<strong>{order.customer_phone || '—'}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Address</span>
|
||||
<strong>{order.delivery_address || '—'}</strong>
|
||||
</div>
|
||||
<IonSelect
|
||||
value={order.status}
|
||||
interface="action-sheet"
|
||||
onIonChange={(e) => updateStatus(e.detail.value)}
|
||||
>
|
||||
{statuses.map((status) => (
|
||||
<IonSelectOption key={status} value={status}>
|
||||
{status.replace(/_/g, ' ')}
|
||||
</IonSelectOption>
|
||||
))}
|
||||
</IonSelect>
|
||||
</div>
|
||||
<IonList lines="none" className="cart-list">
|
||||
{items.map((item) => (
|
||||
<IonItem key={item.id} className="cart-item">
|
||||
<IonLabel>
|
||||
<h2>{item.product_name}</h2>
|
||||
<p>Qty {item.quantity}</p>
|
||||
</IonLabel>
|
||||
</IonItem>
|
||||
))}
|
||||
</IonList>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default AdminOrderDetail;
|
||||
@@ -1,100 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonPage,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables } from '../database.types';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Order = Tables<'orders'>;
|
||||
const statuses = ['confirmed', 'packed', 'out_for_delivery', 'delivered'];
|
||||
|
||||
const AdminOrders: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const [orders, setOrders] = useState<Order[]>([]);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
const loadOrders = async () => {
|
||||
const { data } = await supabase
|
||||
.from('orders')
|
||||
.select('*')
|
||||
.order('created_at', { ascending: false });
|
||||
setOrders(data ?? []);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadOrders();
|
||||
}, []);
|
||||
|
||||
const updateStatus = async (orderId: string, status: string) => {
|
||||
await supabase.from('orders').update({ status }).eq('id', orderId);
|
||||
loadOrders();
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/profile')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Admin orders</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<IonList lines="none" className="orders-list">
|
||||
{orders.map((order) => (
|
||||
<IonItem
|
||||
key={order.id}
|
||||
className="cart-item admin-order-item"
|
||||
button
|
||||
onClick={() => history.push(`/admin/orders/${order.id}`)}
|
||||
>
|
||||
<IonLabel>
|
||||
<h2>{order.order_number}</h2>
|
||||
<p>
|
||||
{order.customer_name || 'Customer'} · $
|
||||
{Number(order.total).toFixed(2)}
|
||||
</p>
|
||||
</IonLabel>
|
||||
<IonSelect
|
||||
value={order.status}
|
||||
interface="popover"
|
||||
onIonChange={(e) => {
|
||||
e.stopPropagation();
|
||||
updateStatus(order.id, e.detail.value);
|
||||
}}
|
||||
>
|
||||
{statuses.map((status) => (
|
||||
<IonSelectOption key={status} value={status}>
|
||||
{status.replace(/_/g, ' ')}
|
||||
</IonSelectOption>
|
||||
))}
|
||||
</IonSelect>
|
||||
</IonItem>
|
||||
))}
|
||||
</IonList>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default AdminOrders;
|
||||
@@ -1,203 +0,0 @@
|
||||
import React, { useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonInput,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonPage,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
const Auth: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const [mode, setMode] = useState<'login' | 'signup'>('login');
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [message, setMessage] = useState('');
|
||||
const [errorMessage, setErrorMessage] = useState('');
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Light);
|
||||
});
|
||||
|
||||
const showError = (msg: string) => {
|
||||
setErrorMessage(msg);
|
||||
window.setTimeout(() => setErrorMessage(''), 4000);
|
||||
};
|
||||
|
||||
const showMessage = (msg: string) => {
|
||||
setMessage(msg);
|
||||
window.setTimeout(() => setMessage(''), 4000);
|
||||
};
|
||||
|
||||
const normaliseAuthError = (msg: string) => {
|
||||
const lowered = msg.toLowerCase();
|
||||
|
||||
if (lowered.includes('email not confirmed')) {
|
||||
return 'Please confirm your email before signing in. Check your inbox for the verification email.';
|
||||
}
|
||||
|
||||
if (lowered.includes('invalid login credentials')) {
|
||||
return 'Incorrect email or password. Please try again.';
|
||||
}
|
||||
|
||||
if (lowered.includes('user already registered')) {
|
||||
return 'An account with this email already exists. Please sign in instead.';
|
||||
}
|
||||
|
||||
return msg;
|
||||
};
|
||||
|
||||
const handleResendConfirmation = async () => {
|
||||
if (!email.trim()) {
|
||||
showError(
|
||||
'Enter your email address first so we can resend the confirmation email.'
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
const { error } = await supabase.auth.resend({
|
||||
type: 'signup',
|
||||
email: email.trim(),
|
||||
});
|
||||
setIsSubmitting(false);
|
||||
|
||||
if (error) {
|
||||
showError(normaliseAuthError(error.message));
|
||||
return;
|
||||
}
|
||||
|
||||
showMessage('Confirmation email sent. Please check your inbox.');
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
if (!email.trim() || password.trim().length < 6) {
|
||||
showError('Enter a valid email and password with at least 6 characters.');
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
if (mode === 'login') {
|
||||
const { error } = await supabase.auth.signInWithPassword({
|
||||
email: email.trim(),
|
||||
password,
|
||||
});
|
||||
setIsSubmitting(false);
|
||||
if (error) {
|
||||
showError(normaliseAuthError(error.message));
|
||||
return;
|
||||
}
|
||||
history.replace('/home');
|
||||
return;
|
||||
}
|
||||
|
||||
const { data, error } = await supabase.auth.signUp({
|
||||
email: email.trim(),
|
||||
password,
|
||||
});
|
||||
setIsSubmitting(false);
|
||||
if (error) {
|
||||
showError(normaliseAuthError(error.message));
|
||||
return;
|
||||
}
|
||||
|
||||
if (data.session) {
|
||||
history.replace('/home');
|
||||
return;
|
||||
}
|
||||
|
||||
showMessage('Account created! Check your email for a verification link.');
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonTitle>
|
||||
{mode === 'login' ? 'Welcome back' : 'Create account'}
|
||||
</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding auth-page">
|
||||
<div className="auth-card">
|
||||
<h1>
|
||||
{mode === 'login'
|
||||
? 'Sign in to continue'
|
||||
: 'Create your shopping account'}
|
||||
</h1>
|
||||
<p className="muted-text">
|
||||
Save your orders, addresses, and track deliveries securely.
|
||||
</p>
|
||||
|
||||
{errorMessage && (
|
||||
<IonText color="danger">
|
||||
<p>{errorMessage}</p>
|
||||
</IonText>
|
||||
)}
|
||||
{message && (
|
||||
<IonText color="success">
|
||||
<p>{message}</p>
|
||||
</IonText>
|
||||
)}
|
||||
|
||||
<div className="auth-form">
|
||||
<IonItem lines="none" className="auth-input-item">
|
||||
<IonLabel position="stacked">Email</IonLabel>
|
||||
<IonInput
|
||||
value={email}
|
||||
type="email"
|
||||
onIonInput={(e) => setEmail(e.detail.value ?? '')}
|
||||
/>
|
||||
</IonItem>
|
||||
<IonItem lines="none" className="auth-input-item">
|
||||
<IonLabel position="stacked">Password</IonLabel>
|
||||
<IonInput
|
||||
value={password}
|
||||
type="password"
|
||||
onIonInput={(e) => setPassword(e.detail.value ?? '')}
|
||||
/>
|
||||
</IonItem>
|
||||
<IonButton
|
||||
expand="block"
|
||||
onClick={handleSubmit}
|
||||
disabled={isSubmitting}
|
||||
>
|
||||
{mode === 'login' ? 'Sign in' : 'Create account'}
|
||||
</IonButton>
|
||||
{mode === 'login' && (
|
||||
<IonButton
|
||||
fill="clear"
|
||||
expand="block"
|
||||
onClick={handleResendConfirmation}
|
||||
disabled={isSubmitting}
|
||||
>
|
||||
Resend confirmation email
|
||||
</IonButton>
|
||||
)}
|
||||
<IonButton
|
||||
fill="clear"
|
||||
expand="block"
|
||||
onClick={() => setMode(mode === 'login' ? 'signup' : 'login')}
|
||||
>
|
||||
{mode === 'login'
|
||||
? 'Need an account? Sign up'
|
||||
: 'Already have an account? Sign in'}
|
||||
</IonButton>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Auth;
|
||||
@@ -1,485 +0,0 @@
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonLoading,
|
||||
IonPage,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
IonTextarea,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import {
|
||||
addOutline,
|
||||
bagHandleOutline,
|
||||
removeOutline,
|
||||
trashOutline,
|
||||
} from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables, TablesInsert } from '../database.types';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { CartItem, LAST_ORDER_STORAGE_KEY, readCart, writeCart } from './Home';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Address = Tables<'addresses'>;
|
||||
type CheckoutForm = {
|
||||
customerName: string;
|
||||
customerPhone: string;
|
||||
deliveryAddress: string;
|
||||
deliveryNotes: string;
|
||||
addressId: string;
|
||||
};
|
||||
type FormErrors = Partial<Record<keyof CheckoutForm, string>>;
|
||||
|
||||
type SavedOrderInfo = {
|
||||
id: string;
|
||||
orderNumber: string;
|
||||
total: number;
|
||||
itemCount: number;
|
||||
status: string;
|
||||
customerName: string;
|
||||
customerPhone: string;
|
||||
deliveryAddress: string;
|
||||
deliveryNotes: string;
|
||||
};
|
||||
|
||||
const initialForm: CheckoutForm = {
|
||||
customerName: '',
|
||||
customerPhone: '',
|
||||
deliveryAddress: '',
|
||||
deliveryNotes: '',
|
||||
addressId: '',
|
||||
};
|
||||
|
||||
const Cart: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user, profile } = useAuth();
|
||||
const guestCheckoutEnabled = true;
|
||||
const [cart, setCart] = useState<CartItem[]>([]);
|
||||
const [addresses, setAddresses] = useState<Address[]>([]);
|
||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||
const [errorMessage, setErrorMessage] = useState('');
|
||||
const [form, setForm] = useState<CheckoutForm>(initialForm);
|
||||
const [formErrors, setFormErrors] = useState<FormErrors>({});
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
setCart(readCart());
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const syncCartFromStorage = () => setCart(readCart());
|
||||
window.addEventListener('storage', syncCartFromStorage);
|
||||
window.addEventListener(
|
||||
'cart:updated',
|
||||
syncCartFromStorage as EventListener
|
||||
);
|
||||
return () => {
|
||||
window.removeEventListener('storage', syncCartFromStorage);
|
||||
window.removeEventListener(
|
||||
'cart:updated',
|
||||
syncCartFromStorage as EventListener
|
||||
);
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
const loadAddresses = async () => {
|
||||
if (!user) {
|
||||
setAddresses([]);
|
||||
setForm((current) => ({
|
||||
...current,
|
||||
customerName: current.customerName || profile?.full_name || '',
|
||||
customerPhone: current.customerPhone || profile?.phone || '',
|
||||
addressId: '',
|
||||
}));
|
||||
return;
|
||||
}
|
||||
const { data } = await supabase
|
||||
.from('addresses')
|
||||
.select('*')
|
||||
.eq('user_id', user.id)
|
||||
.order('is_default', { ascending: false });
|
||||
const nextAddresses = data ?? [];
|
||||
setAddresses(nextAddresses);
|
||||
const defaultAddress =
|
||||
nextAddresses.find((address) => address.is_default) ?? nextAddresses[0];
|
||||
setForm((current) => ({
|
||||
...current,
|
||||
customerName:
|
||||
current.customerName ||
|
||||
profile?.full_name ||
|
||||
defaultAddress?.recipient_name ||
|
||||
'',
|
||||
customerPhone:
|
||||
current.customerPhone ||
|
||||
profile?.phone ||
|
||||
defaultAddress?.phone ||
|
||||
'',
|
||||
deliveryAddress:
|
||||
current.deliveryAddress || defaultAddress?.address_line || '',
|
||||
deliveryNotes: current.deliveryNotes || defaultAddress?.notes || '',
|
||||
addressId: defaultAddress?.id || '',
|
||||
}));
|
||||
};
|
||||
void loadAddresses();
|
||||
}, [user?.id, profile?.full_name, profile?.phone]);
|
||||
|
||||
const syncCart = (nextCart: CartItem[]) => {
|
||||
setCart(nextCart);
|
||||
writeCart(nextCart);
|
||||
};
|
||||
|
||||
const showError = (message: string) => {
|
||||
setErrorMessage(message);
|
||||
window.setTimeout(() => setErrorMessage(''), 4000);
|
||||
};
|
||||
|
||||
const handleFieldChange = (field: keyof CheckoutForm, value: string) => {
|
||||
setForm((current) => ({ ...current, [field]: value }));
|
||||
if (formErrors[field])
|
||||
setFormErrors((current) => ({ ...current, [field]: undefined }));
|
||||
};
|
||||
|
||||
const handleAddressSelect = (addressId: string) => {
|
||||
const selected = addresses.find((address) => address.id === addressId);
|
||||
if (!selected) return;
|
||||
setForm((current) => ({
|
||||
...current,
|
||||
addressId,
|
||||
customerName: selected.recipient_name,
|
||||
customerPhone: selected.phone,
|
||||
deliveryAddress: selected.address_line,
|
||||
deliveryNotes: selected.notes || '',
|
||||
}));
|
||||
};
|
||||
|
||||
const validateForm = () => {
|
||||
const nextErrors: FormErrors = {};
|
||||
if (!form.customerName.trim())
|
||||
nextErrors.customerName = 'Please enter the customer name.';
|
||||
if (form.customerPhone.trim().replace(/\D/g, '').length < 7)
|
||||
nextErrors.customerPhone = 'Please enter a valid phone number.';
|
||||
if (form.deliveryAddress.trim().length < 10)
|
||||
nextErrors.deliveryAddress =
|
||||
'Please add a more complete delivery address.';
|
||||
setFormErrors(nextErrors);
|
||||
return Object.keys(nextErrors).length === 0;
|
||||
};
|
||||
|
||||
const itemCount = useMemo(
|
||||
() => cart.reduce((sum, item) => sum + item.quantity, 0),
|
||||
[cart]
|
||||
);
|
||||
const subtotal = useMemo(
|
||||
() => cart.reduce((sum, item) => sum + item.price * item.quantity, 0),
|
||||
[cart]
|
||||
);
|
||||
const deliveryFee = cart.length > 0 ? 2.99 : 0;
|
||||
const total = subtotal + deliveryFee;
|
||||
|
||||
const updateQuantity = (id: string, delta: number) =>
|
||||
syncCart(
|
||||
cart
|
||||
.map((item) =>
|
||||
item.id === id ? { ...item, quantity: item.quantity + delta } : item
|
||||
)
|
||||
.filter((item) => item.quantity > 0)
|
||||
);
|
||||
const removeItem = (id: string) =>
|
||||
syncCart(cart.filter((item) => item.id !== id));
|
||||
|
||||
const placeOrder = async () => {
|
||||
if (cart.length === 0 || isSubmitting) return;
|
||||
if (!validateForm()) {
|
||||
showError('Please complete the checkout form before placing the order.');
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
const orderNumber = `QC-${Date.now().toString().slice(-6)}`;
|
||||
const orderPayload: TablesInsert<'orders'> = {
|
||||
order_number: orderNumber,
|
||||
subtotal,
|
||||
delivery_fee: deliveryFee,
|
||||
total,
|
||||
item_count: itemCount,
|
||||
status: 'confirmed',
|
||||
customer_name: form.customerName.trim(),
|
||||
customer_phone: form.customerPhone.trim(),
|
||||
delivery_address: form.deliveryAddress.trim(),
|
||||
delivery_notes: form.deliveryNotes.trim() || null,
|
||||
user_id: guestCheckoutEnabled ? (user?.id ?? null) : user?.id,
|
||||
address_id: user ? form.addressId || null : null,
|
||||
};
|
||||
|
||||
const { data: order, error: orderError } = await supabase
|
||||
.from('orders')
|
||||
.insert(orderPayload)
|
||||
.select()
|
||||
.single();
|
||||
if (orderError || !order) {
|
||||
setIsSubmitting(false);
|
||||
showError('We could not place your order. Please try again.');
|
||||
return;
|
||||
}
|
||||
|
||||
const itemsPayload: TablesInsert<'order_items'>[] = cart.map((item) => ({
|
||||
order_id: order.id,
|
||||
product_id: item.id,
|
||||
product_name: item.name,
|
||||
unit_price: item.price,
|
||||
quantity: item.quantity,
|
||||
}));
|
||||
const { error: itemsError } = await supabase
|
||||
.from('order_items')
|
||||
.insert(itemsPayload);
|
||||
if (itemsError) {
|
||||
await supabase.from('orders').delete().eq('id', order.id);
|
||||
setIsSubmitting(false);
|
||||
showError('We could not save your order items. Please try again.');
|
||||
return;
|
||||
}
|
||||
|
||||
const savedOrder: SavedOrderInfo = {
|
||||
id: order.id,
|
||||
orderNumber: order.order_number,
|
||||
total: Number(order.total),
|
||||
itemCount: order.item_count,
|
||||
status: order.status,
|
||||
customerName: order.customer_name ?? '',
|
||||
customerPhone: order.customer_phone ?? '',
|
||||
deliveryAddress: order.delivery_address ?? '',
|
||||
deliveryNotes: order.delivery_notes ?? '',
|
||||
};
|
||||
localStorage.setItem(LAST_ORDER_STORAGE_KEY, JSON.stringify(savedOrder));
|
||||
writeCart([]);
|
||||
setCart([]);
|
||||
setIsSubmitting(false);
|
||||
history.replace('/order-confirmation');
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/home')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Your Cart</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<IonLoading isOpen={isSubmitting} message="Placing your order..." />
|
||||
{errorMessage && (
|
||||
<IonText color="danger">
|
||||
<p>{errorMessage}</p>
|
||||
</IonText>
|
||||
)}
|
||||
{cart.length === 0 ? (
|
||||
<div className="empty-state cart-empty">
|
||||
<IonIcon icon={bagHandleOutline} />
|
||||
<h3>Your cart is empty</h3>
|
||||
<p className="muted-text">
|
||||
Add your first product to place an order.
|
||||
</p>
|
||||
<IonButton onClick={() => history.push('/home')}>
|
||||
Browse products
|
||||
</IonButton>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="cart-overview-card">
|
||||
<div>
|
||||
<p className="overview-label">Items in cart</p>
|
||||
<h2>
|
||||
{itemCount} item{itemCount === 1 ? '' : 's'}
|
||||
</h2>
|
||||
</div>
|
||||
<IonText color="medium">
|
||||
<p>Review your selections before placing the order.</p>
|
||||
</IonText>
|
||||
</div>
|
||||
<IonList lines="none" className="cart-list">
|
||||
{cart.map((item) => (
|
||||
<IonItem key={item.id} className="cart-item">
|
||||
<IonLabel>
|
||||
<h2>{item.name}</h2>
|
||||
<p>${item.price.toFixed(2)} each</p>
|
||||
<strong>${(item.price * item.quantity).toFixed(2)}</strong>
|
||||
</IonLabel>
|
||||
<div className="cart-actions">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
onClick={() => updateQuantity(item.id, -1)}
|
||||
>
|
||||
<IonIcon icon={removeOutline} />
|
||||
</IonButton>
|
||||
<span>{item.quantity}</span>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
onClick={() => updateQuantity(item.id, 1)}
|
||||
>
|
||||
<IonIcon icon={addOutline} />
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
color="danger"
|
||||
onClick={() => removeItem(item.id)}
|
||||
>
|
||||
<IonIcon icon={trashOutline} />
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonItem>
|
||||
))}
|
||||
</IonList>
|
||||
<div className="checkout-card">
|
||||
<div className="section-heading checkout-heading">
|
||||
<h2>Delivery details</h2>
|
||||
<IonText color="medium">
|
||||
{user ? 'Required for checkout' : 'Guest checkout is enabled'}
|
||||
</IonText>
|
||||
</div>
|
||||
{user && addresses.length > 0 && (
|
||||
<div className="form-field full-width">
|
||||
<IonLabel position="stacked">Saved address</IonLabel>
|
||||
<IonSelect
|
||||
value={form.addressId}
|
||||
placeholder="Choose a saved address"
|
||||
className="checkout-input"
|
||||
onIonChange={(e) => handleAddressSelect(e.detail.value)}
|
||||
>
|
||||
{addresses.map((address) => (
|
||||
<IonSelectOption key={address.id} value={address.id}>
|
||||
{address.label} · {address.address_line}
|
||||
</IonSelectOption>
|
||||
))}
|
||||
</IonSelect>
|
||||
</div>
|
||||
)}
|
||||
<div className="checkout-form-grid">
|
||||
<div className="form-field">
|
||||
<IonLabel position="stacked">Customer name</IonLabel>
|
||||
<IonInput
|
||||
value={form.customerName}
|
||||
placeholder="Enter full name"
|
||||
className="checkout-input"
|
||||
onIonInput={(e) =>
|
||||
handleFieldChange('customerName', e.detail.value ?? '')
|
||||
}
|
||||
/>
|
||||
{formErrors.customerName && (
|
||||
<IonText color="danger" className="field-error">
|
||||
<p>{formErrors.customerName}</p>
|
||||
</IonText>
|
||||
)}
|
||||
</div>
|
||||
<div className="form-field">
|
||||
<IonLabel position="stacked">Phone number</IonLabel>
|
||||
<IonInput
|
||||
value={form.customerPhone}
|
||||
type="tel"
|
||||
inputmode="tel"
|
||||
placeholder="e.g. +263 77 123 4567"
|
||||
className="checkout-input"
|
||||
onIonInput={(e) =>
|
||||
handleFieldChange('customerPhone', e.detail.value ?? '')
|
||||
}
|
||||
/>
|
||||
{formErrors.customerPhone && (
|
||||
<IonText color="danger" className="field-error">
|
||||
<p>{formErrors.customerPhone}</p>
|
||||
</IonText>
|
||||
)}
|
||||
</div>
|
||||
<div className="form-field full-width">
|
||||
<IonLabel position="stacked">Delivery address</IonLabel>
|
||||
<IonTextarea
|
||||
value={form.deliveryAddress}
|
||||
autoGrow
|
||||
rows={3}
|
||||
placeholder="House number, street, suburb, city"
|
||||
className="checkout-input checkout-textarea"
|
||||
onIonInput={(e) =>
|
||||
handleFieldChange('deliveryAddress', e.detail.value ?? '')
|
||||
}
|
||||
/>
|
||||
{formErrors.deliveryAddress && (
|
||||
<IonText color="danger" className="field-error">
|
||||
<p>{formErrors.deliveryAddress}</p>
|
||||
</IonText>
|
||||
)}
|
||||
</div>
|
||||
<div className="form-field full-width">
|
||||
<IonLabel position="stacked">Delivery notes</IonLabel>
|
||||
<IonTextarea
|
||||
value={form.deliveryNotes}
|
||||
autoGrow
|
||||
rows={3}
|
||||
placeholder="Gate code, landmark, or helpful instructions"
|
||||
className="checkout-input checkout-textarea"
|
||||
onIonInput={(e) =>
|
||||
handleFieldChange('deliveryNotes', e.detail.value ?? '')
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{user && (
|
||||
<IonButton
|
||||
fill="outline"
|
||||
expand="block"
|
||||
onClick={() => history.push('/addresses')}
|
||||
>
|
||||
Manage saved addresses
|
||||
</IonButton>
|
||||
)}
|
||||
</div>
|
||||
<div className="summary-card">
|
||||
<div className="summary-row">
|
||||
<IonText color="medium">Items</IonText>
|
||||
<strong>{itemCount}</strong>
|
||||
</div>
|
||||
<div className="summary-row">
|
||||
<IonText color="medium">Subtotal</IonText>
|
||||
<strong>${subtotal.toFixed(2)}</strong>
|
||||
</div>
|
||||
<div className="summary-row">
|
||||
<IonText color="medium">Delivery</IonText>
|
||||
<strong>${deliveryFee.toFixed(2)}</strong>
|
||||
</div>
|
||||
<div className="summary-row total-row">
|
||||
<span>Total</span>
|
||||
<strong>${total.toFixed(2)}</strong>
|
||||
</div>
|
||||
<IonButton
|
||||
expand="block"
|
||||
onClick={placeOrder}
|
||||
disabled={isSubmitting}
|
||||
>
|
||||
Place order
|
||||
</IonButton>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Cart;
|
||||
@@ -0,0 +1,90 @@
|
||||
import React from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline, globeOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
|
||||
const HelloWorld: React.FC = () => {
|
||||
const history = useHistory();
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton aria-label="Back" onClick={() => history.goBack()}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Hello World</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent
|
||||
className="ion-padding"
|
||||
style={
|
||||
{ '--background': 'var(--ion-color-light)' } as React.CSSProperties
|
||||
}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
minHeight: '70vh',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
textAlign: 'center',
|
||||
gap: 16,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: 72,
|
||||
height: 72,
|
||||
borderRadius: 24,
|
||||
background: 'rgba(var(--ion-color-primary-rgb), 0.12)',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonIcon
|
||||
icon={globeOutline}
|
||||
style={{ fontSize: 36, color: 'var(--ion-color-primary)' }}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<h1
|
||||
style={{
|
||||
margin: '0 0 8px',
|
||||
fontSize: 28,
|
||||
fontWeight: 700,
|
||||
color: 'var(--ion-color-dark)',
|
||||
}}
|
||||
>
|
||||
Hello, world!
|
||||
</h1>
|
||||
<p
|
||||
style={{
|
||||
margin: 0,
|
||||
color: 'var(--ion-color-medium)',
|
||||
lineHeight: 1.5,
|
||||
}}
|
||||
>
|
||||
You made it to the new page.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default HelloWorld;
|
||||
@@ -1,159 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonList,
|
||||
IonLoading,
|
||||
IonPage,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { chevronForwardOutline, receiptOutline } from 'ionicons/icons';
|
||||
import { RefresherEventDetail } from '@ionic/core';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables } from '../database.types';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Order = Tables<'orders'>;
|
||||
const statusCopy: Record<string, string> = {
|
||||
confirmed: 'Confirmed',
|
||||
packed: 'Packed',
|
||||
out_for_delivery: 'Out for delivery',
|
||||
delivered: 'Delivered',
|
||||
};
|
||||
|
||||
const MyOrders: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user } = useAuth();
|
||||
const [orders, setOrders] = useState<Order[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [errorMessage, setErrorMessage] = useState('');
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
void setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
const loadOrders = async () => {
|
||||
if (!user) {
|
||||
setOrders([]);
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
setIsLoading(true);
|
||||
const { data, error } = await supabase
|
||||
.from('orders')
|
||||
.select('*')
|
||||
.eq('user_id', user.id)
|
||||
.order('created_at', { ascending: false });
|
||||
if (error) {
|
||||
setErrorMessage('We could not load your orders right now.');
|
||||
window.setTimeout(() => setErrorMessage(''), 4000);
|
||||
setOrders([]);
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
setOrders(data ?? []);
|
||||
setIsLoading(false);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
void loadOrders();
|
||||
}, [user?.id]);
|
||||
|
||||
const handleRefresh = async (event: CustomEvent<RefresherEventDetail>) => {
|
||||
await loadOrders();
|
||||
event.detail.complete();
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/home')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>My Orders</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
<IonLoading isOpen={isLoading} message="Loading your orders..." />
|
||||
{errorMessage && (
|
||||
<IonText color="danger">
|
||||
<p>{errorMessage}</p>
|
||||
</IonText>
|
||||
)}
|
||||
{!user ? (
|
||||
<div className="empty-state cart-empty">
|
||||
<IonIcon icon={receiptOutline} />
|
||||
<h3>Sign in to track orders</h3>
|
||||
<p className="muted-text">
|
||||
Your order history is available once you sign in.
|
||||
</p>
|
||||
<IonButton onClick={() => history.push('/auth')}>Sign in</IonButton>
|
||||
</div>
|
||||
) : !isLoading && orders.length === 0 ? (
|
||||
<div className="empty-state cart-empty">
|
||||
<IonIcon icon={receiptOutline} />
|
||||
<h3>No orders yet</h3>
|
||||
<p className="muted-text">
|
||||
Your placed orders will appear here so you can track their status.
|
||||
</p>
|
||||
<IonButton onClick={() => history.push('/home')}>
|
||||
Start shopping
|
||||
</IonButton>
|
||||
</div>
|
||||
) : (
|
||||
<IonList lines="none" className="orders-list">
|
||||
{orders.map((order) => (
|
||||
<button
|
||||
key={order.id}
|
||||
type="button"
|
||||
className="order-card"
|
||||
onClick={() => history.push(`/orders/${order.id}`)}
|
||||
>
|
||||
<div className="order-card-top">
|
||||
<div>
|
||||
<span className="order-label">Order</span>
|
||||
<h3>{order.order_number}</h3>
|
||||
</div>
|
||||
<IonIcon icon={chevronForwardOutline} />
|
||||
</div>
|
||||
<div className="order-card-row">
|
||||
<span>Status</span>
|
||||
<strong>{statusCopy[order.status] ?? order.status}</strong>
|
||||
</div>
|
||||
<div className="order-card-row">
|
||||
<span>Items</span>
|
||||
<strong>{order.item_count}</strong>
|
||||
</div>
|
||||
<div className="order-card-row">
|
||||
<span>Total</span>
|
||||
<strong>${Number(order.total).toFixed(2)}</strong>
|
||||
</div>
|
||||
<div className="order-card-date">
|
||||
{new Date(order.created_at).toLocaleString()}
|
||||
</div>
|
||||
</button>
|
||||
))}
|
||||
</IonList>
|
||||
)}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default MyOrders;
|
||||
@@ -1,149 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { checkmarkCircle } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { LAST_ORDER_STORAGE_KEY } from './Home';
|
||||
import {
|
||||
setStatusBarBackground,
|
||||
setStatusBarStyle,
|
||||
Style,
|
||||
} from '../utils/statusBar';
|
||||
|
||||
type OrderInfo = {
|
||||
id: string;
|
||||
orderNumber: string;
|
||||
total: number;
|
||||
itemCount: number;
|
||||
status: string;
|
||||
customerName: string;
|
||||
customerPhone: string;
|
||||
deliveryAddress: string;
|
||||
deliveryNotes: string;
|
||||
};
|
||||
|
||||
const OrderConfirmation: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const [order, setOrder] = useState<OrderInfo | null>(null);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
setStatusBarBackground('#ffffff');
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
try {
|
||||
const savedOrder = localStorage.getItem(LAST_ORDER_STORAGE_KEY);
|
||||
if (!savedOrder) {
|
||||
setOrder(null);
|
||||
return;
|
||||
}
|
||||
|
||||
setOrder(JSON.parse(savedOrder) as OrderInfo);
|
||||
} catch {
|
||||
setOrder(null);
|
||||
}
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonTitle>Order placed</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<div className="confirmation-card">
|
||||
<IonIcon icon={checkmarkCircle} color="success" />
|
||||
<h1>Thanks for your order!</h1>
|
||||
<p className="muted-text">
|
||||
Your order has been placed successfully and is now being prepared.
|
||||
</p>
|
||||
|
||||
{order ? (
|
||||
<>
|
||||
<div className="confirmation-details">
|
||||
<div>
|
||||
<span>Order number</span>
|
||||
<strong>{order.orderNumber}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>Status</span>
|
||||
<strong>{order.status.replaceAll('_', ' ')}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>Items</span>
|
||||
<strong>{order.itemCount}</strong>
|
||||
</div>
|
||||
<div>
|
||||
<span>Total paid</span>
|
||||
<strong>${order.total.toFixed(2)}</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="delivery-details-card">
|
||||
<h2>Delivery information</h2>
|
||||
<div className="delivery-detail-row">
|
||||
<span>Customer</span>
|
||||
<strong>{order.customerName}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row">
|
||||
<span>Phone</span>
|
||||
<strong>{order.customerPhone}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Address</span>
|
||||
<strong>{order.deliveryAddress}</strong>
|
||||
</div>
|
||||
{order.deliveryNotes && (
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Notes</span>
|
||||
<strong>{order.deliveryNotes}</strong>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<p className="muted-text">
|
||||
We could not load the order summary, but your next browse session
|
||||
is ready.
|
||||
</p>
|
||||
)}
|
||||
|
||||
{order && (
|
||||
<IonButton
|
||||
expand="block"
|
||||
onClick={() => history.replace(`/orders/${order.id}`)}
|
||||
>
|
||||
Track this order
|
||||
</IonButton>
|
||||
)}
|
||||
<IonButton
|
||||
fill="outline"
|
||||
expand="block"
|
||||
onClick={() => history.replace('/orders')}
|
||||
>
|
||||
View all orders
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
expand="block"
|
||||
onClick={() => history.replace('/home')}
|
||||
>
|
||||
Continue shopping
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default OrderConfirmation;
|
||||
@@ -1,237 +0,0 @@
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonList,
|
||||
IonLoading,
|
||||
IonPage,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { RefresherEventDetail } from '@ionic/core';
|
||||
import { RouteComponentProps, useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import type { Tables } from '../database.types';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
type Props = RouteComponentProps<{ id: string }>;
|
||||
type Order = Tables<'orders'>;
|
||||
type OrderItem = Tables<'order_items'>;
|
||||
const statusSteps = [
|
||||
'confirmed',
|
||||
'packed',
|
||||
'out_for_delivery',
|
||||
'delivered',
|
||||
] as const;
|
||||
const statusTitles: Record<(typeof statusSteps)[number], string> = {
|
||||
confirmed: 'Confirmed',
|
||||
packed: 'Packed',
|
||||
out_for_delivery: 'Out for delivery',
|
||||
delivered: 'Delivered',
|
||||
};
|
||||
|
||||
const OrderDetail: React.FC<Props> = ({ match }) => {
|
||||
const history = useHistory();
|
||||
const { user } = useAuth();
|
||||
const [order, setOrder] = useState<Order | null>(null);
|
||||
const [items, setItems] = useState<OrderItem[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [errorMessage, setErrorMessage] = useState('');
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
void setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
const loadOrder = async () => {
|
||||
if (!user) {
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
setIsLoading(true);
|
||||
const [
|
||||
{ data: orderData, error: orderError },
|
||||
{ data: itemData, error: itemError },
|
||||
] = await Promise.all([
|
||||
supabase
|
||||
.from('orders')
|
||||
.select('*')
|
||||
.eq('id', match.params.id)
|
||||
.eq('user_id', user.id)
|
||||
.single(),
|
||||
supabase
|
||||
.from('order_items')
|
||||
.select('*')
|
||||
.eq('order_id', match.params.id)
|
||||
.order('created_at', { ascending: true }),
|
||||
]);
|
||||
if (orderError || itemError || !orderData) {
|
||||
setErrorMessage('We could not load this order.');
|
||||
window.setTimeout(() => setErrorMessage(''), 4000);
|
||||
setOrder(null);
|
||||
setItems([]);
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
setOrder(orderData);
|
||||
setItems(itemData ?? []);
|
||||
setIsLoading(false);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
void loadOrder();
|
||||
}, [match.params.id, user?.id]);
|
||||
const activeStepIndex = useMemo(
|
||||
() =>
|
||||
order
|
||||
? Math.max(
|
||||
statusSteps.indexOf(order.status as (typeof statusSteps)[number]),
|
||||
0
|
||||
)
|
||||
: 0,
|
||||
[order]
|
||||
);
|
||||
const handleRefresh = async (event: CustomEvent<RefresherEventDetail>) => {
|
||||
await loadOrder();
|
||||
event.detail.complete();
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/orders')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Track Order</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
<IonLoading isOpen={isLoading} message="Loading order details..." />
|
||||
{errorMessage && (
|
||||
<IonText color="danger">
|
||||
<p>{errorMessage}</p>
|
||||
</IonText>
|
||||
)}
|
||||
{!user ? (
|
||||
<div className="empty-state cart-empty">
|
||||
<h3>Sign in to view order details</h3>
|
||||
<IonButton onClick={() => history.replace('/auth')}>
|
||||
Sign in
|
||||
</IonButton>
|
||||
</div>
|
||||
) : !isLoading && !order ? (
|
||||
<div className="empty-state cart-empty">
|
||||
<h3>Order not found</h3>
|
||||
<p className="muted-text">
|
||||
We could not find that order. Try returning to your order list.
|
||||
</p>
|
||||
<IonButton onClick={() => history.replace('/orders')}>
|
||||
Back to orders
|
||||
</IonButton>
|
||||
</div>
|
||||
) : (
|
||||
order && (
|
||||
<>
|
||||
<div className="tracking-summary-card">
|
||||
<span className="order-label">Order number</span>
|
||||
<h1>{order.order_number}</h1>
|
||||
<p className="muted-text">
|
||||
Placed on {new Date(order.created_at).toLocaleString()}
|
||||
</p>
|
||||
<div className="order-card-row">
|
||||
<span>Current status</span>
|
||||
<strong>
|
||||
{statusTitles[
|
||||
order.status as (typeof statusSteps)[number]
|
||||
] ?? order.status}
|
||||
</strong>
|
||||
</div>
|
||||
<div className="order-card-row">
|
||||
<span>Total</span>
|
||||
<strong>${Number(order.total).toFixed(2)}</strong>
|
||||
</div>
|
||||
</div>
|
||||
<div className="timeline-card">
|
||||
<h2>Delivery progress</h2>
|
||||
<div className="tracking-timeline">
|
||||
{statusSteps.map((step, index) => (
|
||||
<div
|
||||
key={step}
|
||||
className={`timeline-step ${index <= activeStepIndex ? 'active' : ''}`}
|
||||
>
|
||||
<div className="timeline-dot" />
|
||||
<div>
|
||||
<strong>{statusTitles[step]}</strong>
|
||||
<p className="muted-text">
|
||||
{index < activeStepIndex
|
||||
? 'Completed'
|
||||
: index === activeStepIndex
|
||||
? 'Current step'
|
||||
: 'Up next'}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="timeline-card delivery-details-card">
|
||||
<h2>Delivery details</h2>
|
||||
<div className="delivery-detail-row">
|
||||
<span>Customer</span>
|
||||
<strong>{order.customer_name || '—'}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row">
|
||||
<span>Phone</span>
|
||||
<strong>{order.customer_phone || '—'}</strong>
|
||||
</div>
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Address</span>
|
||||
<strong>{order.delivery_address || '—'}</strong>
|
||||
</div>
|
||||
{order.delivery_notes && (
|
||||
<div className="delivery-detail-row delivery-detail-block">
|
||||
<span>Notes</span>
|
||||
<strong>{order.delivery_notes}</strong>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="timeline-card">
|
||||
<h2>Items in this order</h2>
|
||||
<IonList lines="none" className="cart-list">
|
||||
{items.map((item) => (
|
||||
<IonItem key={item.id} className="cart-item">
|
||||
<IonLabel>
|
||||
<h2>{item.product_name}</h2>
|
||||
<p>${Number(item.unit_price).toFixed(2)} each</p>
|
||||
<strong>
|
||||
Qty {item.quantity} · $
|
||||
{(Number(item.unit_price) * item.quantity).toFixed(2)}
|
||||
</strong>
|
||||
</IonLabel>
|
||||
</IonItem>
|
||||
))}
|
||||
</IonList>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
)}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default OrderDetail;
|
||||
@@ -1,210 +0,0 @@
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
IonBadge,
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonChip,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { addOutline, cartOutline, removeOutline, star } from 'ionicons/icons';
|
||||
import { RouteComponentProps, useHistory } from 'react-router-dom';
|
||||
import { CartItem, products, readCart, writeCart } from './Home';
|
||||
import {
|
||||
setStatusBarBackground,
|
||||
setStatusBarStyle,
|
||||
Style,
|
||||
} from '../utils/statusBar';
|
||||
|
||||
type Props = RouteComponentProps<{ id: string }>;
|
||||
|
||||
const ProductDetail: React.FC<Props> = ({ match }) => {
|
||||
const history = useHistory();
|
||||
const [quantity, setQuantity] = useState(1);
|
||||
const [message, setMessage] = useState('');
|
||||
const [cartCount, setCartCount] = useState(0);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
setStatusBarBackground('#ffffff');
|
||||
const count = readCart().reduce((sum, item) => sum + item.quantity, 0);
|
||||
setCartCount(count);
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const syncCount = () => {
|
||||
const count = readCart().reduce((sum, item) => sum + item.quantity, 0);
|
||||
setCartCount(count);
|
||||
};
|
||||
|
||||
syncCount();
|
||||
window.addEventListener('storage', syncCount);
|
||||
window.addEventListener('cart:updated', syncCount as EventListener);
|
||||
|
||||
return () => {
|
||||
window.removeEventListener('storage', syncCount);
|
||||
window.removeEventListener('cart:updated', syncCount as EventListener);
|
||||
};
|
||||
}, []);
|
||||
|
||||
const product = useMemo(
|
||||
() => products.find((item) => item.id === match.params.id),
|
||||
[match.params.id]
|
||||
);
|
||||
|
||||
const showMessage = (text: string) => {
|
||||
setMessage(text);
|
||||
window.setTimeout(() => setMessage(''), 4000);
|
||||
};
|
||||
|
||||
const addToCart = () => {
|
||||
if (!product) return;
|
||||
|
||||
const cart: CartItem[] = readCart();
|
||||
const existing = cart.find((item) => item.id === product.id);
|
||||
|
||||
const nextCart = existing
|
||||
? cart.map((item) =>
|
||||
item.id === product.id
|
||||
? { ...item, quantity: item.quantity + quantity }
|
||||
: item
|
||||
)
|
||||
: [
|
||||
...cart,
|
||||
{
|
||||
id: product.id,
|
||||
name: product.name,
|
||||
price: product.price,
|
||||
quantity,
|
||||
},
|
||||
];
|
||||
|
||||
writeCart(nextCart);
|
||||
showMessage('Added to cart');
|
||||
};
|
||||
|
||||
if (!product) {
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/home')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Product</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<div className="empty-state">
|
||||
<h3>Product not found</h3>
|
||||
<p className="muted-text">This product is no longer available.</p>
|
||||
<IonButton onClick={() => history.replace('/home')}>
|
||||
Browse products
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/home')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>{product.name}</IonTitle>
|
||||
<IonButtons slot="end">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="cart-button pill-cart-button"
|
||||
onClick={() => history.push('/cart')}
|
||||
>
|
||||
<IonIcon icon={cartOutline} />
|
||||
<span>{cartCount}</span>
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent fullscreen>
|
||||
<div className="detail-hero ion-padding">
|
||||
<div className="detail-image-wrap">
|
||||
<img
|
||||
src={product.image}
|
||||
alt={product.imageAlt}
|
||||
className="detail-image"
|
||||
/>
|
||||
</div>
|
||||
<IonChip color="secondary">{product.category}</IonChip>
|
||||
<h1>{product.name}</h1>
|
||||
<div className="detail-meta">
|
||||
<IonBadge color="light">
|
||||
<IonIcon icon={star} /> {product.rating}
|
||||
</IonBadge>
|
||||
<IonBadge color="light">Ready in {product.prepTime}</IonBadge>
|
||||
</div>
|
||||
<p className="muted-text">{product.description}</p>
|
||||
<div className="detail-price">${product.price.toFixed(2)}</div>
|
||||
</div>
|
||||
|
||||
<div className="detail-panel ion-padding">
|
||||
<h2>Choose quantity</h2>
|
||||
<div className="quantity-row">
|
||||
<IonButton
|
||||
fill="outline"
|
||||
onClick={() => setQuantity((value) => Math.max(1, value - 1))}
|
||||
>
|
||||
<IonIcon icon={removeOutline} />
|
||||
</IonButton>
|
||||
<span>{quantity}</span>
|
||||
<IonButton
|
||||
fill="outline"
|
||||
onClick={() => setQuantity((value) => value + 1)}
|
||||
>
|
||||
<IonIcon icon={addOutline} />
|
||||
</IonButton>
|
||||
</div>
|
||||
|
||||
<div className="order-box">
|
||||
<div>
|
||||
<IonText color="medium">
|
||||
<p>Total</p>
|
||||
</IonText>
|
||||
<strong>${(product.price * quantity).toFixed(2)}</strong>
|
||||
</div>
|
||||
<IonButton expand="block" onClick={addToCart}>
|
||||
Add to cart
|
||||
</IonButton>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<IonText color="success">
|
||||
<p>{message}</p>
|
||||
</IonText>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
fill="clear"
|
||||
expand="block"
|
||||
onClick={() => history.push('/cart')}
|
||||
>
|
||||
Go to cart
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default ProductDetail;
|
||||
@@ -1,131 +0,0 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonInput,
|
||||
IonItem,
|
||||
IonLabel,
|
||||
IonPage,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
|
||||
const Profile: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user, profile, refreshProfile, signOut } = useAuth();
|
||||
const [fullName, setFullName] = useState('');
|
||||
const [phone, setPhone] = useState('');
|
||||
const [message, setMessage] = useState('');
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
setFullName(profile?.full_name ?? '');
|
||||
setPhone(profile?.phone ?? '');
|
||||
}, [profile]);
|
||||
|
||||
const showMessage = (msg: string) => {
|
||||
setMessage(msg);
|
||||
window.setTimeout(() => setMessage(''), 4000);
|
||||
};
|
||||
|
||||
const saveProfile = async () => {
|
||||
if (!user) return;
|
||||
const { error } = await supabase.from('profiles').upsert({
|
||||
id: user.id,
|
||||
full_name: fullName.trim() || null,
|
||||
phone: phone.trim() || null,
|
||||
updated_at: new Date().toISOString(),
|
||||
});
|
||||
|
||||
if (!error) {
|
||||
await refreshProfile();
|
||||
showMessage('Profile saved.');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton fill="clear" onClick={() => history.replace('/home')}>
|
||||
Back
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Profile</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent className="ion-padding">
|
||||
<div className="auth-card">
|
||||
<h1>Your account</h1>
|
||||
<p className="muted-text">Signed in as {user?.email}</p>
|
||||
{message && (
|
||||
<IonText color="success">
|
||||
<p>{message}</p>
|
||||
</IonText>
|
||||
)}
|
||||
<div className="auth-form">
|
||||
<IonItem lines="none" className="auth-input-item">
|
||||
<IonLabel position="stacked">Full name</IonLabel>
|
||||
<IonInput
|
||||
value={fullName}
|
||||
onIonInput={(e) => setFullName(e.detail.value ?? '')}
|
||||
/>
|
||||
</IonItem>
|
||||
<IonItem lines="none" className="auth-input-item">
|
||||
<IonLabel position="stacked">Phone</IonLabel>
|
||||
<IonInput
|
||||
value={phone}
|
||||
type="tel"
|
||||
onIonInput={(e) => setPhone(e.detail.value ?? '')}
|
||||
/>
|
||||
</IonItem>
|
||||
<IonButton expand="block" onClick={saveProfile}>
|
||||
Save profile
|
||||
</IonButton>
|
||||
<IonButton
|
||||
expand="block"
|
||||
fill="outline"
|
||||
onClick={() => history.push('/addresses')}
|
||||
>
|
||||
Saved addresses
|
||||
</IonButton>
|
||||
{profile?.is_admin && (
|
||||
<IonButton
|
||||
expand="block"
|
||||
fill="outline"
|
||||
onClick={() => history.push('/admin/orders')}
|
||||
>
|
||||
Admin workflow
|
||||
</IonButton>
|
||||
)}
|
||||
<IonButton
|
||||
color="medium"
|
||||
expand="block"
|
||||
fill="clear"
|
||||
onClick={async () => {
|
||||
await signOut();
|
||||
history.replace('/auth');
|
||||
}}
|
||||
>
|
||||
Sign out
|
||||
</IonButton>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default Profile;
|
||||
@@ -2,6 +2,6 @@ import { createClient } from '@supabase/supabase-js';
|
||||
import type { Database } from './database.types';
|
||||
|
||||
export const supabase = createClient<Database>(
|
||||
'https://ztrqscwsjnfvcuaakqus.supabase.co',
|
||||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inp0cnFzY3dzam5mdmN1YWFrcXVzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Nzk4ODk5MzEsImV4cCI6MjA5NTQ2NTkzMX0.htIOqPM90Uk0dYIdD8X8_tLfq5URcSvmCArfVRF4jeQ',
|
||||
'https://twfddmesszhmlsvdgrcv.supabase.co',
|
||||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InR3ZmRkbWVzc3pobWxzdmRncmN2Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3Nzk1Njg0NDQsImV4cCI6MjA5NTE0NDQ0NH0.52RDOTgew7wQLK4dILj_Trxox7VLr7pv6dYX--UO10M',
|
||||
);
|
||||
|
||||
@@ -1,701 +1,65 @@
|
||||
/* Ionic CSS Variables — customise to match your app's brand */
|
||||
:root {
|
||||
--ion-color-primary: #ff7a45;
|
||||
--ion-color-primary-rgb: 255, 122, 69;
|
||||
--ion-color-primary: #3880ff;
|
||||
--ion-color-primary-rgb: 56, 128, 255;
|
||||
--ion-color-primary-contrast: #ffffff;
|
||||
--ion-color-primary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-primary-shade: #e06b3d;
|
||||
--ion-color-primary-tint: #ff8758;
|
||||
--ion-color-primary-shade: #3171e0;
|
||||
--ion-color-primary-tint: #4c8dff;
|
||||
|
||||
--ion-color-secondary: #1f9d8b;
|
||||
--ion-color-secondary-rgb: 31, 157, 139;
|
||||
--ion-color-secondary: #3dc2ff;
|
||||
--ion-color-secondary-rgb: 61, 194, 255;
|
||||
--ion-color-secondary-contrast: #ffffff;
|
||||
--ion-color-secondary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-secondary-shade: #1b8a7a;
|
||||
--ion-color-secondary-tint: #35a794;
|
||||
--ion-color-secondary-shade: #36abe0;
|
||||
--ion-color-secondary-tint: #50c8ff;
|
||||
|
||||
--ion-color-tertiary: #6c63ff;
|
||||
--ion-color-tertiary-rgb: 108, 99, 255;
|
||||
--ion-color-tertiary: #5260ff;
|
||||
--ion-color-tertiary-rgb: 82, 96, 255;
|
||||
--ion-color-tertiary-contrast: #ffffff;
|
||||
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-tertiary-shade: #5f57e0;
|
||||
--ion-color-tertiary-tint: #7b73ff;
|
||||
--ion-color-tertiary-shade: #4854e0;
|
||||
--ion-color-tertiary-tint: #6370ff;
|
||||
|
||||
--ion-color-success: #2fb36d;
|
||||
--ion-color-success-rgb: 47, 179, 109;
|
||||
--ion-color-success: #2dd36f;
|
||||
--ion-color-success-rgb: 45, 211, 111;
|
||||
--ion-color-success-contrast: #ffffff;
|
||||
--ion-color-success-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-success-shade: #299d60;
|
||||
--ion-color-success-tint: #44bb7c;
|
||||
--ion-color-success-shade: #28ba62;
|
||||
--ion-color-success-tint: #42d77d;
|
||||
|
||||
--ion-color-warning: #f4b400;
|
||||
--ion-color-warning-rgb: 244, 180, 0;
|
||||
--ion-color-warning: #ffc409;
|
||||
--ion-color-warning-rgb: 255, 196, 9;
|
||||
--ion-color-warning-contrast: #000000;
|
||||
--ion-color-warning-contrast-rgb: 0, 0, 0;
|
||||
--ion-color-warning-shade: #d79e00;
|
||||
--ion-color-warning-tint: #f5bc1a;
|
||||
--ion-color-warning-shade: #e0ac08;
|
||||
--ion-color-warning-tint: #ffca22;
|
||||
|
||||
--ion-color-danger: #d64550;
|
||||
--ion-color-danger-rgb: 214, 69, 80;
|
||||
--ion-color-danger: #eb445a;
|
||||
--ion-color-danger-rgb: 235, 68, 90;
|
||||
--ion-color-danger-contrast: #ffffff;
|
||||
--ion-color-danger-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-danger-shade: #bc3d46;
|
||||
--ion-color-danger-tint: #da5862;
|
||||
--ion-color-danger-shade: #cf3c4f;
|
||||
--ion-color-danger-tint: #ed576b;
|
||||
|
||||
--ion-color-dark: #1d1b22;
|
||||
--ion-color-dark-rgb: 29, 27, 34;
|
||||
--ion-color-dark: #222428;
|
||||
--ion-color-dark-rgb: 34, 36, 40;
|
||||
--ion-color-dark-contrast: #ffffff;
|
||||
--ion-color-dark-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-dark-shade: #1a181e;
|
||||
--ion-color-dark-tint: #34323b;
|
||||
--ion-color-dark-shade: #1e2023;
|
||||
--ion-color-dark-tint: #383a3e;
|
||||
|
||||
--ion-color-medium: #7a7685;
|
||||
--ion-color-medium-rgb: 122, 118, 133;
|
||||
--ion-color-medium: #92949c;
|
||||
--ion-color-medium-rgb: 146, 148, 156;
|
||||
--ion-color-medium-contrast: #ffffff;
|
||||
--ion-color-medium-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-medium-shade: #6b6875;
|
||||
--ion-color-medium-tint: #87838f;
|
||||
|
||||
--ion-color-light: #fff8f2;
|
||||
--ion-color-light-rgb: 255, 248, 242;
|
||||
--ion-color-light-contrast: #1d1b22;
|
||||
--ion-color-light-contrast-rgb: 29, 27, 34;
|
||||
--ion-color-light-shade: #e0dad5;
|
||||
--ion-color-light-tint: #fff9f4;
|
||||
|
||||
--ion-background-color: #fffaf6;
|
||||
--ion-text-color: #1d1b22;
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--ion-background-color);
|
||||
}
|
||||
|
||||
.shop-header ion-toolbar {
|
||||
--background: #fff8f2;
|
||||
--border-color: transparent;
|
||||
--min-height: 72px;
|
||||
--padding-start: 8px;
|
||||
--padding-end: 8px;
|
||||
}
|
||||
|
||||
.shop-header ion-title {
|
||||
padding-inline-start: 0;
|
||||
padding-inline-end: 0;
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
|
||||
.home-title {
|
||||
text-align: left;
|
||||
padding-inline-start: 36px;
|
||||
padding-inline-end: 12px;
|
||||
}
|
||||
|
||||
.shop-content {
|
||||
--background: linear-gradient(180deg, #fff8f2 0%, #ffffff 18%, #ffffff 100%);
|
||||
}
|
||||
|
||||
.hero-card {
|
||||
margin: 16px;
|
||||
padding: 24px;
|
||||
border-radius: 24px;
|
||||
background: linear-gradient(135deg, #1d1b22, #363043);
|
||||
color: #ffffff;
|
||||
box-shadow: 0 20px 45px rgba(29, 27, 34, 0.18);
|
||||
}
|
||||
|
||||
.hero-card h1,
|
||||
.detail-hero h1,
|
||||
.confirmation-card h1 {
|
||||
margin: 14px 0 10px;
|
||||
font-size: 2rem;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
.hero-card p {
|
||||
margin: 0;
|
||||
color: rgba(255, 255, 255, 0.82);
|
||||
}
|
||||
|
||||
.catalog-section {
|
||||
padding-top: 8px;
|
||||
}
|
||||
|
||||
.section-heading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 18px 0 12px;
|
||||
}
|
||||
|
||||
.section-heading h2,
|
||||
.detail-panel h2 {
|
||||
margin: 0;
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
.product-grid {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.product-card {
|
||||
margin: 0;
|
||||
overflow: hidden;
|
||||
border-radius: 22px;
|
||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
||||
}
|
||||
|
||||
.product-card-image {
|
||||
width: 100%;
|
||||
height: 220px;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
background: #fff8f2;
|
||||
}
|
||||
|
||||
.product-card ion-card-content,
|
||||
.summary-card,
|
||||
.detail-panel,
|
||||
.confirmation-card,
|
||||
.cart-item {
|
||||
background: #ffffff;
|
||||
border-radius: 22px;
|
||||
}
|
||||
|
||||
.product-card-top,
|
||||
.product-card-footer,
|
||||
.summary-row,
|
||||
.quantity-row,
|
||||
.order-box,
|
||||
.detail-meta,
|
||||
.cart-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.product-card h3 {
|
||||
margin: 14px 0 8px;
|
||||
font-size: 1.1rem;
|
||||
}
|
||||
|
||||
.product-card p,
|
||||
.cart-item p,
|
||||
.muted-text {
|
||||
margin: 0;
|
||||
color: #6b6875;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.product-card-footer {
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.rating-pill {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
color: #f4b400;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.home-header-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
|
||||
.header-icon-button,
|
||||
.cart-button {
|
||||
position: relative;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.header-icon-button {
|
||||
--background: rgba(var(--ion-color-primary-rgb), 0.12);
|
||||
--background-hover: rgba(var(--ion-color-primary-rgb), 0.16);
|
||||
--background-activated: rgba(var(--ion-color-primary-rgb), 0.2);
|
||||
--color: var(--ion-color-primary);
|
||||
--border-radius: 999px;
|
||||
--padding-start: 14px;
|
||||
--padding-end: 14px;
|
||||
min-width: 52px;
|
||||
min-height: 52px;
|
||||
}
|
||||
|
||||
.header-icon-button ion-icon {
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.pill-cart-button {
|
||||
--background: rgba(var(--ion-color-primary-rgb), 0.12);
|
||||
--background-hover: rgba(var(--ion-color-primary-rgb), 0.16);
|
||||
--background-activated: rgba(var(--ion-color-primary-rgb), 0.2);
|
||||
--color: var(--ion-color-primary);
|
||||
--border-radius: 999px;
|
||||
--padding-start: 16px;
|
||||
--padding-end: 16px;
|
||||
--padding-top: 10px;
|
||||
--padding-bottom: 10px;
|
||||
min-width: 72px;
|
||||
min-height: 52px;
|
||||
font-weight: 700;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
|
||||
.pill-cart-button span {
|
||||
margin-left: 8px;
|
||||
font-size: 1.1rem;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.pill-cart-button ion-icon {
|
||||
font-size: 1.45rem;
|
||||
}
|
||||
|
||||
.empty-state {
|
||||
padding: 48px 24px;
|
||||
text-align: center;
|
||||
display: grid;
|
||||
gap: 12px;
|
||||
justify-items: center;
|
||||
}
|
||||
|
||||
.empty-state ion-icon,
|
||||
.confirmation-card ion-icon {
|
||||
font-size: 3rem;
|
||||
color: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
.detail-hero {
|
||||
background: linear-gradient(180deg, #fff8f2 0%, #ffffff 100%);
|
||||
}
|
||||
|
||||
.detail-image-wrap {
|
||||
margin-bottom: 18px;
|
||||
border-radius: 24px;
|
||||
overflow: hidden;
|
||||
background: #ffffff;
|
||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
||||
}
|
||||
|
||||
.detail-image {
|
||||
width: 100%;
|
||||
height: 280px;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.detail-meta {
|
||||
justify-content: flex-start;
|
||||
margin: 14px 0;
|
||||
}
|
||||
|
||||
.detail-meta ion-badge {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 8px 10px;
|
||||
}
|
||||
|
||||
.detail-price {
|
||||
margin-top: 18px;
|
||||
font-size: 2rem;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.detail-panel {
|
||||
margin: 8px 16px 24px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
||||
}
|
||||
|
||||
.quantity-row {
|
||||
justify-content: flex-start;
|
||||
margin: 16px 0 24px;
|
||||
}
|
||||
|
||||
.quantity-row span,
|
||||
.cart-actions span {
|
||||
min-width: 24px;
|
||||
text-align: center;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.order-box {
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.order-box strong,
|
||||
.summary-row strong,
|
||||
.confirmation-details strong {
|
||||
font-size: 1.1rem;
|
||||
}
|
||||
|
||||
.cart-overview-card {
|
||||
margin-bottom: 16px;
|
||||
padding: 20px;
|
||||
border-radius: 22px;
|
||||
background: #fff8f2;
|
||||
display: grid;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.cart-overview-card h2 {
|
||||
margin: 4px 0 0;
|
||||
font-size: 1.4rem;
|
||||
}
|
||||
|
||||
.overview-label {
|
||||
margin: 0;
|
||||
color: #7a7685;
|
||||
font-size: 0.85rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
}
|
||||
|
||||
.cart-overview-card p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.cart-list {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.cart-item {
|
||||
--background: #ffffff;
|
||||
--padding-start: 16px;
|
||||
--inner-padding-end: 16px;
|
||||
margin-bottom: 12px;
|
||||
box-shadow: 0 12px 28px rgba(32, 24, 18, 0.08);
|
||||
}
|
||||
|
||||
.cart-actions {
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
|
||||
.summary-card,
|
||||
.checkout-card,
|
||||
.confirmation-card,
|
||||
.order-card,
|
||||
.tracking-summary-card,
|
||||
.timeline-card,
|
||||
.delivery-details-card {
|
||||
padding: 20px;
|
||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
||||
}
|
||||
|
||||
.checkout-card,
|
||||
.summary-card {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.checkout-card {
|
||||
background: #ffffff;
|
||||
border-radius: 22px;
|
||||
}
|
||||
|
||||
.checkout-heading {
|
||||
margin: 0 0 18px;
|
||||
}
|
||||
|
||||
.checkout-form-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.form-field {
|
||||
display: grid;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.form-field.full-width {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.form-field ion-label {
|
||||
font-size: 0.95rem;
|
||||
font-weight: 600;
|
||||
color: #4f4a5b;
|
||||
}
|
||||
|
||||
.checkout-input {
|
||||
--background: #fff8f2;
|
||||
--padding-start: 14px;
|
||||
--padding-end: 14px;
|
||||
--padding-top: 14px;
|
||||
--padding-bottom: 14px;
|
||||
border-radius: 16px;
|
||||
border: 1px solid #f0e5db;
|
||||
}
|
||||
|
||||
.checkout-textarea {
|
||||
min-height: 112px;
|
||||
}
|
||||
|
||||
.field-error p {
|
||||
margin: 0;
|
||||
font-size: 0.88rem;
|
||||
}
|
||||
|
||||
.total-row {
|
||||
margin: 14px 0 20px;
|
||||
padding-top: 14px;
|
||||
border-top: 1px solid #f0ebe7;
|
||||
font-size: 1.05rem;
|
||||
}
|
||||
|
||||
.confirmation-card {
|
||||
margin-top: 8vh;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.confirmation-details {
|
||||
margin: 24px 0 16px;
|
||||
padding: 16px;
|
||||
border-radius: 18px;
|
||||
background: #fff8f2;
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.delivery-details-card {
|
||||
margin: 0 0 24px;
|
||||
border-radius: 18px;
|
||||
background: #fffdfb;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.delivery-detail-row {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 16px;
|
||||
padding: 10px 0;
|
||||
border-bottom: 1px solid #f5ede6;
|
||||
}
|
||||
|
||||
.delivery-detail-row:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.delivery-detail-row span {
|
||||
color: #7a7685;
|
||||
font-size: 0.92rem;
|
||||
}
|
||||
|
||||
.delivery-detail-row strong {
|
||||
color: #1d1b22;
|
||||
text-align: right;
|
||||
max-width: 65%;
|
||||
}
|
||||
|
||||
.delivery-detail-block {
|
||||
display: grid;
|
||||
}
|
||||
|
||||
.delivery-detail-block strong {
|
||||
max-width: none;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.confirmation-details span {
|
||||
display: block;
|
||||
margin-bottom: 4px;
|
||||
color: #7a7685;
|
||||
font-size: 0.92rem;
|
||||
}
|
||||
|
||||
.orders-list {
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.order-card {
|
||||
width: 100%;
|
||||
border: 0;
|
||||
text-align: left;
|
||||
background: #ffffff;
|
||||
border-radius: 22px;
|
||||
}
|
||||
|
||||
.order-card-top,
|
||||
.order-card-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.order-card-top {
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.order-card-row {
|
||||
margin-top: 10px;
|
||||
color: #6b6875;
|
||||
}
|
||||
|
||||
.order-card-row strong {
|
||||
color: #1d1b22;
|
||||
}
|
||||
|
||||
.order-card h3,
|
||||
.tracking-summary-card h1,
|
||||
.timeline-card h2 {
|
||||
margin: 6px 0 0;
|
||||
}
|
||||
|
||||
.order-label {
|
||||
font-size: 0.8rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
color: #7a7685;
|
||||
}
|
||||
|
||||
.order-card-date {
|
||||
margin-top: 16px;
|
||||
color: #7a7685;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.tracking-summary-card {
|
||||
background: linear-gradient(180deg, #fff8f2 0%, #ffffff 100%);
|
||||
border-radius: 24px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.timeline-card {
|
||||
background: #ffffff;
|
||||
border-radius: 24px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.tracking-timeline {
|
||||
display: grid;
|
||||
gap: 16px;
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.timeline-step {
|
||||
display: grid;
|
||||
grid-template-columns: 18px 1fr;
|
||||
gap: 12px;
|
||||
align-items: start;
|
||||
opacity: 0.55;
|
||||
}
|
||||
|
||||
.timeline-step.active {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.timeline-dot {
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
border-radius: 999px;
|
||||
margin-top: 4px;
|
||||
background: #e7dfd7;
|
||||
box-shadow: 0 0 0 6px #f8f3ee;
|
||||
}
|
||||
|
||||
.timeline-step.active .timeline-dot {
|
||||
background: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
.cart-empty {
|
||||
min-height: 70vh;
|
||||
align-content: center;
|
||||
}
|
||||
|
||||
.auth-page {
|
||||
--background: linear-gradient(180deg, #fff8f2 0%, #ffffff 30%, #ffffff 100%);
|
||||
}
|
||||
|
||||
.auth-card {
|
||||
background: #ffffff;
|
||||
border-radius: 24px;
|
||||
padding: 24px;
|
||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
||||
max-width: 640px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.auth-card h1 {
|
||||
margin: 0 0 8px;
|
||||
}
|
||||
|
||||
.auth-form {
|
||||
display: grid;
|
||||
gap: 14px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.auth-input-item {
|
||||
--background: #fff8f2;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin: 8px 0 18px;
|
||||
}
|
||||
|
||||
.filter-chip-row {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
overflow-x: auto;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
.filter-button {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.filter-modal h2 {
|
||||
margin: 4px 0 16px;
|
||||
}
|
||||
|
||||
.default-pill {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
padding: 6px 10px;
|
||||
border-radius: 999px;
|
||||
background: rgba(var(--ion-color-primary-rgb), 0.12);
|
||||
color: var(--ion-color-primary);
|
||||
font-weight: 700;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.admin-order-item ion-select {
|
||||
min-width: 150px;
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.checkout-form-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.delivery-detail-row {
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.delivery-detail-row strong {
|
||||
max-width: none;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
--ion-color-medium-shade: #808289;
|
||||
--ion-color-medium-tint: #9d9fa6;
|
||||
|
||||
--ion-color-light: #f4f5f8;
|
||||
--ion-color-light-rgb: 244, 245, 248;
|
||||
--ion-color-light-contrast: #000000;
|
||||
--ion-color-light-contrast-rgb: 0, 0, 0;
|
||||
--ion-color-light-shade: #d7d8da;
|
||||
--ion-color-light-tint: #f5f6f9;
|
||||
}
|
||||
|
||||
@@ -1,18 +1,14 @@
|
||||
import { StatusBar, Style } from '@capacitor/status-bar';
|
||||
export { Style };
|
||||
|
||||
``
|
||||
const _origin = (() => {
|
||||
try {
|
||||
if (document.referrer) return new URL(document.referrer).origin;
|
||||
} catch {}
|
||||
try { if (document.referrer) return new URL(document.referrer).origin; } catch {}
|
||||
return window.location.origin;
|
||||
})();
|
||||
|
||||
/** Set status bar icon/text colour. Use instead of StatusBar.setStyle directly. */
|
||||
export async function setStatusBarStyle(style: Style): Promise<void> {
|
||||
try {
|
||||
await StatusBar.setStyle({ style });
|
||||
} catch {}
|
||||
try { await StatusBar.setStyle({ style }); } catch {}
|
||||
if (window.parent !== window) {
|
||||
window.parent.postMessage({ type: '__apsuite_statusbar', style }, _origin);
|
||||
}
|
||||
@@ -20,13 +16,8 @@ export async function setStatusBarStyle(style: Style): Promise<void> {
|
||||
|
||||
/** Set status bar background colour (Android). Use instead of StatusBar.setBackgroundColor directly. */
|
||||
export async function setStatusBarBackground(color: string): Promise<void> {
|
||||
try {
|
||||
await (StatusBar as any).setBackgroundColor({ color });
|
||||
} catch {}
|
||||
try { await (StatusBar as any).setBackgroundColor({ color }); } catch {}
|
||||
if (window.parent !== window) {
|
||||
window.parent.postMessage(
|
||||
{ type: '__apsuite_statusbar_bg', color },
|
||||
_origin
|
||||
);
|
||||
window.parent.postMessage({ type: '__apsuite_statusbar_bg', color }, _origin);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
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'
|
||||
rgcfaIncludeGoogle = true
|
||||
androidxCredentialsVersion = '1.3.0'
|
||||
}
|
||||
@@ -21,7 +21,9 @@ export default defineConfig({
|
||||
port: 8100,
|
||||
allowedHosts: true,
|
||||
hmr: {
|
||||
clientPort: process.env.HMR_CLIENT_PORT ? parseInt(process.env.HMR_CLIENT_PORT) : undefined,
|
||||
clientPort: process.env.HMR_CLIENT_PORT
|
||||
? parseInt(process.env.HMR_CLIENT_PORT)
|
||||
: undefined,
|
||||
},
|
||||
},
|
||||
css: { devSourcemap: false },
|
||||
|
||||
@@ -216,16 +216,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@capacitor-firebase/authentication@npm:^7.0.0":
|
||||
version: 7.5.0
|
||||
resolution: "@capacitor-firebase/authentication@npm:7.5.0"
|
||||
"@capacitor-firebase/authentication@npm:^8.0.0":
|
||||
version: 8.2.0
|
||||
resolution: "@capacitor-firebase/authentication@npm:8.2.0"
|
||||
peerDependencies:
|
||||
"@capacitor/core": ">=7.0.0"
|
||||
firebase: ^11.2.0
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
firebase: ^12.6.0
|
||||
peerDependenciesMeta:
|
||||
firebase:
|
||||
optional: true
|
||||
checksum: 10c0/aea4854cd6f8f2282bbbfb5cb0e30dc7152cd593a70c6792a1583fa085803f9330a77584f3ae66ee8c9b65b035374c2fe86545b191d57c0814778b6276306e1e
|
||||
checksum: 10c0/497c8063e3145ee719dbeb206bd30d7e9581471a7dfa6e6bb3067e96c29468a8035430101abcb0c724bec936e30ca1863344723115ae0b3a9a317e192c0ef3d2
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -284,16 +284,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@capacitor/google-maps@npm:^6.0.0":
|
||||
version: 6.0.1
|
||||
resolution: "@capacitor/google-maps@npm:6.0.1"
|
||||
"@capacitor/google-maps@npm:^8.0.0":
|
||||
version: 8.0.1
|
||||
resolution: "@capacitor/google-maps@npm:8.0.1"
|
||||
dependencies:
|
||||
"@googlemaps/js-api-loader": "npm:~1.13.7"
|
||||
"@googlemaps/markerclusterer": "npm:~2.0.7"
|
||||
"@types/google.maps": "npm:~3.50.5"
|
||||
"@googlemaps/js-api-loader": "npm:^2.0.2"
|
||||
"@googlemaps/markerclusterer": "npm:^2.6.2"
|
||||
"@types/google.maps": "npm:^3.58.1"
|
||||
peerDependencies:
|
||||
"@capacitor/core": ^6.1.0
|
||||
checksum: 10c0/f20f650884901d8505a90b8e63de00efe1c2ae35391842008f67a3a21e16269afb8efb172d6fad5b0e9e72ca6eb238a86305ae138c184b49ee03ef32e738ed60
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
checksum: 10c0/3b947ef116ac2efcc6611cd2b713adc3466e1dca8ea3cdd9e8e73c8d20265d216dc3c2ee62c273305c68f04eecf1190e54016449f9adbf16ce5b48f4519473f1
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -324,12 +324,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@capacitor/push-notifications@npm:^6.0.0":
|
||||
version: 6.0.5
|
||||
resolution: "@capacitor/push-notifications@npm:6.0.5"
|
||||
"@capacitor/push-notifications@npm:^8.1.1":
|
||||
version: 8.1.1
|
||||
resolution: "@capacitor/push-notifications@npm:8.1.1"
|
||||
peerDependencies:
|
||||
"@capacitor/core": ^6.0.0
|
||||
checksum: 10c0/6efd52e0778abe5bc8389d73e3afd44d10614f9a5a2b26e829e0822b7dcc74771267c5e860ba2b5264711cc2fa9058881cb7fd5f6887aded3a85096679960014
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
checksum: 10c0/4641fd997e03385676c12848c9ba3bb36a180450926614efb1769d8e6579c60641365e1018f8d846979c5c411f9152b50be4bac7c2e4d06dbf7c1954c07e181c
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1042,22 +1042,23 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@googlemaps/js-api-loader@npm:~1.13.7":
|
||||
version: 1.13.11
|
||||
resolution: "@googlemaps/js-api-loader@npm:1.13.11"
|
||||
"@googlemaps/js-api-loader@npm:^2.0.2":
|
||||
version: 2.0.2
|
||||
resolution: "@googlemaps/js-api-loader@npm:2.0.2"
|
||||
dependencies:
|
||||
fast-deep-equal: "npm:^3.1.3"
|
||||
checksum: 10c0/a999e007803b3bb4e5d8d9b6f1565afdb3c4d0794529f5e0b7ecc12fca9987882bf8c9d549e324e7027973d6059acfa47430a13f1012b19d4a228d55f664fca6
|
||||
"@types/google.maps": "npm:^3.53.1"
|
||||
checksum: 10c0/1bd8f1e117145de83a7cfca7c05cf4cfb2d9095d507497f8b0e590be94de3a6a27a7a3c80801de6f58d77e5a2ce169a6b6d9c9d0dfc20ea1039d890226318c46
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@googlemaps/markerclusterer@npm:~2.0.7":
|
||||
version: 2.0.15
|
||||
resolution: "@googlemaps/markerclusterer@npm:2.0.15"
|
||||
"@googlemaps/markerclusterer@npm:^2.6.2":
|
||||
version: 2.6.2
|
||||
resolution: "@googlemaps/markerclusterer@npm:2.6.2"
|
||||
dependencies:
|
||||
fast-deep-equal: "npm:^3.1.3"
|
||||
supercluster: "npm:^7.1.3"
|
||||
checksum: 10c0/7e66a3b73d4b6c1d5329caa7857e149171262213741c648a45fc19204036ea66392986e96c0886ec43ac66b9aa52c8a05f80c3e6a58ccba327db45f418b3c965
|
||||
"@types/supercluster": "npm:^7.1.3"
|
||||
fast-equals: "npm:^5.2.2"
|
||||
supercluster: "npm:^8.0.1"
|
||||
checksum: 10c0/bfe4ffef9dc9f635fca93968d71b2019c936b46480e38dbfb885c3bed1589c9a353e428880a018f8fbc50c2cb16257c4822742d2e49f963dd9ff5d7ffe12f9cb
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1107,17 +1108,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/core@npm:8.8.8":
|
||||
version: 8.8.8
|
||||
resolution: "@ionic/core@npm:8.8.8"
|
||||
dependencies:
|
||||
"@stencil/core": "npm:4.43.0"
|
||||
ionicons: "npm:^8.0.13"
|
||||
tslib: "npm:^2.1.0"
|
||||
checksum: 10c0/fea32925aaebec558c1c3bb9c30f8c0806d3480a67936e63cdcce8846138688d9b6b5b853ebe771132f0f79efef16568b17d11495f7997ea325a265a7e7d7af3
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/pwa-elements@npm:^3.0.0":
|
||||
version: 3.4.0
|
||||
resolution: "@ionic/pwa-elements@npm:3.4.0"
|
||||
@@ -1125,36 +1115,22 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/react-router@npm:^8.5.0":
|
||||
version: 8.8.8
|
||||
resolution: "@ionic/react-router@npm:8.8.8"
|
||||
"@ionic/react-router@npm:8.8.7":
|
||||
version: 8.8.7
|
||||
resolution: "@ionic/react-router@npm:8.8.7"
|
||||
dependencies:
|
||||
"@ionic/react": "npm:8.8.8"
|
||||
"@ionic/react": "npm:8.8.7"
|
||||
tslib: "npm:*"
|
||||
peerDependencies:
|
||||
react: ">=16.8.6"
|
||||
react-dom: ">=16.8.6"
|
||||
react-router: ^5.0.1
|
||||
react-router-dom: ^5.0.1
|
||||
checksum: 10c0/be9555ec4dbfd0565cada39d42236eb0b9e2283a13f500b42d5c0c06d6198c17a7be385cfb2ce4f9e89236c71992c30169328b861943a3fe7344c672ad94ae0c
|
||||
checksum: 10c0/302d6ad9c0d450cf6466ff18622aa7708af77c1c4a676d2ff39eca6add440fe96d36a157feae146c3da460c32e7799357320b3270740b050ab040a664b9f0ff2
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/react@npm:8.8.8":
|
||||
version: 8.8.8
|
||||
resolution: "@ionic/react@npm:8.8.8"
|
||||
dependencies:
|
||||
"@ionic/core": "npm:8.8.8"
|
||||
ionicons: "npm:^8.0.13"
|
||||
tslib: "npm:*"
|
||||
peerDependencies:
|
||||
react: ">=16.8.6"
|
||||
react-dom: ">=16.8.6"
|
||||
checksum: 10c0/b1b8888f487dc564735adde57ef3cd054e6c9bc38601f133823e69cb98d8e51c99c8902fe48fdd11ee5521ae58b322f110a1fbc8b8fd9bc62e27fc0b806bddd0
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/react@npm:^8.5.0":
|
||||
"@ionic/react@npm:8.8.7":
|
||||
version: 8.8.7
|
||||
resolution: "@ionic/react@npm:8.8.7"
|
||||
dependencies:
|
||||
@@ -1880,10 +1856,17 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/google.maps@npm:~3.50.5":
|
||||
version: 3.50.5
|
||||
resolution: "@types/google.maps@npm:3.50.5"
|
||||
checksum: 10c0/df07121bc3a7c5511f2a6f31d461a72f74f24ab68ce7303f11d6676616d1909733b76c238836a41a4ed569666c2fa0dac4859a12ae4144c4cc687a125f59949a
|
||||
"@types/geojson@npm:*":
|
||||
version: 7946.0.16
|
||||
resolution: "@types/geojson@npm:7946.0.16"
|
||||
checksum: 10c0/1ff24a288bd5860b766b073ead337d31d73bdc715e5b50a2cee5cb0af57a1ed02cc04ef295f5fa68dc40fe3e4f104dd31282b2b818a5ba3231bc1001ba084e3c
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/google.maps@npm:^3.53.1, @types/google.maps@npm:^3.58.1":
|
||||
version: 3.64.1
|
||||
resolution: "@types/google.maps@npm:3.64.1"
|
||||
checksum: 10c0/4ade621941045c7e1b1ead30e0b4025b7fccf2b4cfb7c9b5f48c31cceb964c74d17c28b6105be15b99df85c23e19b25415e9fd7bdd7b1d40b7000d22dbbb4e7e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1956,6 +1939,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/supercluster@npm:^7.1.3":
|
||||
version: 7.1.3
|
||||
resolution: "@types/supercluster@npm:7.1.3"
|
||||
dependencies:
|
||||
"@types/geojson": "npm:*"
|
||||
checksum: 10c0/0d55dad98df0990fc38a7bb64dc23dda46014187c0d7638e6f2b6717ba8931b13e5b1d394789833a2ac822014c977ef64623dffd81a0bbf39e52c53c8183741f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@vitejs/plugin-react@npm:^4.0.1":
|
||||
version: 4.7.0
|
||||
resolution: "@vitejs/plugin-react@npm:4.7.0"
|
||||
@@ -2015,20 +2007,20 @@ __metadata:
|
||||
version: 0.0.0-use.local
|
||||
resolution: "app@workspace:."
|
||||
dependencies:
|
||||
"@capacitor-firebase/authentication": "npm:^7.0.0"
|
||||
"@capacitor-firebase/authentication": "npm:^8.0.0"
|
||||
"@capacitor/android": "npm:8.3.4"
|
||||
"@capacitor/app": "npm:8.1.0"
|
||||
"@capacitor/cli": "npm:8.3.4"
|
||||
"@capacitor/core": "npm:8.3.4"
|
||||
"@capacitor/google-maps": "npm:^6.0.0"
|
||||
"@capacitor/google-maps": "npm:^8.0.0"
|
||||
"@capacitor/haptics": "npm:8.0.2"
|
||||
"@capacitor/ios": "npm:8.3.4"
|
||||
"@capacitor/keyboard": "npm:8.0.3"
|
||||
"@capacitor/push-notifications": "npm:^6.0.0"
|
||||
"@capacitor/push-notifications": "npm:^8.1.1"
|
||||
"@capacitor/status-bar": "npm:8.0.2"
|
||||
"@ionic/pwa-elements": "npm:^3.0.0"
|
||||
"@ionic/react": "npm:^8.5.0"
|
||||
"@ionic/react-router": "npm:^8.5.0"
|
||||
"@ionic/react": "npm:8.8.7"
|
||||
"@ionic/react-router": "npm:8.8.7"
|
||||
"@supabase/supabase-js": "npm:^2.0.0"
|
||||
"@types/katex": "npm:^0.16.0"
|
||||
"@types/react": "npm:^19.0.0"
|
||||
@@ -2374,10 +2366,10 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"fast-deep-equal@npm:^3.1.3":
|
||||
version: 3.1.3
|
||||
resolution: "fast-deep-equal@npm:3.1.3"
|
||||
checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
|
||||
"fast-equals@npm:^5.2.2":
|
||||
version: 5.4.0
|
||||
resolution: "fast-equals@npm:5.4.0"
|
||||
checksum: 10c0/4fdce3a8f814e78af7296ca4ebe82f4765074a6dfe557ee98c18f5d2958c3de59025fbff7556d65f250165ccef424d37f9952ee159400f8ebe5f2edb704ec80e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -2692,10 +2684,10 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"kdbush@npm:^3.0.0":
|
||||
version: 3.0.0
|
||||
resolution: "kdbush@npm:3.0.0"
|
||||
checksum: 10c0/3fc8795870bd04f60627e7345b26fd0644beb91bc4164912c9d9378b39c674ba01c31db68ecaf6266d51c9ad81bf5b770b7effa51eeee37553d38293a094a686
|
||||
"kdbush@npm:^4.0.2":
|
||||
version: 4.1.0
|
||||
resolution: "kdbush@npm:4.1.0"
|
||||
checksum: 10c0/b47c8a27de438df1e60080f73e3793217b4542a62bed7f07c8c29b0bf53359bbdba1e97305e396f7f4d28f98e31ce3fd21500dc3de03a44d8cda71a3d70ff7bb
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -3364,12 +3356,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"supercluster@npm:^7.1.3":
|
||||
version: 7.1.5
|
||||
resolution: "supercluster@npm:7.1.5"
|
||||
"supercluster@npm:^8.0.1":
|
||||
version: 8.0.1
|
||||
resolution: "supercluster@npm:8.0.1"
|
||||
dependencies:
|
||||
kdbush: "npm:^3.0.0"
|
||||
checksum: 10c0/bbebf45927d0019831731c94b78d1c9a1f3e2da0be9875d7ea75c6f261487e0f15d3f1822a9a49256e3c1672bdfb9138f9a5e44e2de99edb06cd1e758083e12d
|
||||
kdbush: "npm:^4.0.2"
|
||||
checksum: 10c0/79121e6dbff67b3036ea6651f3baddb942478830ba3ecbc27455715ab5bd269de8381dc04618c0c15963346ea2ed0f81cd5f767c2978a63e2841807c73445d57
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||