Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb8224c752 |
@@ -4,13 +4,12 @@ android {
|
|||||||
namespace = "io.ionic.starter"
|
namespace = "io.ionic.starter"
|
||||||
compileSdk = rootProject.ext.compileSdkVersion
|
compileSdk = rootProject.ext.compileSdkVersion
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.ionic.starter"
|
applicationId "io.longtime.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
manifestPlaceholders = [googleMapsApiKey: System.getenv("VITE_GOOGLE_MAPS_KEY") ?: ""]
|
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
|
||||||
|
|||||||
@@ -21,13 +21,15 @@
|
|||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</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.longtime.app" />
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<meta-data
|
|
||||||
android:name="com.google.android.geo.API_KEY"
|
|
||||||
android:value="${googleMapsApiKey}" />
|
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
android:name="androidx.core.content.FileProvider"
|
android:name="androidx.core.content.FileProvider"
|
||||||
android:authorities="${applicationId}.fileprovider"
|
android:authorities="${applicationId}.fileprovider"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">bringg</string>
|
<string name="app_name">Longtime</string>
|
||||||
<string name="title_activity_main">bringg</string>
|
<string name="title_activity_main">Longtime</string>
|
||||||
<string name="package_name">io.ionic.starter</string>
|
<string name="package_name">io.ionic.starter</string>
|
||||||
<string name="custom_url_scheme">io.ionic.starter</string>
|
<string name="custom_url_scheme">io.ionic.starter</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import type { CapacitorConfig } from '@capacitor/cli';
|
import type { CapacitorConfig } from '@capacitor/cli';
|
||||||
|
|
||||||
const config: CapacitorConfig = {
|
const config: CapacitorConfig = {
|
||||||
appId: 'com.bringg.app',
|
appId: 'io.longtime.app',
|
||||||
appName: 'bringg',
|
appName: 'Longtime',
|
||||||
webDir: 'dist',
|
webDir: 'dist',
|
||||||
plugins: {
|
plugins: {
|
||||||
FirebaseAuthentication: {
|
FirebaseAuthentication: {
|
||||||
|
|||||||
@@ -11,29 +11,10 @@ workflows:
|
|||||||
- $HOME/.gradle/caches
|
- $HOME/.gradle/caches
|
||||||
- $HOME/.gradle/wrapper
|
- $HOME/.gradle/wrapper
|
||||||
scripts:
|
scripts:
|
||||||
# Template ships with optional native plugins (maps, push, firebase auth) that most apps
|
|
||||||
# won't use. Keeping unused plugins in package.json adds SPM/Gradle deps and bloats the
|
|
||||||
# build. Strip any that have no import in src/ so only actually-used plugins are compiled.
|
|
||||||
- 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
|
|
||||||
# Delete package-lock.json (generated if user ever ran npm locally) so it doesn't
|
|
||||||
# conflict with yarn.lock. --legacy-peer-deps silences peer dep warnings from older
|
|
||||||
# Ionic/React packages that haven't updated their peerDependencies for React 18/19.
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
script: npm run build
|
||||||
# Firebase config files are injected as base64 env vars by the Appcakes backend at
|
|
||||||
# build time. Decode them here so cap sync and Gradle can pick them up. Optional —
|
|
||||||
# builds without Firebase still succeed; native Firebase SDK just won't initialise.
|
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
script: |
|
script: |
|
||||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||||
@@ -46,8 +27,6 @@ workflows:
|
|||||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
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)"
|
echo "Wrote GoogleService-Info.plist ($(wc -c < ios/App/App/GoogleService-Info.plist) bytes)"
|
||||||
fi
|
fi
|
||||||
# cap sync copies the built web assets (dist/) into android/app/src/main/assets/public/
|
|
||||||
# and updates Capacitor plugin registrations in MainActivity. Must run after npm build.
|
|
||||||
- name: Capacitor sync
|
- name: Capacitor sync
|
||||||
script: npx cap sync android
|
script: npx cap sync android
|
||||||
- name: Set up debug keystore
|
- name: Set up debug keystore
|
||||||
@@ -83,18 +62,8 @@ workflows:
|
|||||||
- $HOME/.gradle/caches
|
- $HOME/.gradle/caches
|
||||||
- $HOME/.gradle/wrapper
|
- $HOME/.gradle/wrapper
|
||||||
scripts:
|
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
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
script: npm run build
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
@@ -130,18 +99,8 @@ workflows:
|
|||||||
- $HOME/.gradle/caches
|
- $HOME/.gradle/caches
|
||||||
- $HOME/.gradle/wrapper
|
- $HOME/.gradle/wrapper
|
||||||
scripts:
|
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
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
script: npm run build
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
@@ -177,18 +136,8 @@ workflows:
|
|||||||
- $HOME/.gradle/caches
|
- $HOME/.gradle/caches
|
||||||
- $HOME/.gradle/wrapper
|
- $HOME/.gradle/wrapper
|
||||||
scripts:
|
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
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
script: npm run build
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
@@ -225,30 +174,10 @@ workflows:
|
|||||||
node: 22
|
node: 22
|
||||||
xcode: latest
|
xcode: latest
|
||||||
scripts:
|
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
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
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.
|
|
||||||
# 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.
|
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
script: |
|
script: |
|
||||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||||
@@ -265,8 +194,6 @@ workflows:
|
|||||||
end
|
end
|
||||||
"
|
"
|
||||||
fi
|
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.
|
|
||||||
- name: Capacitor sync
|
- name: Capacitor sync
|
||||||
script: npx cap sync ios
|
script: npx cap sync ios
|
||||||
- name: Set up signing
|
- name: Set up signing
|
||||||
@@ -293,23 +220,11 @@ workflows:
|
|||||||
echo "No signing credentials configured — build will fail at signing"
|
echo "No signing credentials configured — build will fail at signing"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
# --workspace: Capacitor SPM projects require workspace context for Xcode to resolve
|
|
||||||
# the CapApp-SPM local package. Using --project causes xcodebuild to fail on
|
|
||||||
# Xcode 26+ because SPM resolution requires workspace scope. App.xcworkspace is a
|
|
||||||
# static file committed to the template (not generated by cap sync) that wraps
|
|
||||||
# App.xcodeproj for this purpose.
|
|
||||||
# --no-show-build-settings: xcode-project runs xcodebuild -showBuildSettings as a
|
|
||||||
# pre-build diagnostic. Xcode 26 fails this step for SPM projects even with
|
|
||||||
# --workspace, so we skip it. The actual archive step still surfaces real errors.
|
|
||||||
# --disable-xcpretty: xcpretty reformats and filters xcodebuild output, swallowing
|
|
||||||
# the actual error lines when a build fails. Raw output makes failures debuggable.
|
|
||||||
- name: Build IPA
|
- name: Build IPA
|
||||||
script: |
|
script: |
|
||||||
xcode-project build-ipa \
|
xcode-project build-ipa \
|
||||||
--workspace ios/App/App.xcworkspace \
|
--project ios/App/App.xcodeproj \
|
||||||
--scheme App \
|
--scheme App
|
||||||
--no-show-build-settings \
|
|
||||||
--disable-xcpretty
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- build/ios/ipa/*.ipa
|
- build/ios/ipa/*.ipa
|
||||||
|
|
||||||
@@ -321,22 +236,10 @@ workflows:
|
|||||||
node: 22
|
node: 22
|
||||||
xcode: latest
|
xcode: latest
|
||||||
scripts:
|
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
|
- name: Install dependencies
|
||||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
script: npm install --legacy-peer-deps
|
||||||
- name: Build web assets
|
- name: Build web assets
|
||||||
script: npm run build
|
script: npm run build
|
||||||
- name: Capacitor sync
|
|
||||||
script: npx cap sync ios
|
|
||||||
- name: Write Firebase config
|
- name: Write Firebase config
|
||||||
script: |
|
script: |
|
||||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||||
@@ -376,16 +279,12 @@ workflows:
|
|||||||
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
||||||
xcode-project use-profiles
|
xcode-project use-profiles
|
||||||
fi
|
fi
|
||||||
# See ios-debug Build IPA comments for --workspace, --no-show-build-settings,
|
|
||||||
# and --disable-xcpretty rationale — same reasons apply here.
|
|
||||||
- name: Build IPA
|
- name: Build IPA
|
||||||
script: |
|
script: |
|
||||||
xcode-project build-ipa \
|
xcode-project build-ipa \
|
||||||
--workspace ios/App/App.xcworkspace \
|
--project ios/App/App.xcodeproj \
|
||||||
--scheme App \
|
--scheme App \
|
||||||
--config Release \
|
--config Release
|
||||||
--no-show-build-settings \
|
|
||||||
--disable-xcpretty
|
|
||||||
- name: Publish
|
- name: Publish
|
||||||
script: |
|
script: |
|
||||||
if [ "$SUBMIT_TO_TESTFLIGHT" = "true" ] || [ "$SUBMIT_TO_APP_STORE" = "true" ]; then
|
if [ "$SUBMIT_TO_TESTFLIGHT" = "true" ] || [ "$SUBMIT_TO_APP_STORE" = "true" ]; then
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
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>"; };
|
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>"; };
|
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>"; };
|
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; };
|
958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
@@ -68,6 +69,7 @@
|
|||||||
504EC30E1FED79650016851F /* Assets.xcassets */,
|
504EC30E1FED79650016851F /* Assets.xcassets */,
|
||||||
504EC3101FED79650016851F /* LaunchScreen.storyboard */,
|
504EC3101FED79650016851F /* LaunchScreen.storyboard */,
|
||||||
504EC3131FED79650016851F /* Info.plist */,
|
504EC3131FED79650016851F /* Info.plist */,
|
||||||
|
1A4EB3C21FED79650016851F /* App.entitlements */,
|
||||||
2FAD9762203C412B000D30F8 /* config.xml */,
|
2FAD9762203C412B000D30F8 /* config.xml */,
|
||||||
50B271D01FEDC1A000F3C39B /* public */,
|
50B271D01FEDC1A000F3C39B /* public */,
|
||||||
);
|
);
|
||||||
@@ -295,6 +297,7 @@
|
|||||||
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
|
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
|
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
@@ -305,7 +308,7 @@
|
|||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
PRODUCT_BUNDLE_IDENTIFIER = io.longtime.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
@@ -317,6 +320,7 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
|
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 1;
|
||||||
INFOPLIST_FILE = App/Info.plist;
|
INFOPLIST_FILE = App/Info.plist;
|
||||||
@@ -326,7 +330,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0;
|
MARKETING_VERSION = 1.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.bringg.app;
|
PRODUCT_BUNDLE_IDENTIFIER = io.longtime.app;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Workspace
|
|
||||||
version = "1.0">
|
|
||||||
<FileRef
|
|
||||||
location = "group:App.xcodeproj">
|
|
||||||
</FileRef>
|
|
||||||
</Workspace>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>IDEDidComputeMac32BitWarning</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<key>CFBundleDevelopmentRegion</key>
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
<string>en</string>
|
<string>en</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
<string>bringg</string>
|
<string>Longtime</string>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>$(EXECUTABLE_NAME)</string>
|
<string>$(EXECUTABLE_NAME)</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
@@ -51,10 +51,10 @@
|
|||||||
<array>
|
<array>
|
||||||
<dict>
|
<dict>
|
||||||
<key>CFBundleURLName</key>
|
<key>CFBundleURLName</key>
|
||||||
<string>com.bringg.app</string>
|
<string>io.longtime.app</string>
|
||||||
<key>CFBundleURLSchemes</key>
|
<key>CFBundleURLSchemes</key>
|
||||||
<array>
|
<array>
|
||||||
<string>com.bringg.app</string>
|
<string>io.longtime.app</string>
|
||||||
</array>
|
</array>
|
||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
|
|||||||
@@ -10,8 +10,6 @@
|
|||||||
"lint": "eslint"
|
"lint": "eslint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor-firebase/authentication": "^8.0.0",
|
|
||||||
"firebase": "^11.0.0",
|
|
||||||
"@capacitor/android": "8.3.4",
|
"@capacitor/android": "8.3.4",
|
||||||
"@capacitor/app": "8.1.0",
|
"@capacitor/app": "8.1.0",
|
||||||
"@capacitor/core": "8.3.4",
|
"@capacitor/core": "8.3.4",
|
||||||
|
|||||||
@@ -1,57 +1,30 @@
|
|||||||
import React from 'react';
|
import React from "react";
|
||||||
import { Redirect, Route } from 'react-router-dom';
|
import { Redirect, Route } from "react-router-dom";
|
||||||
import { IonApp, IonRouterOutlet } from '@ionic/react';
|
import { IonApp, IonRouterOutlet } from "@ionic/react";
|
||||||
import { IonReactRouter } from '@ionic/react-router';
|
import { IonReactRouter } from "@ionic/react-router";
|
||||||
|
|
||||||
import '@ionic/react/css/core.css';
|
import "@ionic/react/css/core.css";
|
||||||
import '@ionic/react/css/normalize.css';
|
import "@ionic/react/css/normalize.css";
|
||||||
import '@ionic/react/css/structure.css';
|
import "@ionic/react/css/structure.css";
|
||||||
import '@ionic/react/css/typography.css';
|
import "@ionic/react/css/typography.css";
|
||||||
import '@ionic/react/css/padding.css';
|
import "@ionic/react/css/padding.css";
|
||||||
import '@ionic/react/css/float-elements.css';
|
import "@ionic/react/css/float-elements.css";
|
||||||
import '@ionic/react/css/text-alignment.css';
|
import "@ionic/react/css/text-alignment.css";
|
||||||
import '@ionic/react/css/text-transformation.css';
|
import "@ionic/react/css/text-transformation.css";
|
||||||
import '@ionic/react/css/flex-utils.css';
|
import "@ionic/react/css/flex-utils.css";
|
||||||
import '@ionic/react/css/display.css';
|
import "@ionic/react/css/display.css";
|
||||||
|
|
||||||
import './theme/variables.css';
|
import "./theme/variables.css";
|
||||||
|
|
||||||
import Home from './pages/Home';
|
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 = () => (
|
||||||
<IonApp>
|
<IonApp>
|
||||||
<IonReactRouter>
|
<IonReactRouter>
|
||||||
<AuthProvider>
|
<IonRouterOutlet>
|
||||||
<IonRouterOutlet>
|
<Route path="/home" component={Home} exact />
|
||||||
<Route path="/home" component={Home} exact />
|
<Redirect exact from="/" to="/home" />
|
||||||
<Route path="/auth" component={Auth} exact />
|
</IonRouterOutlet>
|
||||||
<Route path="/product/:id" component={ProductDetail} exact />
|
|
||||||
<Route path="/cart" component={Cart} exact />
|
|
||||||
<Route path="/orders" component={MyOrders} exact />
|
|
||||||
<Route path="/orders/:id" component={OrderDetail} exact />
|
|
||||||
<Route path="/profile" component={Profile} exact />
|
|
||||||
<Route path="/addresses" component={Addresses} exact />
|
|
||||||
<Route path="/admin/orders" component={AdminOrders} exact />
|
|
||||||
<Route path="/admin/orders/:id" component={AdminOrderDetail} exact />
|
|
||||||
<Route
|
|
||||||
path="/order-confirmation"
|
|
||||||
component={OrderConfirmation}
|
|
||||||
exact
|
|
||||||
/>
|
|
||||||
<Redirect exact from="/" to="/home" />
|
|
||||||
</IonRouterOutlet>
|
|
||||||
</AuthProvider>
|
|
||||||
</IonReactRouter>
|
</IonReactRouter>
|
||||||
</IonApp>
|
</IonApp>
|
||||||
);
|
);
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 839 KiB |
|
Before Width: | Height: | Size: 476 KiB |
|
Before Width: | Height: | Size: 501 KiB |
|
Before Width: | Height: | Size: 602 KiB |
|
Before Width: | Height: | Size: 554 KiB |
|
Before Width: | Height: | Size: 553 KiB |
|
Before Width: | Height: | Size: 437 KiB |
|
Before Width: | Height: | Size: 676 KiB |
|
Before Width: | Height: | Size: 673 KiB |
|
Before Width: | Height: | Size: 452 KiB |
|
Before Width: | Height: | Size: 545 KiB |
|
Before Width: | Height: | Size: 550 KiB |
|
Before Width: | Height: | Size: 461 KiB |
|
Before Width: | Height: | Size: 689 KiB |
|
Before Width: | Height: | Size: 447 KiB |
|
Before Width: | Height: | Size: 690 KiB |
|
Before Width: | Height: | Size: 599 KiB |
|
Before Width: | Height: | Size: 464 KiB |
|
Before Width: | Height: | Size: 629 KiB |
|
Before Width: | Height: | Size: 515 KiB |
|
Before Width: | Height: | Size: 655 KiB |
|
Before Width: | Height: | Size: 697 KiB |
|
Before Width: | Height: | Size: 476 KiB |
|
Before Width: | Height: | Size: 466 KiB |
@@ -1,36 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Redirect, Route, RouteProps } from 'react-router-dom';
|
|
||||||
import { IonLoading } from '@ionic/react';
|
|
||||||
import { useAuth } from '../context/AuthContext';
|
|
||||||
|
|
||||||
type Props = RouteProps;
|
|
||||||
|
|
||||||
const AdminRoute: React.FC<Props> = ({ component: Component, ...rest }) => {
|
|
||||||
const { user, profile, isLoading } = useAuth();
|
|
||||||
|
|
||||||
if (!Component) return null;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Route
|
|
||||||
{...rest}
|
|
||||||
render={(props) => {
|
|
||||||
if (isLoading) {
|
|
||||||
return <IonLoading isOpen message="Loading..." />;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!user) {
|
|
||||||
return <Redirect to="/auth" />;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!profile?.is_admin) {
|
|
||||||
return <Redirect to="/home" />;
|
|
||||||
}
|
|
||||||
|
|
||||||
const RouteComponent = Component as React.ComponentType<any>;
|
|
||||||
return <RouteComponent {...props} />;
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AdminRoute;
|
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
const Hello = () => (
|
||||||
|
<div>
|
||||||
|
<p>Hello</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
export default Hello;
|
||||||
@@ -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
|
|
||||||
@@ -43,8 +43,14 @@ window.addEventListener('message', (e) => {
|
|||||||
|
|
||||||
// Re-apply after React Fast Refresh so insets survive soft HMR cycles.
|
// Re-apply after React Fast Refresh so insets survive soft HMR cycles.
|
||||||
if (import.meta.hot) {
|
if (import.meta.hot) {
|
||||||
|
import.meta.hot.on('vite:beforeUpdate', () => {
|
||||||
|
const c = (window as any).Ionic?.config;
|
||||||
|
if (c) c.animated = false;
|
||||||
|
});
|
||||||
import.meta.hot.on('vite:afterUpdate', () => {
|
import.meta.hot.on('vite:afterUpdate', () => {
|
||||||
_applyInsets(sessionStorage.getItem('__apsuite_sat'), sessionStorage.getItem('__apsuite_sab'));
|
_applyInsets(sessionStorage.getItem('__apsuite_sat'), sessionStorage.getItem('__apsuite_sab'));
|
||||||
|
const c = (window as any).Ionic?.config;
|
||||||
|
if (c) c.animated = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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,24 @@
|
|||||||
import React, { useEffect, useMemo, useState } from 'react';
|
import React from 'react';
|
||||||
import {
|
import {
|
||||||
IonButton,
|
|
||||||
IonCard,
|
|
||||||
IonCardContent,
|
|
||||||
IonChip,
|
|
||||||
IonContent,
|
IonContent,
|
||||||
IonHeader,
|
IonHeader,
|
||||||
IonIcon,
|
|
||||||
IonPage,
|
IonPage,
|
||||||
IonSearchbar,
|
|
||||||
IonText,
|
|
||||||
IonTitle,
|
IonTitle,
|
||||||
IonToolbar,
|
IonToolbar,
|
||||||
useIonViewWillEnter,
|
|
||||||
} from '@ionic/react';
|
} from '@ionic/react';
|
||||||
import {
|
import Hello from '../components/Hello';
|
||||||
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 = {
|
const Home: React.FC = () => (
|
||||||
id: string;
|
<IonPage>
|
||||||
name: string;
|
<IonHeader>
|
||||||
category: string;
|
<IonToolbar>
|
||||||
description: string;
|
<IonTitle>Home</IonTitle>
|
||||||
price: number;
|
</IonToolbar>
|
||||||
rating: number;
|
</IonHeader>
|
||||||
prepTime: string;
|
<IonContent className="ion-padding">
|
||||||
image: string;
|
<Hello />
|
||||||
imageAlt: string;
|
</IonContent>
|
||||||
};
|
</IonPage>
|
||||||
|
);
|
||||||
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 (
|
|
||||||
<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>
|
|
||||||
</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.
|
|
||||||
</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>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</IonContent>
|
|
||||||
</IonPage>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Home;
|
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;
|
|
||||||
@@ -2,6 +2,6 @@ import { createClient } from '@supabase/supabase-js';
|
|||||||
import type { Database } from './database.types';
|
import type { Database } from './database.types';
|
||||||
|
|
||||||
export const supabase = createClient<Database>(
|
export const supabase = createClient<Database>(
|
||||||
'https://ztrqscwsjnfvcuaakqus.supabase.co',
|
'https://gsltltsypffowdpfdhkf.supabase.co',
|
||||||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inp0cnFzY3dzam5mdmN1YWFrcXVzIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Nzk4ODk5MzEsImV4cCI6MjA5NTQ2NTkzMX0.htIOqPM90Uk0dYIdD8X8_tLfq5URcSvmCArfVRF4jeQ',
|
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImdzbHRsdHN5cGZmb3dkcGZkaGtmIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Nzk1Njg0MTIsImV4cCI6MjA5NTE0NDQxMn0.XH2adPZPr9p0fQwP3mXDP6wIS41DByW7ZAPSMA0_TYI',
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,701 +1,65 @@
|
|||||||
/* Ionic CSS Variables — customise to match your app's brand */
|
/* Ionic CSS Variables — customise to match your app's brand */
|
||||||
:root {
|
:root {
|
||||||
--ion-color-primary: #ff7a45;
|
--ion-color-primary: #3880ff;
|
||||||
--ion-color-primary-rgb: 255, 122, 69;
|
--ion-color-primary-rgb: 56, 128, 255;
|
||||||
--ion-color-primary-contrast: #ffffff;
|
--ion-color-primary-contrast: #ffffff;
|
||||||
--ion-color-primary-contrast-rgb: 255, 255, 255;
|
--ion-color-primary-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-primary-shade: #e06b3d;
|
--ion-color-primary-shade: #3171e0;
|
||||||
--ion-color-primary-tint: #ff8758;
|
--ion-color-primary-tint: #4c8dff;
|
||||||
|
|
||||||
--ion-color-secondary: #1f9d8b;
|
--ion-color-secondary: #3dc2ff;
|
||||||
--ion-color-secondary-rgb: 31, 157, 139;
|
--ion-color-secondary-rgb: 61, 194, 255;
|
||||||
--ion-color-secondary-contrast: #ffffff;
|
--ion-color-secondary-contrast: #ffffff;
|
||||||
--ion-color-secondary-contrast-rgb: 255, 255, 255;
|
--ion-color-secondary-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-secondary-shade: #1b8a7a;
|
--ion-color-secondary-shade: #36abe0;
|
||||||
--ion-color-secondary-tint: #35a794;
|
--ion-color-secondary-tint: #50c8ff;
|
||||||
|
|
||||||
--ion-color-tertiary: #6c63ff;
|
--ion-color-tertiary: #5260ff;
|
||||||
--ion-color-tertiary-rgb: 108, 99, 255;
|
--ion-color-tertiary-rgb: 82, 96, 255;
|
||||||
--ion-color-tertiary-contrast: #ffffff;
|
--ion-color-tertiary-contrast: #ffffff;
|
||||||
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
|
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-tertiary-shade: #5f57e0;
|
--ion-color-tertiary-shade: #4854e0;
|
||||||
--ion-color-tertiary-tint: #7b73ff;
|
--ion-color-tertiary-tint: #6370ff;
|
||||||
|
|
||||||
--ion-color-success: #2fb36d;
|
--ion-color-success: #2dd36f;
|
||||||
--ion-color-success-rgb: 47, 179, 109;
|
--ion-color-success-rgb: 45, 211, 111;
|
||||||
--ion-color-success-contrast: #ffffff;
|
--ion-color-success-contrast: #ffffff;
|
||||||
--ion-color-success-contrast-rgb: 255, 255, 255;
|
--ion-color-success-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-success-shade: #299d60;
|
--ion-color-success-shade: #28ba62;
|
||||||
--ion-color-success-tint: #44bb7c;
|
--ion-color-success-tint: #42d77d;
|
||||||
|
|
||||||
--ion-color-warning: #f4b400;
|
--ion-color-warning: #ffc409;
|
||||||
--ion-color-warning-rgb: 244, 180, 0;
|
--ion-color-warning-rgb: 255, 196, 9;
|
||||||
--ion-color-warning-contrast: #000000;
|
--ion-color-warning-contrast: #000000;
|
||||||
--ion-color-warning-contrast-rgb: 0, 0, 0;
|
--ion-color-warning-contrast-rgb: 0, 0, 0;
|
||||||
--ion-color-warning-shade: #d79e00;
|
--ion-color-warning-shade: #e0ac08;
|
||||||
--ion-color-warning-tint: #f5bc1a;
|
--ion-color-warning-tint: #ffca22;
|
||||||
|
|
||||||
--ion-color-danger: #d64550;
|
--ion-color-danger: #eb445a;
|
||||||
--ion-color-danger-rgb: 214, 69, 80;
|
--ion-color-danger-rgb: 235, 68, 90;
|
||||||
--ion-color-danger-contrast: #ffffff;
|
--ion-color-danger-contrast: #ffffff;
|
||||||
--ion-color-danger-contrast-rgb: 255, 255, 255;
|
--ion-color-danger-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-danger-shade: #bc3d46;
|
--ion-color-danger-shade: #cf3c4f;
|
||||||
--ion-color-danger-tint: #da5862;
|
--ion-color-danger-tint: #ed576b;
|
||||||
|
|
||||||
--ion-color-dark: #1d1b22;
|
--ion-color-dark: #222428;
|
||||||
--ion-color-dark-rgb: 29, 27, 34;
|
--ion-color-dark-rgb: 34, 36, 40;
|
||||||
--ion-color-dark-contrast: #ffffff;
|
--ion-color-dark-contrast: #ffffff;
|
||||||
--ion-color-dark-contrast-rgb: 255, 255, 255;
|
--ion-color-dark-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-dark-shade: #1a181e;
|
--ion-color-dark-shade: #1e2023;
|
||||||
--ion-color-dark-tint: #34323b;
|
--ion-color-dark-tint: #383a3e;
|
||||||
|
|
||||||
--ion-color-medium: #7a7685;
|
--ion-color-medium: #92949c;
|
||||||
--ion-color-medium-rgb: 122, 118, 133;
|
--ion-color-medium-rgb: 146, 148, 156;
|
||||||
--ion-color-medium-contrast: #ffffff;
|
--ion-color-medium-contrast: #ffffff;
|
||||||
--ion-color-medium-contrast-rgb: 255, 255, 255;
|
--ion-color-medium-contrast-rgb: 255, 255, 255;
|
||||||
--ion-color-medium-shade: #6b6875;
|
--ion-color-medium-shade: #808289;
|
||||||
--ion-color-medium-tint: #87838f;
|
--ion-color-medium-tint: #9d9fa6;
|
||||||
|
|
||||||
--ion-color-light: #fff8f2;
|
--ion-color-light: #f4f5f8;
|
||||||
--ion-color-light-rgb: 255, 248, 242;
|
--ion-color-light-rgb: 244, 245, 248;
|
||||||
--ion-color-light-contrast: #1d1b22;
|
--ion-color-light-contrast: #000000;
|
||||||
--ion-color-light-contrast-rgb: 29, 27, 34;
|
--ion-color-light-contrast-rgb: 0, 0, 0;
|
||||||
--ion-color-light-shade: #e0dad5;
|
--ion-color-light-shade: #d7d8da;
|
||||||
--ion-color-light-tint: #fff9f4;
|
--ion-color-light-tint: #f5f6f9;
|
||||||
|
|
||||||
--ion-background-color: #fffaf6;
|
|
||||||
--ion-text-color: #1d1b22;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background: var(--ion-background-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.shop-header ion-toolbar {
|
|
||||||
--background: #fff8f2;
|
|
||||||
--border-color: transparent;
|
|
||||||
--min-height: 72px;
|
|
||||||
--padding-start: 8px;
|
|
||||||
--padding-end: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.shop-header ion-title {
|
|
||||||
padding-inline-start: 0;
|
|
||||||
padding-inline-end: 0;
|
|
||||||
font-size: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.home-title {
|
|
||||||
text-align: left;
|
|
||||||
padding-inline-start: 36px;
|
|
||||||
padding-inline-end: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.shop-content {
|
|
||||||
--background: linear-gradient(180deg, #fff8f2 0%, #ffffff 18%, #ffffff 100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.hero-card {
|
|
||||||
margin: 16px;
|
|
||||||
padding: 24px;
|
|
||||||
border-radius: 24px;
|
|
||||||
background: linear-gradient(135deg, #1d1b22, #363043);
|
|
||||||
color: #ffffff;
|
|
||||||
box-shadow: 0 20px 45px rgba(29, 27, 34, 0.18);
|
|
||||||
}
|
|
||||||
|
|
||||||
.hero-card h1,
|
|
||||||
.detail-hero h1,
|
|
||||||
.confirmation-card h1 {
|
|
||||||
margin: 14px 0 10px;
|
|
||||||
font-size: 2rem;
|
|
||||||
line-height: 1.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hero-card p {
|
|
||||||
margin: 0;
|
|
||||||
color: rgba(255, 255, 255, 0.82);
|
|
||||||
}
|
|
||||||
|
|
||||||
.catalog-section {
|
|
||||||
padding-top: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-heading {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin: 18px 0 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-heading h2,
|
|
||||||
.detail-panel h2 {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 1.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-grid {
|
|
||||||
display: grid;
|
|
||||||
gap: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card {
|
|
||||||
margin: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
border-radius: 22px;
|
|
||||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card-image {
|
|
||||||
width: 100%;
|
|
||||||
height: 220px;
|
|
||||||
object-fit: cover;
|
|
||||||
display: block;
|
|
||||||
background: #fff8f2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card ion-card-content,
|
|
||||||
.summary-card,
|
|
||||||
.detail-panel,
|
|
||||||
.confirmation-card,
|
|
||||||
.cart-item {
|
|
||||||
background: #ffffff;
|
|
||||||
border-radius: 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card-top,
|
|
||||||
.product-card-footer,
|
|
||||||
.summary-row,
|
|
||||||
.quantity-row,
|
|
||||||
.order-box,
|
|
||||||
.detail-meta,
|
|
||||||
.cart-actions {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card h3 {
|
|
||||||
margin: 14px 0 8px;
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card p,
|
|
||||||
.cart-item p,
|
|
||||||
.muted-text {
|
|
||||||
margin: 0;
|
|
||||||
color: #6b6875;
|
|
||||||
line-height: 1.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.product-card-footer {
|
|
||||||
margin-top: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rating-pill {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
color: #f4b400;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.home-header-actions {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
flex-wrap: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-icon-button,
|
|
||||||
.cart-button {
|
|
||||||
position: relative;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-icon-button {
|
|
||||||
--background: rgba(var(--ion-color-primary-rgb), 0.12);
|
|
||||||
--background-hover: rgba(var(--ion-color-primary-rgb), 0.16);
|
|
||||||
--background-activated: rgba(var(--ion-color-primary-rgb), 0.2);
|
|
||||||
--color: var(--ion-color-primary);
|
|
||||||
--border-radius: 999px;
|
|
||||||
--padding-start: 14px;
|
|
||||||
--padding-end: 14px;
|
|
||||||
min-width: 52px;
|
|
||||||
min-height: 52px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-icon-button ion-icon {
|
|
||||||
font-size: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-cart-button {
|
|
||||||
--background: rgba(var(--ion-color-primary-rgb), 0.12);
|
|
||||||
--background-hover: rgba(var(--ion-color-primary-rgb), 0.16);
|
|
||||||
--background-activated: rgba(var(--ion-color-primary-rgb), 0.2);
|
|
||||||
--color: var(--ion-color-primary);
|
|
||||||
--border-radius: 999px;
|
|
||||||
--padding-start: 16px;
|
|
||||||
--padding-end: 16px;
|
|
||||||
--padding-top: 10px;
|
|
||||||
--padding-bottom: 10px;
|
|
||||||
min-width: 72px;
|
|
||||||
min-height: 52px;
|
|
||||||
font-weight: 700;
|
|
||||||
font-variant-numeric: tabular-nums;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-cart-button span {
|
|
||||||
margin-left: 8px;
|
|
||||||
font-size: 1.1rem;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-cart-button ion-icon {
|
|
||||||
font-size: 1.45rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.empty-state {
|
|
||||||
padding: 48px 24px;
|
|
||||||
text-align: center;
|
|
||||||
display: grid;
|
|
||||||
gap: 12px;
|
|
||||||
justify-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.empty-state ion-icon,
|
|
||||||
.confirmation-card ion-icon {
|
|
||||||
font-size: 3rem;
|
|
||||||
color: var(--ion-color-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-hero {
|
|
||||||
background: linear-gradient(180deg, #fff8f2 0%, #ffffff 100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-image-wrap {
|
|
||||||
margin-bottom: 18px;
|
|
||||||
border-radius: 24px;
|
|
||||||
overflow: hidden;
|
|
||||||
background: #ffffff;
|
|
||||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-image {
|
|
||||||
width: 100%;
|
|
||||||
height: 280px;
|
|
||||||
object-fit: cover;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-meta {
|
|
||||||
justify-content: flex-start;
|
|
||||||
margin: 14px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-meta ion-badge {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 6px;
|
|
||||||
padding: 8px 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-price {
|
|
||||||
margin-top: 18px;
|
|
||||||
font-size: 2rem;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.detail-panel {
|
|
||||||
margin: 8px 16px 24px;
|
|
||||||
padding: 20px;
|
|
||||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quantity-row {
|
|
||||||
justify-content: flex-start;
|
|
||||||
margin: 16px 0 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quantity-row span,
|
|
||||||
.cart-actions span {
|
|
||||||
min-width: 24px;
|
|
||||||
text-align: center;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-box {
|
|
||||||
margin-bottom: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-box strong,
|
|
||||||
.summary-row strong,
|
|
||||||
.confirmation-details strong {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-overview-card {
|
|
||||||
margin-bottom: 16px;
|
|
||||||
padding: 20px;
|
|
||||||
border-radius: 22px;
|
|
||||||
background: #fff8f2;
|
|
||||||
display: grid;
|
|
||||||
gap: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-overview-card h2 {
|
|
||||||
margin: 4px 0 0;
|
|
||||||
font-size: 1.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.overview-label {
|
|
||||||
margin: 0;
|
|
||||||
color: #7a7685;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.08em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-overview-card p {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-list {
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-item {
|
|
||||||
--background: #ffffff;
|
|
||||||
--padding-start: 16px;
|
|
||||||
--inner-padding-end: 16px;
|
|
||||||
margin-bottom: 12px;
|
|
||||||
box-shadow: 0 12px 28px rgba(32, 24, 18, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-actions {
|
|
||||||
flex-wrap: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.summary-card,
|
|
||||||
.checkout-card,
|
|
||||||
.confirmation-card,
|
|
||||||
.order-card,
|
|
||||||
.tracking-summary-card,
|
|
||||||
.timeline-card,
|
|
||||||
.delivery-details-card {
|
|
||||||
padding: 20px;
|
|
||||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-card,
|
|
||||||
.summary-card {
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-card {
|
|
||||||
background: #ffffff;
|
|
||||||
border-radius: 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-heading {
|
|
||||||
margin: 0 0 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-form-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
|
||||||
gap: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-field {
|
|
||||||
display: grid;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-field.full-width {
|
|
||||||
grid-column: 1 / -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-field ion-label {
|
|
||||||
font-size: 0.95rem;
|
|
||||||
font-weight: 600;
|
|
||||||
color: #4f4a5b;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-input {
|
|
||||||
--background: #fff8f2;
|
|
||||||
--padding-start: 14px;
|
|
||||||
--padding-end: 14px;
|
|
||||||
--padding-top: 14px;
|
|
||||||
--padding-bottom: 14px;
|
|
||||||
border-radius: 16px;
|
|
||||||
border: 1px solid #f0e5db;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkout-textarea {
|
|
||||||
min-height: 112px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.field-error p {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 0.88rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.total-row {
|
|
||||||
margin: 14px 0 20px;
|
|
||||||
padding-top: 14px;
|
|
||||||
border-top: 1px solid #f0ebe7;
|
|
||||||
font-size: 1.05rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.confirmation-card {
|
|
||||||
margin-top: 8vh;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.confirmation-details {
|
|
||||||
margin: 24px 0 16px;
|
|
||||||
padding: 16px;
|
|
||||||
border-radius: 18px;
|
|
||||||
background: #fff8f2;
|
|
||||||
display: grid;
|
|
||||||
gap: 14px;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-details-card {
|
|
||||||
margin: 0 0 24px;
|
|
||||||
border-radius: 18px;
|
|
||||||
background: #fffdfb;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: flex-start;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 16px;
|
|
||||||
padding: 10px 0;
|
|
||||||
border-bottom: 1px solid #f5ede6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row:last-child {
|
|
||||||
border-bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row span {
|
|
||||||
color: #7a7685;
|
|
||||||
font-size: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row strong {
|
|
||||||
color: #1d1b22;
|
|
||||||
text-align: right;
|
|
||||||
max-width: 65%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-block {
|
|
||||||
display: grid;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-block strong {
|
|
||||||
max-width: none;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.confirmation-details span {
|
|
||||||
display: block;
|
|
||||||
margin-bottom: 4px;
|
|
||||||
color: #7a7685;
|
|
||||||
font-size: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.orders-list {
|
|
||||||
display: grid;
|
|
||||||
gap: 14px;
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card {
|
|
||||||
width: 100%;
|
|
||||||
border: 0;
|
|
||||||
text-align: left;
|
|
||||||
background: #ffffff;
|
|
||||||
border-radius: 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card-top,
|
|
||||||
.order-card-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card-top {
|
|
||||||
margin-bottom: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card-row {
|
|
||||||
margin-top: 10px;
|
|
||||||
color: #6b6875;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card-row strong {
|
|
||||||
color: #1d1b22;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card h3,
|
|
||||||
.tracking-summary-card h1,
|
|
||||||
.timeline-card h2 {
|
|
||||||
margin: 6px 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-label {
|
|
||||||
font-size: 0.8rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.08em;
|
|
||||||
color: #7a7685;
|
|
||||||
}
|
|
||||||
|
|
||||||
.order-card-date {
|
|
||||||
margin-top: 16px;
|
|
||||||
color: #7a7685;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tracking-summary-card {
|
|
||||||
background: linear-gradient(180deg, #fff8f2 0%, #ffffff 100%);
|
|
||||||
border-radius: 24px;
|
|
||||||
margin-bottom: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeline-card {
|
|
||||||
background: #ffffff;
|
|
||||||
border-radius: 24px;
|
|
||||||
margin-bottom: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tracking-timeline {
|
|
||||||
display: grid;
|
|
||||||
gap: 16px;
|
|
||||||
margin-top: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeline-step {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 18px 1fr;
|
|
||||||
gap: 12px;
|
|
||||||
align-items: start;
|
|
||||||
opacity: 0.55;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeline-step.active {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeline-dot {
|
|
||||||
width: 14px;
|
|
||||||
height: 14px;
|
|
||||||
border-radius: 999px;
|
|
||||||
margin-top: 4px;
|
|
||||||
background: #e7dfd7;
|
|
||||||
box-shadow: 0 0 0 6px #f8f3ee;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeline-step.active .timeline-dot {
|
|
||||||
background: var(--ion-color-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.cart-empty {
|
|
||||||
min-height: 70vh;
|
|
||||||
align-content: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-page {
|
|
||||||
--background: linear-gradient(180deg, #fff8f2 0%, #ffffff 30%, #ffffff 100%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-card {
|
|
||||||
background: #ffffff;
|
|
||||||
border-radius: 24px;
|
|
||||||
padding: 24px;
|
|
||||||
box-shadow: 0 16px 34px rgba(32, 24, 18, 0.08);
|
|
||||||
max-width: 640px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-card h1 {
|
|
||||||
margin: 0 0 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-form {
|
|
||||||
display: grid;
|
|
||||||
gap: 14px;
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.auth-input-item {
|
|
||||||
--background: #fff8f2;
|
|
||||||
border-radius: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 12px;
|
|
||||||
margin: 8px 0 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-chip-row {
|
|
||||||
display: flex;
|
|
||||||
gap: 8px;
|
|
||||||
overflow-x: auto;
|
|
||||||
padding-bottom: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-button {
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-modal h2 {
|
|
||||||
margin: 4px 0 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.default-pill {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 6px 10px;
|
|
||||||
border-radius: 999px;
|
|
||||||
background: rgba(var(--ion-color-primary-rgb), 0.12);
|
|
||||||
color: var(--ion-color-primary);
|
|
||||||
font-weight: 700;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-order-item ion-select {
|
|
||||||
min-width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
|
||||||
.checkout-form-grid {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row {
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.delivery-detail-row strong {
|
|
||||||
max-width: none;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.filter-row {
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,14 @@
|
|||||||
import { StatusBar, Style } from '@capacitor/status-bar';
|
import { StatusBar, Style } from '@capacitor/status-bar';
|
||||||
export { Style };
|
export { Style };
|
||||||
|
``
|
||||||
const _origin = (() => {
|
const _origin = (() => {
|
||||||
try {
|
try { if (document.referrer) return new URL(document.referrer).origin; } catch {}
|
||||||
if (document.referrer) return new URL(document.referrer).origin;
|
|
||||||
} catch {}
|
|
||||||
return window.location.origin;
|
return window.location.origin;
|
||||||
})();
|
})();
|
||||||
|
|
||||||
/** Set status bar icon/text colour. Use instead of StatusBar.setStyle directly. */
|
/** Set status bar icon/text colour. Use instead of StatusBar.setStyle directly. */
|
||||||
export async function setStatusBarStyle(style: Style): Promise<void> {
|
export async function setStatusBarStyle(style: Style): Promise<void> {
|
||||||
try {
|
try { await StatusBar.setStyle({ style }); } catch {}
|
||||||
await StatusBar.setStyle({ style });
|
|
||||||
} catch {}
|
|
||||||
if (window.parent !== window) {
|
if (window.parent !== window) {
|
||||||
window.parent.postMessage({ type: '__apsuite_statusbar', style }, _origin);
|
window.parent.postMessage({ type: '__apsuite_statusbar', style }, _origin);
|
||||||
}
|
}
|
||||||
@@ -20,13 +16,8 @@ export async function setStatusBarStyle(style: Style): Promise<void> {
|
|||||||
|
|
||||||
/** Set status bar background colour (Android). Use instead of StatusBar.setBackgroundColor directly. */
|
/** Set status bar background colour (Android). Use instead of StatusBar.setBackgroundColor directly. */
|
||||||
export async function setStatusBarBackground(color: string): Promise<void> {
|
export async function setStatusBarBackground(color: string): Promise<void> {
|
||||||
try {
|
try { await (StatusBar as any).setBackgroundColor({ color }); } catch {}
|
||||||
await (StatusBar as any).setBackgroundColor({ color });
|
|
||||||
} catch {}
|
|
||||||
if (window.parent !== window) {
|
if (window.parent !== window) {
|
||||||
window.parent.postMessage(
|
window.parent.postMessage({ type: '__apsuite_statusbar_bg', color }, _origin);
|
||||||
{ type: '__apsuite_statusbar_bg', color },
|
|
||||||
_origin
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||