Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c09b353ee |
@@ -4,7 +4,7 @@ android {
|
||||
namespace = "io.ionic.starter"
|
||||
compileSdk = rootProject.ext.compileSdkVersion
|
||||
defaultConfig {
|
||||
applicationId "io.ionic.starter"
|
||||
applicationId "io.demoapp.app"
|
||||
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.demoapp.app" />
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 804 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 771 B |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 804 B |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 3.4 KiB |
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="splashBackground">#FFFFFF</color>
|
||||
</resources>
|
||||
@@ -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">DemoApp</string>
|
||||
<string name="title_activity_main">DemoApp</string>
|
||||
<string name="package_name">io.ionic.starter</string>
|
||||
<string name="custom_url_scheme">io.ionic.starter</string>
|
||||
</resources>
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
|
||||
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
|
||||
<item name="android:background">@drawable/splash</item>
|
||||
<item name="windowSplashScreenBackground">@color/splashBackground</item>
|
||||
<item name="windowSplashScreenAnimatedIcon">@drawable/splash_logo</item>
|
||||
<item name="postSplashScreenTheme">@style/AppTheme.NoActionBar</item>
|
||||
</style>
|
||||
</resources>
|
||||
@@ -15,5 +15,4 @@ ext {
|
||||
cordovaAndroidVersion = '14.0.1'
|
||||
rgcfaIncludeGoogle = true
|
||||
androidxCredentialsVersion = '1.3.0'
|
||||
javaVersion = JavaVersion.VERSION_17
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
import type { CapacitorConfig } from '@capacitor/cli';
|
||||
|
||||
const config: CapacitorConfig = {
|
||||
appId: 'com.bringg.app',
|
||||
appName: 'bringg',
|
||||
appId: 'io.demoapp.app',
|
||||
appName: 'DemoApp',
|
||||
webDir: 'dist',
|
||||
plugins: {
|
||||
FirebaseAuthentication: {
|
||||
|
||||
@@ -239,36 +239,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 +326,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"
|
||||
@@ -26,6 +26,7 @@
|
||||
504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
1A4EB3C21FED79650016851F /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
|
||||
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
|
||||
958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
|
||||
/* End PBXFileReference section */
|
||||
@@ -68,6 +69,7 @@
|
||||
504EC30E1FED79650016851F /* Assets.xcassets */,
|
||||
504EC3101FED79650016851F /* LaunchScreen.storyboard */,
|
||||
504EC3131FED79650016851F /* Info.plist */,
|
||||
1A4EB3C21FED79650016851F /* App.entitlements */,
|
||||
2FAD9762203C412B000D30F8 /* config.xml */,
|
||||
50B271D01FEDC1A000F3C39B /* public */,
|
||||
);
|
||||
@@ -295,6 +297,7 @@
|
||||
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
@@ -305,7 +308,7 @@
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.demoapp.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||
SWIFT_VERSION = 5.0;
|
||||
@@ -317,6 +320,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
@@ -326,7 +330,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.demoapp.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||
SWIFT_VERSION = 5.0;
|
||||
|
||||
@@ -1,14 +1,122 @@
|
||||
{
|
||||
"images" : [
|
||||
"images": [
|
||||
{
|
||||
"filename" : "AppIcon-512@2x.png",
|
||||
"idiom" : "universal",
|
||||
"platform" : "ios",
|
||||
"size" : "1024x1024"
|
||||
"idiom": "iphone",
|
||||
"scale": "1x",
|
||||
"size": "20x20",
|
||||
"filename": "icon-20.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "20x20",
|
||||
"filename": "icon-20.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "1x",
|
||||
"size": "29x29",
|
||||
"filename": "icon-29.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "29x29",
|
||||
"filename": "icon-29.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "40x40",
|
||||
"filename": "icon-40.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "20x20",
|
||||
"filename": "icon-40.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "29x29",
|
||||
"filename": "icon-58.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "29x29",
|
||||
"filename": "icon-58.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "20x20",
|
||||
"filename": "icon-60.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "1x",
|
||||
"size": "76x76",
|
||||
"filename": "icon-76.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "40x40",
|
||||
"filename": "icon-80.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "40x40",
|
||||
"filename": "icon-80.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "29x29",
|
||||
"filename": "icon-87.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "2x",
|
||||
"size": "60x60",
|
||||
"filename": "icon-120.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "40x40",
|
||||
"filename": "icon-120.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "76x76",
|
||||
"filename": "icon-152.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ipad",
|
||||
"scale": "2x",
|
||||
"size": "83.5x83.5",
|
||||
"filename": "icon-167.png"
|
||||
},
|
||||
{
|
||||
"idiom": "iphone",
|
||||
"scale": "3x",
|
||||
"size": "60x60",
|
||||
"filename": "icon-180.png"
|
||||
},
|
||||
{
|
||||
"idiom": "ios-marketing",
|
||||
"scale": "1x",
|
||||
"size": "1024x1024",
|
||||
"filename": "icon-1024.png"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
"info": {
|
||||
"author": "appsuite",
|
||||
"version": 1
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 477 B |
|
After Width: | Height: | Size: 704 B |
|
After Width: | Height: | Size: 993 B |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.9 KiB |
|
After Width: | Height: | Size: 2.0 KiB |
@@ -1,23 +1,13 @@
|
||||
{
|
||||
"images" : [
|
||||
"images": [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "splash-2732x2732-2.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "splash-2732x2732-1.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "splash-2732x2732.png",
|
||||
"scale" : "3x"
|
||||
"idiom": "universal",
|
||||
"filename": "splash.png",
|
||||
"scale": "1x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
"info": {
|
||||
"author": "appsuite",
|
||||
"version": 1
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 154 KiB |
@@ -7,7 +7,7 @@
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>bringg</string>
|
||||
<string>DemoApp</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.demoapp.app</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>com.bringg.app</string>
|
||||
<string>io.demoapp.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",
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import { Redirect, Route } from 'react-router-dom';
|
||||
import { IonApp, IonRouterOutlet } from '@ionic/react';
|
||||
import { IonReactRouter } from '@ionic/react-router';
|
||||
import { setStatusBarStyle, Style } from './utils/statusBar';
|
||||
|
||||
import '@ionic/react/css/core.css';
|
||||
import '@ionic/react/css/normalize.css';
|
||||
@@ -17,43 +18,22 @@ 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';
|
||||
|
||||
const App: React.FC = () => (
|
||||
const App: React.FC = () => {
|
||||
useEffect(() => {
|
||||
setStatusBarStyle(Style.Light);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<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" />
|
||||
<Route exact path="/" render={() => <Redirect to="/home" />} />
|
||||
</IonRouterOutlet>
|
||||
</AuthProvider>
|
||||
</IonReactRouter>
|
||||
</IonApp>
|
||||
);
|
||||
);
|
||||
};
|
||||
|
||||
export default App;
|
||||
|
||||
|
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;
|
||||
@@ -1,560 +1,30 @@
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import React from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonCard,
|
||||
IonCardContent,
|
||||
IonChip,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonSearchbar,
|
||||
IonText,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import {
|
||||
bagHandleOutline,
|
||||
cartOutline,
|
||||
personCircleOutline,
|
||||
receiptOutline,
|
||||
searchOutline,
|
||||
star,
|
||||
} from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import ProductFilters, { SortOption } from '../components/ProductFilters';
|
||||
import { useAuth } from '../context/AuthContext';
|
||||
import { setStatusBarStyle, Style } from '../utils/statusBar';
|
||||
import avocadoOilImage from '../assets/organic-avocado-oil.png';
|
||||
import sourdoughBreadImage from '../assets/artisan-sourdough-bread.png';
|
||||
import strawberriesPackImage from '../assets/fresh-strawberries-pack.png';
|
||||
import farmEggsImage from '../assets/farm-eggs-carton.png';
|
||||
import bananasImage from '../assets/bananas-bunch.png';
|
||||
import wholeMilkImage from '../assets/whole-milk-carton.png';
|
||||
import brownRiceImage from '../assets/brown-rice-bag.png';
|
||||
import chickenBreastImage from '../assets/chicken-breast-pack.png';
|
||||
import orangeJuiceImage from '../assets/orange-juice-bottle.png';
|
||||
import rolledOatsImage from '../assets/rolled-oats-pack.png';
|
||||
import greekYogurtImage from '../assets/greek-yogurt-cup.png';
|
||||
import peanutButterImage from '../assets/peanut-butter-jar.png';
|
||||
import spaghettiImage from '../assets/pasta-spaghetti-pack.png';
|
||||
import tomatoSauceImage from '../assets/tomato-sauce-jar.png';
|
||||
import cheddarCheeseImage from '../assets/cheddar-cheese-block.png';
|
||||
import lettuceImage from '../assets/lettuce-head.png';
|
||||
import carrotsImage from '../assets/carrots-bag.png';
|
||||
import potatoesImage from '../assets/potatoes-bag.png';
|
||||
import onionsImage from '../assets/onions-net-bag.png';
|
||||
import salmonImage from '../assets/salmon-fillet-pack.png';
|
||||
import sparklingWaterImage from '../assets/sparkling-water-pack.png';
|
||||
import coffeeBeansImage from '../assets/coffee-beans-bag.png';
|
||||
import greenTeaImage from '../assets/green-tea-box.png';
|
||||
import oliveOilImage from '../assets/olive-oil-bottle.png';
|
||||
|
||||
export type Product = {
|
||||
id: string;
|
||||
name: string;
|
||||
category: string;
|
||||
description: string;
|
||||
price: number;
|
||||
rating: number;
|
||||
prepTime: string;
|
||||
image: string;
|
||||
imageAlt: string;
|
||||
};
|
||||
|
||||
export type CartItem = {
|
||||
id: string;
|
||||
name: string;
|
||||
price: number;
|
||||
quantity: number;
|
||||
};
|
||||
|
||||
export const CART_STORAGE_KEY = 'simple-shop-cart';
|
||||
export const LAST_ORDER_STORAGE_KEY = 'simple-shop-last-order';
|
||||
|
||||
export const products: Product[] = [
|
||||
{
|
||||
id: '1',
|
||||
name: 'Organic Avocado Oil',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Cold-pressed avocado oil for cooking, roasting, and healthy everyday meals.',
|
||||
price: 8.99,
|
||||
rating: 4.8,
|
||||
prepTime: 'Ready to ship',
|
||||
image: avocadoOilImage,
|
||||
imageAlt: 'Bottle of organic avocado oil with fresh avocados',
|
||||
},
|
||||
{
|
||||
id: '2',
|
||||
name: 'Artisan Sourdough Bread',
|
||||
category: 'Bakery',
|
||||
description:
|
||||
'Freshly baked sourdough loaf with a crisp crust and soft, airy center.',
|
||||
price: 7.49,
|
||||
rating: 4.6,
|
||||
prepTime: 'Baked today',
|
||||
image: sourdoughBreadImage,
|
||||
imageAlt: 'Fresh artisan sourdough bread loaf on a wooden board',
|
||||
},
|
||||
{
|
||||
id: '3',
|
||||
name: 'Fresh Strawberries Pack',
|
||||
category: 'Fruit',
|
||||
description:
|
||||
'Sweet, bright strawberries packed fresh for snacks, desserts, and smoothies.',
|
||||
price: 9.25,
|
||||
rating: 4.9,
|
||||
prepTime: 'Picked fresh',
|
||||
image: strawberriesPackImage,
|
||||
imageAlt: 'Pack of fresh strawberries with berries beside it',
|
||||
},
|
||||
{
|
||||
id: '4',
|
||||
name: 'Free Range Farm Eggs',
|
||||
category: 'Dairy & Eggs',
|
||||
description:
|
||||
'Farm-fresh eggs with rich yolks, ideal for breakfast, baking, and meal prep.',
|
||||
price: 4.5,
|
||||
rating: 4.7,
|
||||
prepTime: 'Stocked daily',
|
||||
image: farmEggsImage,
|
||||
imageAlt: 'Carton of free range farm eggs on a clean background',
|
||||
},
|
||||
{
|
||||
id: '5',
|
||||
name: 'Bananas Bunch',
|
||||
category: 'Fruit',
|
||||
description:
|
||||
'Naturally sweet ripe bananas for breakfast bowls, snacks, and smoothies.',
|
||||
price: 3.2,
|
||||
rating: 4.7,
|
||||
prepTime: 'Fresh arrival',
|
||||
image: bananasImage,
|
||||
imageAlt: 'Fresh bunch of ripe yellow bananas',
|
||||
},
|
||||
{
|
||||
id: '6',
|
||||
name: 'Whole Milk Carton',
|
||||
category: 'Dairy & Eggs',
|
||||
description:
|
||||
'Creamy whole milk for cereal, coffee, cooking, and family breakfasts.',
|
||||
price: 3.99,
|
||||
rating: 4.5,
|
||||
prepTime: 'Kept chilled',
|
||||
image: wholeMilkImage,
|
||||
imageAlt: 'Carton of whole milk standing upright',
|
||||
},
|
||||
{
|
||||
id: '7',
|
||||
name: 'Brown Rice Bag',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Nutty wholegrain brown rice for bowls, sides, and meal prep dinners.',
|
||||
price: 5.75,
|
||||
rating: 4.6,
|
||||
prepTime: 'Pantry staple',
|
||||
image: brownRiceImage,
|
||||
imageAlt: 'Sealed bag of brown rice on a white background',
|
||||
},
|
||||
{
|
||||
id: '8',
|
||||
name: 'Chicken Breast Pack',
|
||||
category: 'Meat & Seafood',
|
||||
description:
|
||||
'Lean chicken breast fillets for grilling, roasting, and protein-packed meals.',
|
||||
price: 11.9,
|
||||
rating: 4.8,
|
||||
prepTime: 'Packed fresh',
|
||||
image: chickenBreastImage,
|
||||
imageAlt: 'Pack of fresh chicken breast fillets',
|
||||
},
|
||||
{
|
||||
id: '9',
|
||||
name: 'Orange Juice Bottle',
|
||||
category: 'Beverages',
|
||||
description:
|
||||
'Bright citrus orange juice for a refreshing breakfast or midday boost.',
|
||||
price: 4.8,
|
||||
rating: 4.6,
|
||||
prepTime: 'Served chilled',
|
||||
image: orangeJuiceImage,
|
||||
imageAlt: 'Bottle of orange juice on a clean background',
|
||||
},
|
||||
{
|
||||
id: '10',
|
||||
name: 'Rolled Oats Pack',
|
||||
category: 'Breakfast',
|
||||
description:
|
||||
'Hearty rolled oats for porridge, overnight oats, and healthy baking.',
|
||||
price: 4.25,
|
||||
rating: 4.7,
|
||||
prepTime: 'Breakfast ready',
|
||||
image: rolledOatsImage,
|
||||
imageAlt: 'Pack of rolled oats on a white background',
|
||||
},
|
||||
{
|
||||
id: '11',
|
||||
name: 'Greek Yogurt Cup',
|
||||
category: 'Dairy & Eggs',
|
||||
description:
|
||||
'Thick plain Greek yogurt with a rich texture for breakfast and snacks.',
|
||||
price: 2.65,
|
||||
rating: 4.5,
|
||||
prepTime: 'Kept chilled',
|
||||
image: greekYogurtImage,
|
||||
imageAlt: 'Single cup of plain Greek yogurt',
|
||||
},
|
||||
{
|
||||
id: '12',
|
||||
name: 'Peanut Butter Jar',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Smooth peanut butter for toast, sandwiches, smoothies, and baking.',
|
||||
price: 5.2,
|
||||
rating: 4.8,
|
||||
prepTime: 'Pantry staple',
|
||||
image: peanutButterImage,
|
||||
imageAlt: 'Jar of peanut butter on a white background',
|
||||
},
|
||||
{
|
||||
id: '13',
|
||||
name: 'Spaghetti Pasta Pack',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Classic spaghetti pasta for quick weeknight dinners and family meals.',
|
||||
price: 3.45,
|
||||
rating: 4.6,
|
||||
prepTime: 'Dinner essential',
|
||||
image: spaghettiImage,
|
||||
imageAlt: 'Pack of spaghetti pasta on a clean background',
|
||||
},
|
||||
{
|
||||
id: '14',
|
||||
name: 'Tomato Sauce Jar',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Rich tomato sauce for pasta, pizza bases, and simmered home cooking.',
|
||||
price: 3.95,
|
||||
rating: 4.7,
|
||||
prepTime: 'Ready to cook',
|
||||
image: tomatoSauceImage,
|
||||
imageAlt: 'Glass jar of tomato sauce',
|
||||
},
|
||||
{
|
||||
id: '15',
|
||||
name: 'Cheddar Cheese Block',
|
||||
category: 'Dairy & Eggs',
|
||||
description:
|
||||
'Sharp cheddar cheese block for sandwiches, snacks, sauces, and grating.',
|
||||
price: 6.15,
|
||||
rating: 4.7,
|
||||
prepTime: 'Kept chilled',
|
||||
image: cheddarCheeseImage,
|
||||
imageAlt: 'Block of cheddar cheese on a white background',
|
||||
},
|
||||
{
|
||||
id: '16',
|
||||
name: 'Fresh Lettuce Head',
|
||||
category: 'Vegetables',
|
||||
description:
|
||||
'Crisp green lettuce for salads, wraps, burgers, and light lunches.',
|
||||
price: 2.8,
|
||||
rating: 4.4,
|
||||
prepTime: 'Harvest fresh',
|
||||
image: lettuceImage,
|
||||
imageAlt: 'Fresh green head of lettuce',
|
||||
},
|
||||
{
|
||||
id: '17',
|
||||
name: 'Carrots Bag',
|
||||
category: 'Vegetables',
|
||||
description:
|
||||
'Sweet crunchy carrots for roasting, soups, stir-fries, and lunch boxes.',
|
||||
price: 3.1,
|
||||
rating: 4.5,
|
||||
prepTime: 'Stocked today',
|
||||
image: carrotsImage,
|
||||
imageAlt: 'Bag of fresh carrots on a clean background',
|
||||
},
|
||||
{
|
||||
id: '18',
|
||||
name: 'Potatoes Bag',
|
||||
category: 'Vegetables',
|
||||
description:
|
||||
'Versatile potatoes for frying, mashing, baking, and hearty dinners.',
|
||||
price: 4.75,
|
||||
rating: 4.6,
|
||||
prepTime: 'Kitchen essential',
|
||||
image: potatoesImage,
|
||||
imageAlt: 'Mesh bag of potatoes',
|
||||
},
|
||||
{
|
||||
id: '19',
|
||||
name: 'Onions Net Bag',
|
||||
category: 'Vegetables',
|
||||
description:
|
||||
'Flavorful onions for stews, sauces, sautés, and everyday cooking.',
|
||||
price: 3.35,
|
||||
rating: 4.4,
|
||||
prepTime: 'Stocked today',
|
||||
image: onionsImage,
|
||||
imageAlt: 'Net bag of onions on a white background',
|
||||
},
|
||||
{
|
||||
id: '20',
|
||||
name: 'Salmon Fillet Pack',
|
||||
category: 'Meat & Seafood',
|
||||
description:
|
||||
'Fresh salmon fillet packed for quick oven dinners and healthy lunches.',
|
||||
price: 13.99,
|
||||
rating: 4.8,
|
||||
prepTime: 'Packed fresh',
|
||||
image: salmonImage,
|
||||
imageAlt: 'Packaged salmon fillet on a clean background',
|
||||
},
|
||||
{
|
||||
id: '21',
|
||||
name: 'Sparkling Water Pack',
|
||||
category: 'Beverages',
|
||||
description:
|
||||
'Refreshing sparkling water multipack for hydration and light entertaining.',
|
||||
price: 6.8,
|
||||
rating: 4.5,
|
||||
prepTime: 'Ready to chill',
|
||||
image: sparklingWaterImage,
|
||||
imageAlt: 'Multipack of sparkling water cans',
|
||||
},
|
||||
{
|
||||
id: '22',
|
||||
name: 'Coffee Beans Bag',
|
||||
category: 'Beverages',
|
||||
description:
|
||||
'Roasted coffee beans with a rich aroma for espresso and filter brews.',
|
||||
price: 9.6,
|
||||
rating: 4.8,
|
||||
prepTime: 'Fresh roast',
|
||||
image: coffeeBeansImage,
|
||||
imageAlt: 'Bag of roasted coffee beans on a white background',
|
||||
},
|
||||
{
|
||||
id: '23',
|
||||
name: 'Green Tea Box',
|
||||
category: 'Beverages',
|
||||
description:
|
||||
'Soothing green tea for a light daily ritual and calming warm drink.',
|
||||
price: 4.4,
|
||||
rating: 4.5,
|
||||
prepTime: 'Tea time ready',
|
||||
image: greenTeaImage,
|
||||
imageAlt: 'Box of green tea on a clean background',
|
||||
},
|
||||
{
|
||||
id: '24',
|
||||
name: 'Extra Virgin Olive Oil',
|
||||
category: 'Pantry',
|
||||
description:
|
||||
'Fragrant olive oil for salads, drizzling, roasting, and Mediterranean meals.',
|
||||
price: 10.5,
|
||||
rating: 4.9,
|
||||
prepTime: 'Ready to ship',
|
||||
image: oliveOilImage,
|
||||
imageAlt: 'Bottle of extra virgin olive oil on a white background',
|
||||
},
|
||||
];
|
||||
|
||||
export const readCart = (): CartItem[] => {
|
||||
if (typeof window === 'undefined') return [];
|
||||
try {
|
||||
const savedCart = window.localStorage.getItem(CART_STORAGE_KEY);
|
||||
if (!savedCart) return [];
|
||||
const parsed = JSON.parse(savedCart) as CartItem[];
|
||||
return Array.isArray(parsed) ? parsed : [];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
};
|
||||
|
||||
export const writeCart = (cart: CartItem[]) => {
|
||||
if (typeof window === 'undefined') return;
|
||||
window.localStorage.setItem(CART_STORAGE_KEY, JSON.stringify(cart));
|
||||
window.dispatchEvent(new CustomEvent('cart:updated'));
|
||||
};
|
||||
|
||||
const Home: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user } = useAuth();
|
||||
const [query, setQuery] = useState('');
|
||||
const [cartCount, setCartCount] = useState(0);
|
||||
const [selectedCategory, setSelectedCategory] = useState('All');
|
||||
const [sortOption, setSortOption] = useState<SortOption>('popular');
|
||||
const [isFilterOpen, setIsFilterOpen] = useState(false);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
setStatusBarStyle(Style.Dark);
|
||||
const count = readCart().reduce((sum, item) => sum + item.quantity, 0);
|
||||
setCartCount(count);
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const syncCount = () =>
|
||||
setCartCount(readCart().reduce((sum, item) => sum + item.quantity, 0));
|
||||
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 categories = useMemo(
|
||||
() => Array.from(new Set(products.map((product) => product.category))),
|
||||
[]
|
||||
);
|
||||
|
||||
const filteredProducts = useMemo(() => {
|
||||
const term = query.toLowerCase().trim();
|
||||
const nextProducts = products.filter((product) => {
|
||||
const matchesCategory =
|
||||
selectedCategory === 'All' || product.category === selectedCategory;
|
||||
const matchesQuery =
|
||||
!term ||
|
||||
[product.name, product.category, product.description]
|
||||
.join(' ')
|
||||
.toLowerCase()
|
||||
.includes(term);
|
||||
return matchesCategory && matchesQuery;
|
||||
});
|
||||
|
||||
const sorted = [...nextProducts];
|
||||
if (sortOption === 'price-asc') sorted.sort((a, b) => a.price - b.price);
|
||||
if (sortOption === 'price-desc') sorted.sort((a, b) => b.price - a.price);
|
||||
if (sortOption === 'name-asc')
|
||||
sorted.sort((a, b) => a.name.localeCompare(b.name));
|
||||
if (sortOption === 'popular') sorted.sort((a, b) => b.rating - a.rating);
|
||||
return sorted;
|
||||
}, [query, selectedCategory, sortOption]);
|
||||
|
||||
return (
|
||||
const Home: React.FC = () => (
|
||||
<IonPage>
|
||||
<IonHeader className="shop-header ion-no-border">
|
||||
<IonToolbar>
|
||||
<IonTitle className="home-title">QuickCart</IonTitle>
|
||||
<div slot="end" className="home-header-actions">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="header-icon-button"
|
||||
onClick={() => history.push('/orders')}
|
||||
aria-label="Track orders"
|
||||
>
|
||||
<IonIcon icon={receiptOutline} />
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="cart-button pill-cart-button"
|
||||
onClick={() => history.push('/cart')}
|
||||
aria-label="View cart"
|
||||
>
|
||||
<IonIcon icon={cartOutline} />
|
||||
<span>{cartCount}</span>
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="header-icon-button"
|
||||
onClick={() => history.push(user ? '/profile' : '/auth')}
|
||||
aria-label="Profile"
|
||||
>
|
||||
<IonIcon icon={personCircleOutline} />
|
||||
</IonButton>
|
||||
</div>
|
||||
<IonHeader translucent className="home-header">
|
||||
<IonToolbar className="home-toolbar">
|
||||
<IonTitle>Home</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent fullscreen className="shop-content">
|
||||
<div className="hero-card">
|
||||
<IonChip color="primary">Fast delivery</IonChip>
|
||||
<h1>Find your next favorite meal.</h1>
|
||||
<p>
|
||||
Browse simple picks, add them to your cart, and place your order in
|
||||
seconds.
|
||||
<IonContent fullscreen className="home-content">
|
||||
<div className="home-shell minimal-home-shell">
|
||||
<section className="minimal-welcome-card subtle-welcome-card">
|
||||
<h1>Welcome to your new app</h1>
|
||||
<p className="minimal-subtitle">
|
||||
Chat with the assistant to start adding features and pages
|
||||
</p>
|
||||
</div>
|
||||
<div className="catalog-section ion-padding">
|
||||
<IonSearchbar
|
||||
value={query}
|
||||
onIonInput={(event) => setQuery(event.detail.value ?? '')}
|
||||
placeholder="Search products"
|
||||
searchIcon={searchOutline}
|
||||
/>
|
||||
<ProductFilters
|
||||
categories={categories}
|
||||
selectedCategory={selectedCategory}
|
||||
setSelectedCategory={setSelectedCategory}
|
||||
sortOption={sortOption}
|
||||
setSortOption={setSortOption}
|
||||
isOpen={isFilterOpen}
|
||||
onClose={() => setIsFilterOpen((value) => !value)}
|
||||
/>
|
||||
<div className="section-heading">
|
||||
<div>
|
||||
<h2>Popular products</h2>
|
||||
<IonText color="medium">
|
||||
<p>{filteredProducts.length} items available</p>
|
||||
</IonText>
|
||||
</div>
|
||||
</div>
|
||||
{filteredProducts.length === 0 ? (
|
||||
<div className="empty-state">
|
||||
<IonIcon icon={bagHandleOutline} />
|
||||
<h3>No products found</h3>
|
||||
<p>Try a different search term or category.</p>
|
||||
<IonButton
|
||||
onClick={() => {
|
||||
setQuery('');
|
||||
setSelectedCategory('All');
|
||||
}}
|
||||
>
|
||||
Clear filters
|
||||
</IonButton>
|
||||
</div>
|
||||
) : (
|
||||
<div className="product-grid">
|
||||
{filteredProducts.map((product) => (
|
||||
<IonCard
|
||||
key={product.id}
|
||||
button
|
||||
className="product-card"
|
||||
onClick={() => history.push(`/product/${product.id}`)}
|
||||
>
|
||||
<img
|
||||
src={product.image}
|
||||
alt={product.imageAlt}
|
||||
className="product-card-image"
|
||||
/>
|
||||
<IonCardContent>
|
||||
<div className="product-card-top">
|
||||
<IonChip color="secondary">{product.category}</IonChip>
|
||||
<div className="rating-pill">
|
||||
<IonIcon icon={star} />
|
||||
<span>{product.rating}</span>
|
||||
</div>
|
||||
</div>
|
||||
<h3>{product.name}</h3>
|
||||
<p>{product.description}</p>
|
||||
<div className="product-card-footer">
|
||||
<strong>${product.price.toFixed(2)}</strong>
|
||||
<span>{product.prepTime}</span>
|
||||
</div>
|
||||
</IonCardContent>
|
||||
</IonCard>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
);
|
||||
|
||||
export default Home;
|
||||
|
||||
@@ -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;
|
||||
@@ -1,7 +0,0 @@
|
||||
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',
|
||||
);
|
||||