Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c8ec54c22d |
Binary file not shown.
Vendored
BIN
Binary file not shown.
@@ -4,7 +4,7 @@ android {
|
||||
namespace = "io.ionic.starter"
|
||||
compileSdk = rootProject.ext.compileSdkVersion
|
||||
defaultConfig {
|
||||
applicationId "com.habitmode.llemba.com"
|
||||
applicationId "io.shopkeep.app"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 1
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="io.flavorstudio.app" />
|
||||
<data android:scheme="io.shopkeep.app" />
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="app_name">FlavorStudio</string>
|
||||
<string name="title_activity_main">FlavorStudio</string>
|
||||
<string name="app_name">ShopKeep</string>
|
||||
<string name="title_activity_main">ShopKeep</string>
|
||||
<string name="package_name">io.ionic.starter</string>
|
||||
<string name="custom_url_scheme">io.ionic.starter</string>
|
||||
</resources>
|
||||
|
||||
@@ -15,5 +15,4 @@ ext {
|
||||
cordovaAndroidVersion = '14.0.1'
|
||||
rgcfaIncludeGoogle = true
|
||||
androidxCredentialsVersion = '1.3.0'
|
||||
javaVersion = JavaVersion.VERSION_17
|
||||
}
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
import type { CapacitorConfig } from '@capacitor/cli';
|
||||
|
||||
const config: CapacitorConfig = {
|
||||
appId: 'com.habitmode.llemba.com',
|
||||
appName: 'FlavorStudio',
|
||||
appId: 'io.shopkeep.app',
|
||||
appName: 'ShopKeep',
|
||||
webDir: 'dist',
|
||||
plugins: {
|
||||
FirebaseAuthentication: {
|
||||
|
||||
@@ -55,13 +55,6 @@ workflows:
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
echo "$CM_DEBUG_KEYSTORE" | base64 --decode > /tmp/debug-keystore.p12
|
||||
fi
|
||||
- name: Check native credentials
|
||||
script: |
|
||||
if [ -n "$VITE_GOOGLE_MAPS_KEY" ]; then
|
||||
echo "VITE_GOOGLE_MAPS_KEY: set (length=${#VITE_GOOGLE_MAPS_KEY}, ends …${VITE_GOOGLE_MAPS_KEY: -4})"
|
||||
else
|
||||
echo "WARNING: VITE_GOOGLE_MAPS_KEY not set — Google Maps will not render"
|
||||
fi
|
||||
- name: Build debug APK
|
||||
script: |
|
||||
cd android
|
||||
@@ -75,21 +68,6 @@ workflows:
|
||||
else
|
||||
./gradlew assembleDebug --no-daemon
|
||||
fi
|
||||
- name: Verify manifest substitution
|
||||
script: |
|
||||
MANIFEST="android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml"
|
||||
if [ -f "$MANIFEST" ]; then
|
||||
VAL=$(grep -A1 'geo.API_KEY' "$MANIFEST" | grep -o 'android:value="[^"]*"' | cut -d'"' -f2)
|
||||
if [ -z "$VAL" ]; then
|
||||
echo "WARNING: geo.API_KEY meta-data not found in merged manifest"
|
||||
elif [ "$VAL" = '${googleMapsApiKey}' ]; then
|
||||
echo "WARNING: geo.API_KEY placeholder was not substituted — key missing from build env"
|
||||
else
|
||||
echo "geo.API_KEY substituted OK (ends …${VAL: -4})"
|
||||
fi
|
||||
else
|
||||
echo "Merged manifest not found at $MANIFEST"
|
||||
fi
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/debug/app-debug.apk
|
||||
|
||||
|
||||
Vendored
BIN
Binary file not shown.
Vendored
BIN
Binary file not shown.
@@ -26,6 +26,7 @@
|
||||
504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
1A4EB3C21FED79650016851F /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
|
||||
50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
|
||||
958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
|
||||
/* End PBXFileReference section */
|
||||
@@ -68,6 +69,7 @@
|
||||
504EC30E1FED79650016851F /* Assets.xcassets */,
|
||||
504EC3101FED79650016851F /* LaunchScreen.storyboard */,
|
||||
504EC3131FED79650016851F /* Info.plist */,
|
||||
1A4EB3C21FED79650016851F /* App.entitlements */,
|
||||
2FAD9762203C412B000D30F8 /* config.xml */,
|
||||
50B271D01FEDC1A000F3C39B /* public */,
|
||||
);
|
||||
@@ -295,6 +297,7 @@
|
||||
baseConfigurationReference = 958DCC722DB07C7200EA8C5F /* debug.xcconfig */;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
@@ -305,7 +308,7 @@
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.flavorstudio.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.shopkeep.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||
SWIFT_VERSION = 5.0;
|
||||
@@ -317,6 +320,7 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
INFOPLIST_FILE = App/Info.plist;
|
||||
@@ -326,7 +330,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 1.0;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.flavorstudio.app;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = io.shopkeep.app;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||
SWIFT_VERSION = 5.0;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>FlavorStudio</string>
|
||||
<string>ShopKeep</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
@@ -51,10 +51,10 @@
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleURLName</key>
|
||||
<string>io.flavorstudio.app</string>
|
||||
<string>io.shopkeep.app</string>
|
||||
<key>CFBundleURLSchemes</key>
|
||||
<array>
|
||||
<string>io.flavorstudio.app</string>
|
||||
<string>io.shopkeep.app</string>
|
||||
</array>
|
||||
</dict>
|
||||
</array>
|
||||
|
||||
@@ -1,363 +0,0 @@
|
||||
workflows:
|
||||
android-debug:
|
||||
name: Android – Debug APK
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
echo "Wrote google-services.json ($(wc -c < android/app/google-services.json) bytes)"
|
||||
else
|
||||
echo "GOOGLE_SERVICES_JSON is empty — skipping"
|
||||
fi
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
echo "Wrote GoogleService-Info.plist ($(wc -c < ios/App/App/GoogleService-Info.plist) bytes)"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up debug keystore
|
||||
script: |
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
echo "$CM_DEBUG_KEYSTORE" | base64 --decode > /tmp/debug-keystore.p12
|
||||
fi
|
||||
- name: Build debug APK
|
||||
script: |
|
||||
cd android
|
||||
if [ -n "$CM_DEBUG_KEYSTORE" ]; then
|
||||
./gradlew assembleDebug \
|
||||
-Pandroid.injected.signing.store.file=/tmp/debug-keystore.p12 \
|
||||
-Pandroid.injected.signing.store.password=$CM_DEBUG_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=debug \
|
||||
-Pandroid.injected.signing.key.password=$CM_DEBUG_KEYSTORE_PASSWORD \
|
||||
--no-daemon
|
||||
else
|
||||
./gradlew assembleDebug --no-daemon
|
||||
fi
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/debug/app-debug.apk
|
||||
|
||||
android-release-apk:
|
||||
name: Android – Release APK
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release APK
|
||||
script: |
|
||||
cd android
|
||||
./gradlew assembleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
artifacts:
|
||||
- android/app/build/outputs/apk/release/app-release.apk
|
||||
|
||||
android-release-aab:
|
||||
name: Android – Release AAB
|
||||
max_build_duration: 45
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release AAB
|
||||
script: |
|
||||
cd android
|
||||
./gradlew bundleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
artifacts:
|
||||
- android/app/build/outputs/bundle/release/app-release.aab
|
||||
|
||||
android-release:
|
||||
name: Android – Publish to Google Play
|
||||
max_build_duration: 60
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
java: 21
|
||||
cache:
|
||||
cache_paths:
|
||||
- $HOME/.gradle/caches
|
||||
- $HOME/.gradle/wrapper
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICES_JSON" ]; then
|
||||
echo "$GOOGLE_SERVICES_JSON" | base64 --decode > android/app/google-services.json
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync android
|
||||
- name: Set up keystore
|
||||
script: echo "$CM_KEYSTORE" | base64 --decode > /tmp/keystore.jks
|
||||
- name: Build Release AAB
|
||||
script: |
|
||||
cd android
|
||||
./gradlew bundleRelease \
|
||||
-Pandroid.injected.signing.store.file=/tmp/keystore.jks \
|
||||
-Pandroid.injected.signing.store.password=$CM_KEYSTORE_PASSWORD \
|
||||
-Pandroid.injected.signing.key.alias=$CM_KEY_ALIAS \
|
||||
-Pandroid.injected.signing.key.password=$CM_KEY_PASSWORD \
|
||||
--no-daemon
|
||||
publishing:
|
||||
google_play:
|
||||
credentials: $GOOGLE_PLAY_SERVICE_ACCOUNT_CREDENTIALS
|
||||
track: $GOOGLE_PLAY_TRACK
|
||||
submit_as_draft: false
|
||||
artifacts:
|
||||
- android/app/build/outputs/bundle/release/app-release.aab
|
||||
|
||||
ios-debug:
|
||||
name: iOS – Debug IPA
|
||||
max_build_duration: 60
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
xcode: latest
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
if [ -n "$APP_STORE_CONNECT_PRIVATE_KEY" ]; then
|
||||
app-store-connect fetch-signing-files \
|
||||
$(xcode-project detect-bundle-id) \
|
||||
--type IOS_APP_DEVELOPMENT \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--create
|
||||
xcode-project use-profiles
|
||||
elif [ -n "$CM_CERTIFICATE" ]; then
|
||||
echo "$CM_CERTIFICATE" | base64 --decode > /tmp/cert.p12
|
||||
keychain add-certificates \
|
||||
--certificate /tmp/cert.p12 \
|
||||
--certificate-password "$CM_CERTIFICATE_PASSWORD"
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
||||
xcode-project use-profiles
|
||||
else
|
||||
echo "No signing credentials configured — build will fail at signing"
|
||||
exit 1
|
||||
fi
|
||||
- name: Build IPA
|
||||
script: |
|
||||
xcode-project build-ipa \
|
||||
--workspace ios/App/App.xcworkspace \
|
||||
--scheme App
|
||||
artifacts:
|
||||
- build/ios/ipa/*.ipa
|
||||
|
||||
ios-release:
|
||||
name: iOS – Release IPA
|
||||
max_build_duration: 90
|
||||
instance_type: mac_mini_m2
|
||||
environment:
|
||||
node: 22
|
||||
xcode: latest
|
||||
scripts:
|
||||
- name: Strip unused scaffold packages
|
||||
script: |
|
||||
for pkg in "@capacitor/google-maps" "@capacitor/push-notifications" "@capacitor-firebase/authentication"; do
|
||||
if ! grep -rq "$pkg" src/; then
|
||||
node -e "const fs=require('fs'),p=JSON.parse(fs.readFileSync('package.json','utf8'));delete p.dependencies['${pkg}'];fs.writeFileSync('package.json',JSON.stringify(p,null,2));"
|
||||
echo "Stripped $pkg (not used in src/)"
|
||||
else
|
||||
echo "Keeping $pkg (used in src/)"
|
||||
fi
|
||||
done
|
||||
- name: Install dependencies
|
||||
script: rm -f package-lock.json && npm install --legacy-peer-deps
|
||||
- name: Build web assets
|
||||
script: npm run build
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Write Firebase config
|
||||
script: |
|
||||
if [ -n "$GOOGLE_SERVICE_INFO_PLIST" ]; then
|
||||
echo "$GOOGLE_SERVICE_INFO_PLIST" | base64 --decode > ios/App/App/GoogleService-Info.plist
|
||||
ruby -e "
|
||||
require 'xcodeproj'
|
||||
project = Xcodeproj::Project.open('ios/App/App.xcodeproj')
|
||||
target = project.targets.find { |t| t.name == 'App' }
|
||||
app_group = project.main_group['App']
|
||||
unless app_group.files.find { |f| f.path == 'GoogleService-Info.plist' }
|
||||
file_ref = app_group.new_reference('GoogleService-Info.plist')
|
||||
target.resources_build_phase.add_file_reference(file_ref)
|
||||
project.save
|
||||
end
|
||||
"
|
||||
fi
|
||||
- name: Capacitor sync
|
||||
script: npx cap sync ios
|
||||
- name: Set up signing
|
||||
script: |
|
||||
keychain initialize
|
||||
if [ -n "$APP_STORE_CONNECT_PRIVATE_KEY" ]; then
|
||||
app-store-connect fetch-signing-files \
|
||||
$(xcode-project detect-bundle-id) \
|
||||
--type IOS_APP_STORE \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--create
|
||||
xcode-project use-profiles
|
||||
else
|
||||
echo "$CM_CERTIFICATE" | base64 --decode > /tmp/cert.p12
|
||||
keychain add-certificates \
|
||||
--certificate /tmp/cert.p12 \
|
||||
--certificate-password "$CM_CERTIFICATE_PASSWORD"
|
||||
mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
|
||||
echo "$CM_PROVISIONING_PROFILE" | base64 --decode > "$HOME/Library/MobileDevice/Provisioning Profiles/profile.mobileprovision"
|
||||
xcode-project use-profiles
|
||||
fi
|
||||
- name: Build IPA
|
||||
script: |
|
||||
xcode-project build-ipa \
|
||||
--workspace ios/App/App.xcworkspace \
|
||||
--scheme App \
|
||||
--config Release
|
||||
- name: Publish
|
||||
script: |
|
||||
if [ "$SUBMIT_TO_TESTFLIGHT" = "true" ] || [ "$SUBMIT_TO_APP_STORE" = "true" ]; then
|
||||
app-store-connect publish \
|
||||
--certificate-key=@env:APP_STORE_CONNECT_PRIVATE_KEY \
|
||||
--issuer-id=$APP_STORE_CONNECT_ISSUER_ID \
|
||||
--key-id=$APP_STORE_CONNECT_KEY_IDENTIFIER \
|
||||
--submit-to-testflight=$SUBMIT_TO_TESTFLIGHT \
|
||||
--submit-to-app-store=$SUBMIT_TO_APP_STORE
|
||||
fi
|
||||
artifacts:
|
||||
- build/ios/ipa/*.ipa
|
||||
@@ -20,6 +20,7 @@
|
||||
"@capacitor/keyboard": "8.0.3",
|
||||
"@capacitor/push-notifications": "^8.1.1",
|
||||
"@capacitor/status-bar": "8.0.2",
|
||||
"@hookform/resolvers": "^3.9.0",
|
||||
"@ionic/pwa-elements": "^3.0.0",
|
||||
"@ionic/react": "8.8.7",
|
||||
"@ionic/react-router": "8.8.7",
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+129
-8
@@ -1,12 +1,50 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import { Redirect, Route } from 'react-router-dom';
|
||||
import { IonApp, IonRouterOutlet } from '@ionic/react';
|
||||
import {
|
||||
IonApp,
|
||||
IonRouterOutlet,
|
||||
IonTabs,
|
||||
IonTabBar,
|
||||
IonTabButton,
|
||||
IonIcon,
|
||||
IonLabel,
|
||||
setupIonicReact,
|
||||
} from '@ionic/react';
|
||||
import { IonReactRouter } from '@ionic/react-router';
|
||||
import {
|
||||
homeOutline,
|
||||
peopleOutline,
|
||||
receiptOutline,
|
||||
home,
|
||||
people,
|
||||
receipt,
|
||||
} from 'ionicons/icons';
|
||||
|
||||
import Home from './pages/Home';
|
||||
import CustomersPage from './pages/CustomersPage';
|
||||
import CustomerDetailPage from './pages/CustomerDetailPage';
|
||||
import HistoryPage from './pages/HistoryPage';
|
||||
import SaleFormPage from './pages/SaleFormPage';
|
||||
import CreditFormPage from './pages/CreditFormPage';
|
||||
import RepaymentFormPage from './pages/RepaymentFormPage';
|
||||
import AuthPage from './pages/AuthPage';
|
||||
import VerifyEmailPage from './pages/VerifyEmailPage';
|
||||
import ForgotPasswordPage from './pages/ForgotPasswordPage';
|
||||
import NewPasswordPage from './pages/NewPasswordPage';
|
||||
|
||||
import { AuthProvider } from './contexts/AuthContext';
|
||||
import ProtectedRoute from './components/ProtectedRoute';
|
||||
import { setStatusBarStyle, Style } from './utils/statusBar';
|
||||
|
||||
/* Core CSS required for Ionic components to work properly */
|
||||
import '@ionic/react/css/core.css';
|
||||
|
||||
/* Basic CSS for apps built with Ionic */
|
||||
import '@ionic/react/css/normalize.css';
|
||||
import '@ionic/react/css/structure.css';
|
||||
import '@ionic/react/css/typography.css';
|
||||
|
||||
/* Optional CSS utils that can be commented out */
|
||||
import '@ionic/react/css/padding.css';
|
||||
import '@ionic/react/css/float-elements.css';
|
||||
import '@ionic/react/css/text-alignment.css';
|
||||
@@ -14,21 +52,104 @@ import '@ionic/react/css/text-transformation.css';
|
||||
import '@ionic/react/css/flex-utils.css';
|
||||
import '@ionic/react/css/display.css';
|
||||
|
||||
/**
|
||||
* Ionic Dark Mode
|
||||
* -----------------------------------------------------
|
||||
* For more info, please see:
|
||||
* https://ionicframework.com/docs/theming/dark-mode
|
||||
*/
|
||||
|
||||
/* import '@ionic/react/css/palettes/dark.always.css'; */
|
||||
/* import '@ionic/react/css/palettes/dark.class.css'; */
|
||||
import '@ionic/react/css/palettes/dark.system.css';
|
||||
|
||||
/* Theme variables */
|
||||
import './theme/variables.css';
|
||||
|
||||
import Home from './pages/Home';
|
||||
import HelloWorld from './pages/HelloWorld';
|
||||
setupIonicReact();
|
||||
|
||||
const App: React.FC = () => (
|
||||
const App: React.FC = () => {
|
||||
useEffect(() => {
|
||||
// Set status bar to light icons on our dark-ish backgrounds
|
||||
setStatusBarStyle(Style.Dark);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<IonApp>
|
||||
<AuthProvider>
|
||||
<IonReactRouter>
|
||||
<IonRouterOutlet animated={true}>
|
||||
<Route path="/home" component={Home} exact />
|
||||
<Route path="/hello-world" component={HelloWorld} exact />
|
||||
<IonRouterOutlet>
|
||||
{/* Auth Routes */}
|
||||
<Route path="/auth" component={AuthPage} exact />
|
||||
<Route path="/verify-email" component={VerifyEmailPage} exact />
|
||||
<Route
|
||||
path="/forgot-password"
|
||||
component={ForgotPasswordPage}
|
||||
exact
|
||||
/>
|
||||
<Route path="/new-password" component={NewPasswordPage} exact />
|
||||
|
||||
{/* Protected Form & Detail Routes (Outer Outlet for push/pop animation) */}
|
||||
<ProtectedRoute path="/sale/new" component={SaleFormPage} exact />
|
||||
<ProtectedRoute
|
||||
path="/credit/new"
|
||||
component={CreditFormPage}
|
||||
exact
|
||||
/>
|
||||
<ProtectedRoute
|
||||
path="/repayment/new"
|
||||
component={RepaymentFormPage}
|
||||
exact
|
||||
/>
|
||||
<ProtectedRoute
|
||||
path="/customers/:id([0-9a-fA-F-]{36})"
|
||||
component={CustomerDetailPage}
|
||||
exact
|
||||
/>
|
||||
|
||||
{/* Tab Shell */}
|
||||
<Route
|
||||
path={['/home', '/customers', '/history']}
|
||||
render={() => (
|
||||
<IonTabs>
|
||||
<IonRouterOutlet>
|
||||
<ProtectedRoute path="/home" component={Home} exact />
|
||||
<ProtectedRoute
|
||||
path="/customers"
|
||||
component={CustomersPage}
|
||||
exact
|
||||
/>
|
||||
<ProtectedRoute
|
||||
path="/history"
|
||||
component={HistoryPage}
|
||||
exact
|
||||
/>
|
||||
</IonRouterOutlet>
|
||||
<IonTabBar slot="bottom">
|
||||
<IonTabButton tab="home" href="/home">
|
||||
<IonIcon icon={homeOutline} />
|
||||
<IonLabel>Home</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="customers" href="/customers">
|
||||
<IonIcon icon={peopleOutline} />
|
||||
<IonLabel>Customers</IonLabel>
|
||||
</IonTabButton>
|
||||
<IonTabButton tab="history" href="/history">
|
||||
<IonIcon icon={receiptOutline} />
|
||||
<IonLabel>History</IonLabel>
|
||||
</IonTabButton>
|
||||
</IonTabBar>
|
||||
</IonTabs>
|
||||
)}
|
||||
/>
|
||||
|
||||
{/* Root Redirect */}
|
||||
<Route exact path="/" render={() => <Redirect to="/home" />} />
|
||||
</IonRouterOutlet>
|
||||
</IonReactRouter>
|
||||
</AuthProvider>
|
||||
</IonApp>
|
||||
);
|
||||
};
|
||||
|
||||
export default App;
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
import React from 'react';
|
||||
import { IonIcon, IonItem, IonLabel, IonNote } from '@ionic/react';
|
||||
import {
|
||||
receiptOutline,
|
||||
personAddOutline,
|
||||
cashOutline,
|
||||
chevronForwardOutline,
|
||||
} from 'ionicons/icons';
|
||||
import { formatMoney } from '../utils/money';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { formatDisplayDate } from '../utils/dates';
|
||||
|
||||
export type ActivityType = 'sale' | 'credit' | 'repayment';
|
||||
|
||||
export interface ActivityItem {
|
||||
id: string;
|
||||
type: ActivityType;
|
||||
amount: number;
|
||||
date: string;
|
||||
customerName?: string;
|
||||
note?: string;
|
||||
customerId?: string;
|
||||
}
|
||||
|
||||
interface ActivityRowProps {
|
||||
item: ActivityItem;
|
||||
onClick?: () => void;
|
||||
showDate?: boolean;
|
||||
}
|
||||
|
||||
const ActivityRow: React.FC<ActivityRowProps> = ({
|
||||
item,
|
||||
onClick,
|
||||
showDate = false,
|
||||
}) => {
|
||||
const { profile } = useAuth();
|
||||
const currency = profile?.currency || 'USD';
|
||||
|
||||
const getIcon = () => {
|
||||
switch (item.type) {
|
||||
case 'sale':
|
||||
return receiptOutline;
|
||||
case 'credit':
|
||||
return personAddOutline;
|
||||
case 'repayment':
|
||||
return cashOutline;
|
||||
}
|
||||
};
|
||||
|
||||
const getTitle = () => {
|
||||
switch (item.type) {
|
||||
case 'sale':
|
||||
return 'Cash Sale';
|
||||
case 'credit':
|
||||
return `Credit: ${item.customerName || 'Customer'}`;
|
||||
case 'repayment':
|
||||
return `Repayment: ${item.customerName || 'Customer'}`;
|
||||
}
|
||||
};
|
||||
|
||||
const getAmountColor = () => {
|
||||
switch (item.type) {
|
||||
case 'sale':
|
||||
return 'var(--color-text-primary)';
|
||||
case 'credit':
|
||||
return 'var(--ion-color-primary)';
|
||||
case 'repayment':
|
||||
return 'var(--ion-color-success)';
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonItem
|
||||
lines="none"
|
||||
onClick={onClick}
|
||||
detail={false}
|
||||
style={{
|
||||
'--background': 'transparent',
|
||||
'--padding-start': '0',
|
||||
'--padding-end': '0',
|
||||
'--inner-padding-end': '0',
|
||||
cursor: onClick ? 'pointer' : 'default',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="icon-container"
|
||||
slot="start"
|
||||
style={{ marginRight: '12px' }}
|
||||
>
|
||||
<IonIcon icon={getIcon()} />
|
||||
</div>
|
||||
<IonLabel>
|
||||
<h3 className="semibold" style={{ margin: '0', fontSize: '15px' }}>
|
||||
{getTitle()}
|
||||
</h3>
|
||||
<p className="secondary-text" style={{ margin: '2px 0 0 0' }}>
|
||||
{showDate ? formatDisplayDate(item.date) : item.note || 'No notes'}
|
||||
</p>
|
||||
</IonLabel>
|
||||
<div
|
||||
slot="end"
|
||||
style={{ textAlign: 'right', display: 'flex', alignItems: 'center' }}
|
||||
>
|
||||
<IonNote
|
||||
className="tabular"
|
||||
style={{
|
||||
fontSize: '15px',
|
||||
color: getAmountColor(),
|
||||
fontWeight: '400',
|
||||
}}
|
||||
>
|
||||
{item.type === 'credit' ? '-' : '+'}
|
||||
{formatMoney(item.amount, currency)}
|
||||
</IonNote>
|
||||
{onClick && (
|
||||
<IonIcon
|
||||
icon={chevronForwardOutline}
|
||||
style={{
|
||||
fontSize: '14px',
|
||||
marginLeft: '8px',
|
||||
color: 'var(--color-text-tertiary)',
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</IonItem>
|
||||
);
|
||||
};
|
||||
|
||||
export default ActivityRow;
|
||||
@@ -0,0 +1,115 @@
|
||||
import React from 'react';
|
||||
import { IonIcon, IonItem, IonLabel, IonNote } from '@ionic/react';
|
||||
import { chevronForwardOutline } from 'ionicons/icons';
|
||||
import { formatMoney } from '../utils/money';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
|
||||
interface CustomerRowProps {
|
||||
id: string;
|
||||
name: string;
|
||||
balance: number;
|
||||
phone?: string;
|
||||
onClick: () => void;
|
||||
}
|
||||
|
||||
const CustomerRow: React.FC<CustomerRowProps> = ({
|
||||
id,
|
||||
name,
|
||||
balance,
|
||||
phone,
|
||||
onClick,
|
||||
}) => {
|
||||
const { profile } = useAuth();
|
||||
const currency = profile?.currency || 'USD';
|
||||
|
||||
const getInitials = (name: string) => {
|
||||
return name
|
||||
.split(' ')
|
||||
.map((n) => n[0])
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
.slice(0, 2);
|
||||
};
|
||||
|
||||
return (
|
||||
<IonItem
|
||||
lines="none"
|
||||
onClick={onClick}
|
||||
detail={false}
|
||||
style={{
|
||||
'--background': 'transparent',
|
||||
'--padding-start': '0',
|
||||
'--padding-end': '0',
|
||||
'--inner-padding-end': '0',
|
||||
cursor: 'pointer',
|
||||
marginBottom: '8px',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="icon-container bold"
|
||||
slot="start"
|
||||
style={{
|
||||
marginRight: '16px',
|
||||
width: '44px',
|
||||
height: '44px',
|
||||
fontSize: '14px',
|
||||
color: 'var(--ion-color-primary)',
|
||||
}}
|
||||
>
|
||||
{getInitials(name)}
|
||||
</div>
|
||||
<IonLabel>
|
||||
<h3 className="semibold" style={{ margin: '0', fontSize: '16px' }}>
|
||||
{name}
|
||||
</h3>
|
||||
{phone && (
|
||||
<p className="secondary-text" style={{ margin: '2px 0 0 0' }}>
|
||||
{phone}
|
||||
</p>
|
||||
)}
|
||||
</IonLabel>
|
||||
<div
|
||||
slot="end"
|
||||
style={{ textAlign: 'right', display: 'flex', alignItems: 'center' }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'flex-end',
|
||||
}}
|
||||
>
|
||||
<IonNote
|
||||
className="tabular"
|
||||
style={{
|
||||
fontSize: '16px',
|
||||
color:
|
||||
balance > 0
|
||||
? 'var(--ion-color-danger)'
|
||||
: 'var(--ion-color-success)',
|
||||
fontWeight: '400',
|
||||
}}
|
||||
>
|
||||
{formatMoney(balance, currency)}
|
||||
</IonNote>
|
||||
<span
|
||||
className="tertiary-text"
|
||||
style={{ fontSize: '10px', marginTop: '2px' }}
|
||||
>
|
||||
{balance > 0 ? 'OUTSTANDING' : 'CLEARED'}
|
||||
</span>
|
||||
</div>
|
||||
<IonIcon
|
||||
icon={chevronForwardOutline}
|
||||
style={{
|
||||
fontSize: '16px',
|
||||
marginLeft: '12px',
|
||||
color: 'var(--color-text-tertiary)',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</IonItem>
|
||||
);
|
||||
};
|
||||
|
||||
export default CustomerRow;
|
||||
@@ -0,0 +1,79 @@
|
||||
import React from 'react';
|
||||
import { IonIcon, IonButton } from '@ionic/react';
|
||||
|
||||
interface EmptyStateProps {
|
||||
icon: string;
|
||||
title: string;
|
||||
description?: string;
|
||||
actionText?: string;
|
||||
onAction?: () => void;
|
||||
}
|
||||
|
||||
const EmptyState: React.FC<EmptyStateProps> = ({
|
||||
icon,
|
||||
title,
|
||||
description,
|
||||
actionText,
|
||||
onAction,
|
||||
}) => {
|
||||
return (
|
||||
<div
|
||||
className="widget-card"
|
||||
style={{
|
||||
padding: '40px 20px',
|
||||
alignItems: 'center',
|
||||
textAlign: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="icon-container"
|
||||
style={{
|
||||
width: '64px',
|
||||
height: '64px',
|
||||
borderRadius: '20px',
|
||||
marginBottom: '20px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
color: 'var(--color-text-tertiary)',
|
||||
}}
|
||||
>
|
||||
<IonIcon icon={icon} style={{ fontSize: '32px' }} />
|
||||
</div>
|
||||
<h3
|
||||
style={{
|
||||
margin: '0 0 8px 0',
|
||||
fontSize: '18px',
|
||||
fontWeight: '700',
|
||||
color: 'var(--color-text-primary)',
|
||||
}}
|
||||
>
|
||||
{title}
|
||||
</h3>
|
||||
{description && (
|
||||
<p
|
||||
className="secondary-text"
|
||||
style={{ margin: '0 0 24px 0', maxWidth: '240px' }}
|
||||
>
|
||||
{description}
|
||||
</p>
|
||||
)}
|
||||
{actionText && onAction && (
|
||||
<IonButton
|
||||
onClick={onAction}
|
||||
shape="round"
|
||||
fill="solid"
|
||||
style={{
|
||||
height: '44px',
|
||||
'--border-radius': '999px',
|
||||
fontSize: '14px',
|
||||
fontWeight: '700',
|
||||
}}
|
||||
>
|
||||
{actionText}
|
||||
</IonButton>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default EmptyState;
|
||||
@@ -0,0 +1,99 @@
|
||||
import React from 'react';
|
||||
import { IonIcon } from '@ionic/react';
|
||||
import { formatMoney } from '../utils/money';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
|
||||
interface MetricCardProps {
|
||||
label: string;
|
||||
value: number;
|
||||
icon?: string;
|
||||
subtitle?: string;
|
||||
fullWidth?: boolean;
|
||||
loading?: boolean;
|
||||
}
|
||||
|
||||
const MetricCard: React.FC<MetricCardProps> = ({
|
||||
label,
|
||||
value,
|
||||
icon,
|
||||
subtitle,
|
||||
fullWidth = false,
|
||||
loading = false,
|
||||
}) => {
|
||||
const { profile } = useAuth();
|
||||
const currency = profile?.currency || 'USD';
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div
|
||||
className="widget-card"
|
||||
style={{
|
||||
width: fullWidth ? '100%' : 'auto',
|
||||
minHeight: fullWidth ? '160px' : '100px',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="skeleton-text"
|
||||
style={{
|
||||
width: '40%',
|
||||
height: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
marginBottom: '12px',
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
className="skeleton-text"
|
||||
style={{
|
||||
width: '70%',
|
||||
height: '32px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '8px',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
className="widget-card"
|
||||
style={{
|
||||
width: fullWidth ? '100%' : 'auto',
|
||||
minHeight: fullWidth ? '160px' : '100px',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'flex-start',
|
||||
}}
|
||||
>
|
||||
<div>
|
||||
<span className="tertiary-text">{label}</span>
|
||||
<div
|
||||
className="tabular"
|
||||
style={{
|
||||
fontSize: fullWidth ? '34px' : '24px',
|
||||
fontWeight: '400',
|
||||
color: 'var(--color-text-primary)',
|
||||
marginTop: '4px',
|
||||
}}
|
||||
>
|
||||
{formatMoney(value, currency)}
|
||||
</div>
|
||||
{subtitle && <div className="secondary-text">{subtitle}</div>}
|
||||
</div>
|
||||
{icon && (
|
||||
<div className="icon-container">
|
||||
<IonIcon icon={icon} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default MetricCard;
|
||||
@@ -0,0 +1,88 @@
|
||||
import React from 'react';
|
||||
import { IonInput, IonLabel } from '@ionic/react';
|
||||
import { sanitizeMoneyInput, getCurrencySymbol } from '../utils/money';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
|
||||
interface MoneyInputProps {
|
||||
value: string;
|
||||
onValueChange: (value: string) => void;
|
||||
label?: string;
|
||||
placeholder?: string;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
const MoneyInput: React.FC<MoneyInputProps> = ({
|
||||
value,
|
||||
onValueChange,
|
||||
label,
|
||||
placeholder = '0.00',
|
||||
error,
|
||||
}) => {
|
||||
const { profile } = useAuth();
|
||||
const symbol = getCurrencySymbol(profile?.currency || 'USD');
|
||||
|
||||
const handleChange = (e: CustomEvent) => {
|
||||
const rawValue = e.detail.value || '';
|
||||
const sanitized = sanitizeMoneyInput(rawValue);
|
||||
onValueChange(sanitized);
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="money-input-container">
|
||||
{label && (
|
||||
<IonLabel
|
||||
position="stacked"
|
||||
className="semibold"
|
||||
style={{ marginBottom: '8px', display: 'block', fontSize: '13px' }}
|
||||
>
|
||||
{label}
|
||||
</IonLabel>
|
||||
)}
|
||||
<div
|
||||
className="input-wrapper"
|
||||
style={{
|
||||
border: error ? '1px solid var(--ion-color-danger)' : 'none',
|
||||
}}
|
||||
>
|
||||
<span
|
||||
className="bold"
|
||||
style={{
|
||||
marginRight: '8px',
|
||||
color: 'var(--color-text-primary)',
|
||||
fontSize: '18px',
|
||||
}}
|
||||
>
|
||||
{symbol}
|
||||
</span>
|
||||
<IonInput
|
||||
type="text"
|
||||
inputMode="decimal"
|
||||
value={value}
|
||||
placeholder={placeholder}
|
||||
onIonChange={handleChange}
|
||||
style={{
|
||||
fontSize: '20px',
|
||||
fontWeight: '700',
|
||||
'--padding-top': '0',
|
||||
'--padding-bottom': '0',
|
||||
}}
|
||||
className="tabular"
|
||||
/>
|
||||
</div>
|
||||
{error && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{
|
||||
fontSize: '12px',
|
||||
marginTop: '4px',
|
||||
display: 'block',
|
||||
}}
|
||||
>
|
||||
{error}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default MoneyInput;
|
||||
@@ -0,0 +1,27 @@
|
||||
import React from 'react';
|
||||
import { Route, Redirect, RouteProps } from 'react-router-dom';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
|
||||
interface ProtectedRouteProps extends RouteProps {
|
||||
component: React.ComponentType<any>;
|
||||
}
|
||||
|
||||
const ProtectedRoute: React.FC<ProtectedRouteProps> = ({
|
||||
component: Component,
|
||||
...rest
|
||||
}) => {
|
||||
const { user, loading } = useAuth();
|
||||
|
||||
return (
|
||||
<Route
|
||||
{...rest}
|
||||
render={(props) => {
|
||||
if (loading) return null; // AuthProvider already handles spinner, but double safety
|
||||
|
||||
return user ? <Component {...props} /> : <Redirect to="/auth" />;
|
||||
}}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default ProtectedRoute;
|
||||
@@ -0,0 +1,169 @@
|
||||
import React, {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useEffect,
|
||||
useState,
|
||||
} from 'react';
|
||||
import { User } from '@supabase/supabase-js';
|
||||
import { supabase } from '../supabase';
|
||||
import { Database } from '../database.types';
|
||||
import { IonSpinner } from '@ionic/react';
|
||||
|
||||
type Profile = Database['public']['Tables']['profiles']['Row'];
|
||||
|
||||
interface AuthContextType {
|
||||
user: User | null;
|
||||
profile: Profile | null;
|
||||
loading: boolean;
|
||||
refreshProfile: () => Promise<void>;
|
||||
}
|
||||
|
||||
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||
|
||||
export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
|
||||
children,
|
||||
}) => {
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
const [profile, setProfile] = useState<Profile | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
const fetchProfile = useCallback(async (currentUser: User) => {
|
||||
try {
|
||||
const fallbackProfile = {
|
||||
id: currentUser.id,
|
||||
full_name:
|
||||
typeof currentUser.user_metadata?.full_name === 'string'
|
||||
? currentUser.user_metadata.full_name
|
||||
: '',
|
||||
shop_name: 'My Shop',
|
||||
currency: 'USD',
|
||||
};
|
||||
|
||||
const { data, error } = await supabase
|
||||
.from('profiles')
|
||||
.upsert(fallbackProfile, { onConflict: 'id', ignoreDuplicates: true })
|
||||
.select('*')
|
||||
.single();
|
||||
|
||||
if (error) {
|
||||
console.error('Error fetching profile:', error);
|
||||
setProfile({
|
||||
...fallbackProfile,
|
||||
created_at: new Date().toISOString(),
|
||||
updated_at: new Date().toISOString(),
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
setProfile(data);
|
||||
} catch (err) {
|
||||
console.error('Error fetching profile:', err);
|
||||
setProfile(null);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const refreshProfile = async () => {
|
||||
if (user) {
|
||||
await fetchProfile(user);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
let mounted = true;
|
||||
|
||||
const initialiseSession = async () => {
|
||||
const timeout = window.setTimeout(() => {
|
||||
if (mounted) {
|
||||
console.warn('Auth initialisation timed out; showing app shell.');
|
||||
setLoading(false);
|
||||
}
|
||||
}, 8000);
|
||||
|
||||
try {
|
||||
const {
|
||||
data: { session },
|
||||
error,
|
||||
} = await supabase.auth.getSession();
|
||||
|
||||
if (!mounted) return;
|
||||
|
||||
if (error) {
|
||||
console.error('Error restoring auth session:', error);
|
||||
}
|
||||
|
||||
const currentUser = session?.user ?? null;
|
||||
setUser(currentUser);
|
||||
|
||||
if (currentUser) {
|
||||
await fetchProfile(currentUser);
|
||||
} else {
|
||||
setProfile(null);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error restoring auth session:', err);
|
||||
if (mounted) {
|
||||
setUser(null);
|
||||
setProfile(null);
|
||||
}
|
||||
} finally {
|
||||
window.clearTimeout(timeout);
|
||||
if (mounted) {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
void initialiseSession();
|
||||
|
||||
const {
|
||||
data: { subscription },
|
||||
} = supabase.auth.onAuthStateChange((_event, session) => {
|
||||
const currentUser = session?.user ?? null;
|
||||
setUser(currentUser);
|
||||
|
||||
if (currentUser) {
|
||||
void fetchProfile(currentUser);
|
||||
} else {
|
||||
setProfile(null);
|
||||
}
|
||||
|
||||
setLoading(false);
|
||||
});
|
||||
|
||||
return () => {
|
||||
mounted = false;
|
||||
subscription.unsubscribe();
|
||||
};
|
||||
}, [fetchProfile]);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
height: '100vh',
|
||||
background: 'var(--color-bg, #f0f4ff)',
|
||||
}}
|
||||
>
|
||||
<IonSpinner name="crescent" color="primary" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{ user, profile, loading, refreshProfile }}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
);
|
||||
};
|
||||
|
||||
export const useAuth = () => {
|
||||
const context = useContext(AuthContext);
|
||||
if (context === undefined) {
|
||||
throw new Error('useAuth must be used within an AuthProvider');
|
||||
}
|
||||
return context;
|
||||
};
|
||||
@@ -0,0 +1,323 @@
|
||||
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: {
|
||||
credit_customers: {
|
||||
Row: {
|
||||
created_at: string
|
||||
id: string
|
||||
name: string
|
||||
notes: string | null
|
||||
phone: string | null
|
||||
updated_at: string
|
||||
user_id: string
|
||||
}
|
||||
Insert: {
|
||||
created_at?: string
|
||||
id?: string
|
||||
name: string
|
||||
notes?: string | null
|
||||
phone?: string | null
|
||||
updated_at?: string
|
||||
user_id: string
|
||||
}
|
||||
Update: {
|
||||
created_at?: string
|
||||
id?: string
|
||||
name?: string
|
||||
notes?: string | null
|
||||
phone?: string | null
|
||||
updated_at?: string
|
||||
user_id?: string
|
||||
}
|
||||
Relationships: []
|
||||
}
|
||||
credits: {
|
||||
Row: {
|
||||
amount: number
|
||||
created_at: string
|
||||
credit_date: string
|
||||
customer_id: string
|
||||
description: string | null
|
||||
id: string
|
||||
updated_at: string
|
||||
user_id: string
|
||||
}
|
||||
Insert: {
|
||||
amount: number
|
||||
created_at?: string
|
||||
credit_date?: string
|
||||
customer_id: string
|
||||
description?: string | null
|
||||
id?: string
|
||||
updated_at?: string
|
||||
user_id: string
|
||||
}
|
||||
Update: {
|
||||
amount?: number
|
||||
created_at?: string
|
||||
credit_date?: string
|
||||
customer_id?: string
|
||||
description?: string | null
|
||||
id?: string
|
||||
updated_at?: string
|
||||
user_id?: string
|
||||
}
|
||||
Relationships: [
|
||||
{
|
||||
foreignKeyName: "credits_customer_id_fkey"
|
||||
columns: ["customer_id"]
|
||||
isOneToOne: false
|
||||
referencedRelation: "credit_customers"
|
||||
referencedColumns: ["id"]
|
||||
},
|
||||
]
|
||||
}
|
||||
profiles: {
|
||||
Row: {
|
||||
created_at: string
|
||||
currency: string
|
||||
full_name: string | null
|
||||
id: string
|
||||
shop_name: string | null
|
||||
updated_at: string
|
||||
}
|
||||
Insert: {
|
||||
created_at?: string
|
||||
currency?: string
|
||||
full_name?: string | null
|
||||
id: string
|
||||
shop_name?: string | null
|
||||
updated_at?: string
|
||||
}
|
||||
Update: {
|
||||
created_at?: string
|
||||
currency?: string
|
||||
full_name?: string | null
|
||||
id?: string
|
||||
shop_name?: string | null
|
||||
updated_at?: string
|
||||
}
|
||||
Relationships: []
|
||||
}
|
||||
repayments: {
|
||||
Row: {
|
||||
amount: number
|
||||
created_at: string
|
||||
customer_id: string
|
||||
id: string
|
||||
note: string | null
|
||||
repayment_date: string
|
||||
updated_at: string
|
||||
user_id: string
|
||||
}
|
||||
Insert: {
|
||||
amount: number
|
||||
created_at?: string
|
||||
customer_id: string
|
||||
id?: string
|
||||
note?: string | null
|
||||
repayment_date?: string
|
||||
updated_at?: string
|
||||
user_id: string
|
||||
}
|
||||
Update: {
|
||||
amount?: number
|
||||
created_at?: string
|
||||
customer_id?: string
|
||||
id?: string
|
||||
note?: string | null
|
||||
repayment_date?: string
|
||||
updated_at?: string
|
||||
user_id?: string
|
||||
}
|
||||
Relationships: [
|
||||
{
|
||||
foreignKeyName: "repayments_customer_id_fkey"
|
||||
columns: ["customer_id"]
|
||||
isOneToOne: false
|
||||
referencedRelation: "credit_customers"
|
||||
referencedColumns: ["id"]
|
||||
},
|
||||
]
|
||||
}
|
||||
sales: {
|
||||
Row: {
|
||||
amount: number
|
||||
created_at: string
|
||||
id: string
|
||||
note: string | null
|
||||
sale_date: string
|
||||
updated_at: string
|
||||
user_id: string
|
||||
}
|
||||
Insert: {
|
||||
amount: number
|
||||
created_at?: string
|
||||
id?: string
|
||||
note?: string | null
|
||||
sale_date?: string
|
||||
updated_at?: string
|
||||
user_id: string
|
||||
}
|
||||
Update: {
|
||||
amount?: number
|
||||
created_at?: string
|
||||
id?: string
|
||||
note?: string | null
|
||||
sale_date?: string
|
||||
updated_at?: string
|
||||
user_id?: 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
|
||||
+10
-5
@@ -5,7 +5,7 @@ import { Capacitor } from '@capacitor/core';
|
||||
import App from './App';
|
||||
|
||||
// ── Ionic initialisation ──────────────────────────────────────────────────────
|
||||
// ?mode=md|ios overrides (used by AppSuite preview); otherwise follow the platform.
|
||||
// ?mode=md|ios overrides (used by Appcakes preview); otherwise follow the platform.
|
||||
const _urlMode = new URLSearchParams(window.location.search).get('mode');
|
||||
const _platform = Capacitor.getPlatform(); // 'ios' | 'android' | 'web'
|
||||
setupIonicReact({
|
||||
@@ -13,7 +13,7 @@ setupIonicReact({
|
||||
});
|
||||
|
||||
// Derive the studio parent origin dynamically so this works in both dev
|
||||
// (parent at localhost:3000) and production (parent at appcakes.qqura.com).
|
||||
// (parent at localhost:3000) and production (parent at studio.appcakes.dev).
|
||||
const studioOrigin = (() => {
|
||||
try {
|
||||
if (document.referrer) return new URL(document.referrer).origin;
|
||||
@@ -49,7 +49,7 @@ if (import.meta.hot) {
|
||||
}
|
||||
|
||||
// ── Session bridge ────────────────────────────────────────────────────────────
|
||||
// Post auth session to the AppSuite parent frame so the AI can test auth-protected
|
||||
// Post auth session to the Appcakes parent frame so the AI can test auth-protected
|
||||
// Edge Functions. Uses import.meta.glob so Vite never errors if supabase.ts is absent.
|
||||
(async () => {
|
||||
const mods = import.meta.glob('./supabase.ts', { eager: false });
|
||||
@@ -73,12 +73,17 @@ if (import.meta.hot) {
|
||||
})();
|
||||
|
||||
// ── Runtime error reporting ───────────────────────────────────────────────────
|
||||
// Forward uncaught errors to the AppSuite dev server so the AI can read them.
|
||||
// Forward uncaught errors to the Appcakes dev server so the AI can read them.
|
||||
// Extract projectId from the preview URL (/preview/{projectId}/) so errors are
|
||||
// scoped per-project on the server rather than mixed into a global queue.
|
||||
const _previewMatch = window.location.pathname.match(/\/preview\/([^/]+)/);
|
||||
const _projectId = _previewMatch?.[1] ?? null;
|
||||
|
||||
function reportError(message: string, stack?: string) {
|
||||
fetch(`${studioOrigin}/api/agent/runtime-error`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ message, stack }),
|
||||
body: JSON.stringify({ message, stack, projectId: _projectId }),
|
||||
}).catch(() => {});
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,233 @@
|
||||
import React, { useState } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonInput,
|
||||
IonButton,
|
||||
IonSpinner,
|
||||
IonIcon,
|
||||
IonText,
|
||||
} from '@ionic/react';
|
||||
import { storefrontOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
|
||||
const AuthPage: React.FC = () => {
|
||||
const [mode, setMode] = useState<'signin' | 'signup'>('signin');
|
||||
const [name, setName] = useState('');
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [messageType, setMessageType] = useState<'error' | 'success'>('error');
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
const showMessage = (msg: string, type: 'error' | 'success' = 'error') => {
|
||||
setMessage(msg);
|
||||
setMessageType(type);
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
};
|
||||
|
||||
const handleAuth = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!email || !password || (mode === 'signup' && !name)) {
|
||||
showMessage('Please fill in all fields');
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
if (mode === 'signup') {
|
||||
const { data, error } = await supabase.auth.signUp({
|
||||
email,
|
||||
password,
|
||||
options: {
|
||||
data: {
|
||||
full_name: name,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
if (data.session) {
|
||||
history.push('/home');
|
||||
} else {
|
||||
history.push('/verify-email', { email });
|
||||
}
|
||||
} else {
|
||||
const { data, error } = await supabase.auth.signInWithPassword({
|
||||
email,
|
||||
password,
|
||||
});
|
||||
|
||||
if (error) {
|
||||
if (error.message.toLowerCase().includes('email not confirmed')) {
|
||||
await supabase.auth.resend({ type: 'signup', email });
|
||||
history.push('/verify-email', { email, resent: true });
|
||||
return;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
if (data.session) {
|
||||
history.push('/home');
|
||||
}
|
||||
}
|
||||
} catch (err: any) {
|
||||
showMessage(err.message || 'An authentication error occurred');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.52) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<div className="auth-shell">
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '12px',
|
||||
marginTop: '20px',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="icon-container"
|
||||
style={{ width: '44px', height: '44px' }}
|
||||
>
|
||||
<IonIcon icon={storefrontOutline} style={{ fontSize: '22px' }} />
|
||||
</div>
|
||||
<div>
|
||||
<h1 className="bold" style={{ margin: '0', fontSize: '22px' }}>
|
||||
ShopKeep
|
||||
</h1>
|
||||
<p className="secondary-text" style={{ margin: '0' }}>
|
||||
Simple bookkeeping for you
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="auth-card">
|
||||
<div className="pill-toggle">
|
||||
<button
|
||||
className={`pill-toggle-btn ${mode === 'signin' ? 'active' : ''}`}
|
||||
onClick={() => setMode('signin')}
|
||||
>
|
||||
Sign in
|
||||
</button>
|
||||
<button
|
||||
className={`pill-toggle-btn ${mode === 'signup' ? 'active' : ''}`}
|
||||
onClick={() => setMode('signup')}
|
||||
>
|
||||
Create account
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form
|
||||
onSubmit={handleAuth}
|
||||
style={{ display: 'flex', flexDirection: 'column', gap: '16px' }}
|
||||
>
|
||||
{mode === 'signup' && (
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="Full Name"
|
||||
labelPlacement="floating"
|
||||
placeholder="Enter your name"
|
||||
value={name}
|
||||
onIonChange={(e) => setName(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="Email"
|
||||
labelPlacement="floating"
|
||||
type="email"
|
||||
placeholder="name@example.com"
|
||||
value={email}
|
||||
onIonChange={(e) => setEmail(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="Password"
|
||||
labelPlacement="floating"
|
||||
type="password"
|
||||
placeholder="Min. 6 characters"
|
||||
value={password}
|
||||
onIonChange={(e) => setPassword(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background:
|
||||
messageType === 'error'
|
||||
? 'var(--color-danger-soft)'
|
||||
: 'var(--color-success-soft)',
|
||||
color:
|
||||
messageType === 'error'
|
||||
? 'var(--ion-color-danger-shade)'
|
||||
: 'var(--ion-color-success-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
type="submit"
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '8px',
|
||||
}}
|
||||
disabled={submitting}
|
||||
>
|
||||
{submitting ? (
|
||||
<IonSpinner name="crescent" />
|
||||
) : mode === 'signin' ? (
|
||||
'Sign in'
|
||||
) : (
|
||||
'Create account'
|
||||
)}
|
||||
</IonButton>
|
||||
</form>
|
||||
|
||||
<div style={{ textAlign: 'center', marginTop: '8px' }}>
|
||||
<IonText
|
||||
color="primary"
|
||||
className="semibold"
|
||||
style={{ fontSize: '13px', cursor: 'pointer' }}
|
||||
onClick={() => history.push('/forgot-password')}
|
||||
>
|
||||
Forgot password?
|
||||
</IonText>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default AuthPage;
|
||||
@@ -0,0 +1,359 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
IonTitle,
|
||||
IonButtons,
|
||||
IonButton,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonTextarea,
|
||||
IonSpinner,
|
||||
IonLabel,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory, useLocation } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { getTodayISO } from '../utils/dates';
|
||||
import MoneyInput from '../components/MoneyInput';
|
||||
import { parseMoney } from '../utils/money';
|
||||
|
||||
interface Customer {
|
||||
id: string;
|
||||
name: string;
|
||||
}
|
||||
|
||||
const CreditFormPage: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const location = useLocation<{ customerId?: string }>();
|
||||
const { user } = useAuth();
|
||||
|
||||
const [mode, setMode] = useState<'existing' | 'new'>('existing');
|
||||
const [customers, setCustomers] = useState<Customer[]>([]);
|
||||
const [selectedCustomerId, setSelectedCustomerId] = useState<string>(
|
||||
location.state?.customerId || ''
|
||||
);
|
||||
const [newName, setNewName] = useState('');
|
||||
const [phone, setPhone] = useState('');
|
||||
const [amount, setAmount] = useState('');
|
||||
const [creditDate, setCreditDate] = useState(getTodayISO());
|
||||
const [description, setDescription] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [loadingCustomers, setLoadingCustomers] = useState(true);
|
||||
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchCustomers = async () => {
|
||||
if (!user) return;
|
||||
try {
|
||||
const { data, error } = await supabase
|
||||
.from('credit_customers')
|
||||
.select('id, name')
|
||||
.eq('user_id', user.id)
|
||||
.order('name');
|
||||
|
||||
if (error) throw error;
|
||||
setCustomers(data || []);
|
||||
if (!data || data.length === 0) {
|
||||
setMode('new');
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error fetching customers:', err);
|
||||
} finally {
|
||||
setLoadingCustomers(false);
|
||||
}
|
||||
};
|
||||
|
||||
fetchCustomers();
|
||||
}, [user]);
|
||||
|
||||
const validate = () => {
|
||||
const newErrors: Record<string, string> = {};
|
||||
const parsedAmount = parseMoney(amount);
|
||||
|
||||
if (mode === 'existing' && !selectedCustomerId) {
|
||||
newErrors.customer = 'Please select a customer';
|
||||
}
|
||||
if (mode === 'new' && !newName.trim()) {
|
||||
newErrors.name = 'Customer name is required';
|
||||
}
|
||||
if (parsedAmount <= 0) {
|
||||
newErrors.amount = 'Amount must be greater than 0';
|
||||
}
|
||||
if (!creditDate) {
|
||||
newErrors.date = 'Date is required';
|
||||
}
|
||||
|
||||
setErrors(newErrors);
|
||||
return Object.keys(newErrors).length === 0;
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!validate() || !user) return;
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
let customerId = selectedCustomerId;
|
||||
|
||||
if (mode === 'new') {
|
||||
const { data: newCustomer, error: customerError } = await supabase
|
||||
.from('credit_customers')
|
||||
.insert([
|
||||
{
|
||||
user_id: user.id,
|
||||
name: newName.trim(),
|
||||
phone: phone.trim() || null,
|
||||
},
|
||||
])
|
||||
.select()
|
||||
.single();
|
||||
|
||||
if (customerError) throw customerError;
|
||||
customerId = newCustomer.id;
|
||||
}
|
||||
|
||||
const { error: creditError } = await supabase.from('credits').insert([
|
||||
{
|
||||
user_id: user.id,
|
||||
customer_id: customerId,
|
||||
amount: parseMoney(amount),
|
||||
credit_date: creditDate,
|
||||
description: description.trim() || null,
|
||||
},
|
||||
]);
|
||||
|
||||
if (creditError) throw creditError;
|
||||
|
||||
history.goBack();
|
||||
} catch (err: any) {
|
||||
console.error('Error saving credit:', err);
|
||||
setMessage(err.message || 'Could not save credit');
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar style={{ '--background': '#f0f4ff' }}>
|
||||
<IonButtons slot="start">
|
||||
<IonButton color="dark" onClick={() => history.goBack()}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle className="bold">Add credit</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent className="ion-padding" style={{ '--background': '#f0f4ff' }}>
|
||||
<div className="form-card">
|
||||
<div className="pill-toggle" style={{ marginBottom: '8px' }}>
|
||||
<button
|
||||
className={`pill-toggle-btn ${mode === 'existing' ? 'active' : ''}`}
|
||||
onClick={() => setMode('existing')}
|
||||
disabled={customers.length === 0}
|
||||
>
|
||||
Existing Customer
|
||||
</button>
|
||||
<button
|
||||
className={`pill-toggle-btn ${mode === 'new' ? 'active' : ''}`}
|
||||
onClick={() => setMode('new')}
|
||||
>
|
||||
New Customer
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{mode === 'existing' ? (
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Select Customer
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonSelect
|
||||
interface="action-sheet"
|
||||
placeholder="Choose a customer"
|
||||
value={selectedCustomerId}
|
||||
onIonChange={(e) => setSelectedCustomerId(e.detail.value)}
|
||||
style={{ width: '100%' }}
|
||||
>
|
||||
{customers.map((c) => (
|
||||
<IonSelectOption key={c.id} value={c.id}>
|
||||
{c.name}
|
||||
</IonSelectOption>
|
||||
))}
|
||||
</IonSelect>
|
||||
</div>
|
||||
{errors.customer && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.customer}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Customer Name
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
placeholder="e.g. John Doe"
|
||||
value={newName}
|
||||
onIonChange={(e) => setNewName(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
{errors.name && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.name}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Phone (optional)
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
type="tel"
|
||||
placeholder="e.g. +1 234 567 890"
|
||||
value={phone}
|
||||
onIonChange={(e) => setPhone(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
<MoneyInput
|
||||
label="Credit amount"
|
||||
value={amount}
|
||||
onValueChange={(val) => {
|
||||
setAmount(val);
|
||||
if (errors.amount) setErrors({ ...errors, amount: '' });
|
||||
}}
|
||||
error={errors.amount}
|
||||
/>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Credit date
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
type="date"
|
||||
value={creditDate}
|
||||
onIonChange={(e) => setCreditDate(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
{errors.date && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.date}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Description (optional)
|
||||
</IonLabel>
|
||||
<div
|
||||
className="input-wrapper"
|
||||
style={{ minHeight: '96px', padding: '8px 16px' }}
|
||||
>
|
||||
<IonTextarea
|
||||
placeholder="e.g. 2 bags of rice, sugar"
|
||||
value={description}
|
||||
onIonChange={(e) => setDescription(e.detail.value!)}
|
||||
rows={4}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background: 'var(--color-danger-soft)',
|
||||
color: 'var(--ion-color-danger-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '16px',
|
||||
}}
|
||||
disabled={submitting || (loadingCustomers && mode === 'existing')}
|
||||
onClick={handleSave}
|
||||
>
|
||||
{submitting ? <IonSpinner name="crescent" /> : 'Save credit'}
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default CreditFormPage;
|
||||
@@ -0,0 +1,361 @@
|
||||
import React, { useState, useCallback, useMemo } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
IonTitle,
|
||||
IonButtons,
|
||||
IonButton,
|
||||
IonIcon,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
IonAlert,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import {
|
||||
chevronBackOutline,
|
||||
trashOutline,
|
||||
receiptOutline,
|
||||
personAddOutline,
|
||||
cashOutline,
|
||||
} from 'ionicons/icons';
|
||||
import { useHistory, useParams } from 'react-router-dom';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { supabase } from '../supabase';
|
||||
import ActivityRow, { ActivityItem } from '../components/ActivityRow';
|
||||
import EmptyState from '../components/EmptyState';
|
||||
import { formatMoney } from '../utils/money';
|
||||
|
||||
const CustomerDetailPage: React.FC = () => {
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const { user, profile } = useAuth();
|
||||
const history = useHistory();
|
||||
const currency = profile?.currency || 'USD';
|
||||
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [customer, setCustomer] = useState<any>(null);
|
||||
const [activity, setActivity] = useState<ActivityItem[]>([]);
|
||||
const [balance, setBalance] = useState(0);
|
||||
const [showDeleteAlert, setShowDeleteAlert] = useState(false);
|
||||
|
||||
const fetchData = useCallback(async () => {
|
||||
if (!user || !id) return;
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const [
|
||||
{ data: customerData },
|
||||
{ data: creditsData },
|
||||
{ data: repaymentsData },
|
||||
] = await Promise.all([
|
||||
supabase.from('credit_customers').select('*').eq('id', id).single(),
|
||||
supabase
|
||||
.from('credits')
|
||||
.select('*')
|
||||
.eq('customer_id', id)
|
||||
.order('credit_date', { ascending: false }),
|
||||
supabase
|
||||
.from('repayments')
|
||||
.select('*')
|
||||
.eq('customer_id', id)
|
||||
.order('repayment_date', { ascending: false }),
|
||||
]);
|
||||
|
||||
if (customerData) {
|
||||
setCustomer(customerData);
|
||||
|
||||
const totalCredits = (creditsData || []).reduce(
|
||||
(sum, c) => sum + Number(c.amount),
|
||||
0
|
||||
);
|
||||
const totalRepayments = (repaymentsData || []).reduce(
|
||||
(sum, r) => sum + Number(r.amount),
|
||||
0
|
||||
);
|
||||
setBalance(Math.max(0, totalCredits - totalRepayments));
|
||||
|
||||
const combinedActivity: ActivityItem[] = [
|
||||
...(creditsData || []).map((c) => ({
|
||||
id: c.id,
|
||||
type: 'credit' as const,
|
||||
amount: Number(c.amount),
|
||||
date: c.credit_date,
|
||||
note: c.description,
|
||||
})),
|
||||
...(repaymentsData || []).map((r) => ({
|
||||
id: r.id,
|
||||
type: 'repayment' as const,
|
||||
amount: Number(r.amount),
|
||||
date: r.repayment_date,
|
||||
note: r.note,
|
||||
})),
|
||||
].sort((a, b) => b.date.localeCompare(a.date));
|
||||
|
||||
setActivity(combinedActivity);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error fetching customer detail:', err);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [user, id]);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
fetchData();
|
||||
}, [fetchData]);
|
||||
|
||||
const handleRefresh = async (e: CustomEvent) => {
|
||||
await fetchData();
|
||||
e.detail.complete();
|
||||
};
|
||||
|
||||
const handleDelete = async () => {
|
||||
try {
|
||||
const { error } = await supabase
|
||||
.from('credit_customers')
|
||||
.delete()
|
||||
.eq('id', id);
|
||||
if (error) throw error;
|
||||
history.push('/customers');
|
||||
} catch (err) {
|
||||
console.error('Error deleting customer:', err);
|
||||
}
|
||||
};
|
||||
|
||||
const getInitials = (name: string) => {
|
||||
return name
|
||||
.split(' ')
|
||||
.map((n) => n[0])
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
.slice(0, 2);
|
||||
};
|
||||
|
||||
if (!loading && !customer) {
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
className="ion-padding"
|
||||
style={{ '--background': '#f0f4ff' }}
|
||||
>
|
||||
<EmptyState
|
||||
icon="alert-circle-outline"
|
||||
title="Customer not found"
|
||||
actionText="Go Back"
|
||||
onAction={() => history.push('/customers')}
|
||||
/>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar style={{ '--background': '#f0f4ff' }}>
|
||||
<IonButtons slot="start">
|
||||
<IonButton color="dark" onClick={() => history.push('/customers')}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle className="bold">Customer</IonTitle>
|
||||
<IonButtons slot="end">
|
||||
<IonButton color="danger" onClick={() => setShowDeleteAlert(true)}>
|
||||
<IonIcon icon={trashOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent fullscreen style={{ '--background': '#f0f4ff' }}>
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
|
||||
<div className="page-padding" style={{ paddingTop: '16px' }}>
|
||||
<div className="widget-card" style={{ padding: '24px 20px' }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
marginBottom: '20px',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
className="icon-container bold"
|
||||
style={{
|
||||
width: '56px',
|
||||
height: '56px',
|
||||
fontSize: '18px',
|
||||
marginRight: '16px',
|
||||
borderRadius: '16px',
|
||||
}}
|
||||
>
|
||||
{customer ? getInitials(customer.name) : ''}
|
||||
</div>
|
||||
<div>
|
||||
<h2 className="bold" style={{ margin: '0', fontSize: '20px' }}>
|
||||
{customer?.name}
|
||||
</h2>
|
||||
{customer?.phone && (
|
||||
<p className="secondary-text" style={{ margin: '2px 0 0 0' }}>
|
||||
{customer.phone}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style={{ marginBottom: '24px' }}>
|
||||
<span className="tertiary-text">OUTSTANDING BALANCE</span>
|
||||
<div
|
||||
className="tabular"
|
||||
style={{
|
||||
fontSize: '34px',
|
||||
fontWeight: '400',
|
||||
color:
|
||||
balance > 0
|
||||
? 'var(--ion-color-danger)'
|
||||
: 'var(--ion-color-success)',
|
||||
marginTop: '4px',
|
||||
}}
|
||||
>
|
||||
{formatMoney(balance, currency)}
|
||||
</div>
|
||||
<div
|
||||
style={{
|
||||
display: 'inline-block',
|
||||
padding: '4px 12px',
|
||||
borderRadius: '999px',
|
||||
fontSize: '12px',
|
||||
fontWeight: '600',
|
||||
marginTop: '8px',
|
||||
background:
|
||||
balance > 0
|
||||
? 'var(--color-danger-soft)'
|
||||
: 'var(--color-success-soft)',
|
||||
color:
|
||||
balance > 0
|
||||
? 'var(--ion-color-danger)'
|
||||
: 'var(--ion-color-success)',
|
||||
}}
|
||||
>
|
||||
{balance > 0 ? 'OWING' : 'CLEARED'}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style={{ display: 'flex', gap: '12px' }}>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="bold"
|
||||
style={{
|
||||
flex: 1,
|
||||
fontSize: '14px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
color: 'var(--color-text-primary)',
|
||||
'--border-radius': 'var(--radius-inner)',
|
||||
height: '44px',
|
||||
}}
|
||||
onClick={() => history.push('/credit/new', { customerId: id })}
|
||||
>
|
||||
<IonIcon icon={personAddOutline} slot="start" />
|
||||
Credit
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="solid"
|
||||
className="bold"
|
||||
style={{
|
||||
flex: 1,
|
||||
fontSize: '14px',
|
||||
'--border-radius': 'var(--radius-inner)',
|
||||
height: '44px',
|
||||
}}
|
||||
onClick={() =>
|
||||
history.push('/repayment/new', { customerId: id })
|
||||
}
|
||||
disabled={balance === 0}
|
||||
>
|
||||
<IonIcon icon={cashOutline} slot="start" />
|
||||
Repay
|
||||
</IonButton>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="section-header">
|
||||
<h2>Activity</h2>
|
||||
</div>
|
||||
|
||||
<div className="page-padding" style={{ paddingBottom: '40px' }}>
|
||||
{loading ? (
|
||||
<div className="widget-card" style={{ gap: '16px' }}>
|
||||
{[1, 2, 3].map((i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{ display: 'flex', gap: '12px', alignItems: 'center' }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: '40px',
|
||||
height: '40px',
|
||||
borderRadius: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
}}
|
||||
/>
|
||||
<div style={{ flex: 1 }}>
|
||||
<div
|
||||
style={{
|
||||
width: '60%',
|
||||
height: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
style={{
|
||||
width: '40%',
|
||||
height: '10px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : activity.length > 0 ? (
|
||||
<div className="widget-card" style={{ padding: '8px 16px' }}>
|
||||
{activity.map((item) => (
|
||||
<ActivityRow
|
||||
key={`${item.type}-${item.id}`}
|
||||
item={item}
|
||||
showDate
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<EmptyState
|
||||
icon={receiptOutline}
|
||||
title="No activity yet"
|
||||
description="Record the first credit or repayment for this customer."
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<IonAlert
|
||||
isOpen={showDeleteAlert}
|
||||
onDidDismiss={() => setShowDeleteAlert(false)}
|
||||
header="Delete Customer"
|
||||
message="Are you sure you want to delete this customer? All their credit and repayment history will be lost."
|
||||
buttons={[
|
||||
{ text: 'Cancel', role: 'cancel' },
|
||||
{ text: 'Delete', role: 'destructive', handler: handleDelete },
|
||||
]}
|
||||
/>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default CustomerDetailPage;
|
||||
@@ -0,0 +1,268 @@
|
||||
import React, { useState, useCallback, useMemo } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonIcon,
|
||||
IonSegmentButton,
|
||||
IonSearchbar,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { personAddOutline, peopleOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { supabase } from '../supabase';
|
||||
import MetricCard from '../components/MetricCard';
|
||||
import CustomerRow from '../components/CustomerRow';
|
||||
import EmptyState from '../components/EmptyState';
|
||||
|
||||
interface CustomerWithBalance {
|
||||
id: string;
|
||||
name: string;
|
||||
phone: string | null;
|
||||
balance: number;
|
||||
}
|
||||
|
||||
const CustomersPage: React.FC = () => {
|
||||
const { user } = useAuth();
|
||||
const history = useHistory();
|
||||
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [customers, setCustomers] = useState<CustomerWithBalance[]>([]);
|
||||
const [searchQuery, setSearchQuery] = useState('');
|
||||
|
||||
const fetchData = useCallback(async () => {
|
||||
if (!user) return;
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const [
|
||||
{ data: customersData },
|
||||
{ data: creditsData },
|
||||
{ data: repaymentsData },
|
||||
] = await Promise.all([
|
||||
supabase
|
||||
.from('credit_customers')
|
||||
.select('*')
|
||||
.eq('user_id', user.id)
|
||||
.order('name'),
|
||||
supabase
|
||||
.from('credits')
|
||||
.select('customer_id, amount')
|
||||
.eq('user_id', user.id),
|
||||
supabase
|
||||
.from('repayments')
|
||||
.select('customer_id, amount')
|
||||
.eq('user_id', user.id),
|
||||
]);
|
||||
|
||||
const customerBalances: CustomerWithBalance[] = (customersData || []).map(
|
||||
(c) => {
|
||||
const totalCredits = (creditsData || [])
|
||||
.filter((cr) => cr.customer_id === c.id)
|
||||
.reduce((sum, cr) => sum + Number(cr.amount), 0);
|
||||
const totalRepayments = (repaymentsData || [])
|
||||
.filter((r) => r.customer_id === c.id)
|
||||
.reduce((sum, r) => sum + Number(r.amount), 0);
|
||||
return {
|
||||
id: c.id,
|
||||
name: c.name,
|
||||
phone: c.phone,
|
||||
balance: Math.max(0, totalCredits - totalRepayments),
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
// Sort: outstanding balances first, then by name
|
||||
setCustomers(
|
||||
customerBalances.sort((a, b) => {
|
||||
if (a.balance > 0 && b.balance === 0) return -1;
|
||||
if (a.balance === 0 && b.balance > 0) return 1;
|
||||
return a.name.localeCompare(b.name);
|
||||
}),
|
||||
);
|
||||
} catch (err) {
|
||||
console.error('Error fetching customers:', err);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [user]);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
fetchData();
|
||||
}, [fetchData]);
|
||||
|
||||
const handleRefresh = async (e: CustomEvent) => {
|
||||
await fetchData();
|
||||
e.detail.complete();
|
||||
};
|
||||
|
||||
const filteredCustomers = useMemo(() => {
|
||||
const query = searchQuery.toLowerCase().trim();
|
||||
if (!query) return customers;
|
||||
return customers.filter(
|
||||
(c) =>
|
||||
c.name.toLowerCase().includes(query) ||
|
||||
(c.phone && c.phone.toLowerCase().includes(query)),
|
||||
);
|
||||
}, [customers, searchQuery]);
|
||||
|
||||
const totalOutstanding = useMemo(() => {
|
||||
return customers.reduce((sum, c) => sum + c.balance, 0);
|
||||
}, [customers]);
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.35) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
|
||||
<div
|
||||
style={{
|
||||
padding: 'calc(16px + var(--ion-safe-area-top)) 20px 16px',
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<div>
|
||||
<h1 className="bold" style={{ margin: '0', fontSize: '20px' }}>
|
||||
Credit customers
|
||||
</h1>
|
||||
<p className="secondary-text" style={{ margin: '0' }}>
|
||||
Track who owes your shop
|
||||
</p>
|
||||
</div>
|
||||
<div
|
||||
className="icon-container"
|
||||
style={{
|
||||
borderRadius: '12px',
|
||||
background: '#ffffff',
|
||||
color: 'var(--ion-color-primary)',
|
||||
}}
|
||||
onClick={() => history.push('/credit/new')}
|
||||
>
|
||||
<IonIcon icon={personAddOutline} style={{ fontSize: '22px' }} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="page-padding">
|
||||
<IonSearchbar
|
||||
value={searchQuery}
|
||||
onIonInput={(e) => setSearchQuery(e.detail.value!)}
|
||||
placeholder="Search customers"
|
||||
className="custom-searchbar"
|
||||
style={{
|
||||
'--background': 'var(--color-surface-secondary)',
|
||||
'--border-radius': '24px',
|
||||
'--box-shadow': 'none',
|
||||
padding: '0',
|
||||
height: '44px',
|
||||
marginBottom: '16px',
|
||||
}}
|
||||
/>
|
||||
|
||||
<MetricCard
|
||||
label="Total Outstanding"
|
||||
value={totalOutstanding}
|
||||
fullWidth
|
||||
loading={loading}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="section-header">
|
||||
<h2>
|
||||
Customers{' '}
|
||||
{!loading && (
|
||||
<span className="tertiary-text" style={{ marginLeft: '4px' }}>
|
||||
({customers.length})
|
||||
</span>
|
||||
)}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div className="page-padding" style={{ paddingBottom: '120px' }}>
|
||||
{loading ? (
|
||||
<div className="widget-card" style={{ gap: '16px' }}>
|
||||
{[1, 2, 3].map((i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{ display: 'flex', gap: '12px', alignItems: 'center' }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: '44px',
|
||||
height: '44px',
|
||||
borderRadius: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
}}
|
||||
/>
|
||||
<div style={{ flex: 1 }}>
|
||||
<div
|
||||
style={{
|
||||
width: '50%',
|
||||
height: '14px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
style={{
|
||||
width: '30%',
|
||||
height: '10px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : customers.length > 0 ? (
|
||||
<>
|
||||
{filteredCustomers.length > 0 ? (
|
||||
<div className="widget-card" style={{ padding: '8px 16px' }}>
|
||||
{filteredCustomers.map((c) => (
|
||||
<CustomerRow
|
||||
key={c.id}
|
||||
id={c.id}
|
||||
name={c.name}
|
||||
phone={c.phone || undefined}
|
||||
balance={c.balance}
|
||||
onClick={() => history.push(`/customers/${c.id}`)}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ textAlign: 'center', padding: '40px 20px' }}>
|
||||
<p className="secondary-text">
|
||||
No customers matching "{searchQuery}"
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<EmptyState
|
||||
icon={peopleOutline}
|
||||
title="No credit customers yet"
|
||||
description="Add a credit sale to start tracking balances."
|
||||
actionText="Add Credit"
|
||||
onAction={() => history.push('/credit/new')}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default CustomersPage;
|
||||
@@ -0,0 +1,162 @@
|
||||
import React, { useState } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonInput,
|
||||
IonButton,
|
||||
IonSpinner,
|
||||
IonIcon,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
|
||||
const ForgotPasswordPage: React.FC = () => {
|
||||
const [email, setEmail] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [messageType, setMessageType] = useState<'error' | 'success'>('error');
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
const showMessage = (msg: string, type: 'error' | 'success' = 'error') => {
|
||||
setMessage(msg);
|
||||
setMessageType(type);
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
};
|
||||
|
||||
const handleReset = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!email) {
|
||||
showMessage('Please enter your email');
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
const { error } = await supabase.auth.resetPasswordForEmail(email);
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
history.push('/verify-email', { email, type: 'recovery' });
|
||||
} catch (err: any) {
|
||||
showMessage(err.message || 'An error occurred');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.52) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<div className="auth-shell">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
color="dark"
|
||||
onClick={() => history.push('/auth')}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 'calc(var(--ion-safe-area-top, 0px) + 8px)',
|
||||
left: '8px',
|
||||
'--padding-start': '8px',
|
||||
'--padding-end': '8px',
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: '#ffffff',
|
||||
width: '44px',
|
||||
height: '44px',
|
||||
borderRadius: '12px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonIcon icon={chevronBackOutline} />
|
||||
</div>
|
||||
</IonButton>
|
||||
|
||||
<div style={{ marginTop: '80px' }}>
|
||||
<h1
|
||||
className="bold"
|
||||
style={{ fontSize: '24px', margin: '0 0 8px 0' }}
|
||||
>
|
||||
Reset password
|
||||
</h1>
|
||||
<p
|
||||
className="secondary-text"
|
||||
style={{ margin: '0', fontSize: '14px' }}
|
||||
>
|
||||
Enter your email and we'll send a 6-digit recovery code.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="auth-card">
|
||||
<form
|
||||
onSubmit={handleReset}
|
||||
style={{ display: 'flex', flexDirection: 'column', gap: '16px' }}
|
||||
>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="Email"
|
||||
labelPlacement="floating"
|
||||
type="email"
|
||||
placeholder="name@example.com"
|
||||
value={email}
|
||||
onIonChange={(e) => setEmail(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background:
|
||||
messageType === 'error'
|
||||
? 'var(--color-danger-soft)'
|
||||
: 'var(--color-success-soft)',
|
||||
color:
|
||||
messageType === 'error'
|
||||
? 'var(--ion-color-danger-shade)'
|
||||
: 'var(--ion-color-success-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
type="submit"
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '8px',
|
||||
}}
|
||||
disabled={submitting}
|
||||
>
|
||||
{submitting ? <IonSpinner name="crescent" /> : 'Send code'}
|
||||
</IonButton>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default ForgotPasswordPage;
|
||||
@@ -1,90 +0,0 @@
|
||||
import React from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonButtons,
|
||||
IonContent,
|
||||
IonHeader,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonTitle,
|
||||
IonToolbar,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline, globeOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
|
||||
const HelloWorld: React.FC = () => {
|
||||
const history = useHistory();
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader>
|
||||
<IonToolbar>
|
||||
<IonButtons slot="start">
|
||||
<IonButton aria-label="Back" onClick={() => history.goBack()}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle>Hello World</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
<IonContent
|
||||
className="ion-padding"
|
||||
style={
|
||||
{ '--background': 'var(--ion-color-light)' } as React.CSSProperties
|
||||
}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
minHeight: '70vh',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
textAlign: 'center',
|
||||
gap: 16,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: 72,
|
||||
height: 72,
|
||||
borderRadius: 24,
|
||||
background: 'rgba(var(--ion-color-primary-rgb), 0.12)',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonIcon
|
||||
icon={globeOutline}
|
||||
style={{ fontSize: 36, color: 'var(--ion-color-primary)' }}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<h1
|
||||
style={{
|
||||
margin: '0 0 8px',
|
||||
fontSize: 28,
|
||||
fontWeight: 700,
|
||||
color: 'var(--ion-color-dark)',
|
||||
}}
|
||||
>
|
||||
Hello, world!
|
||||
</h1>
|
||||
<p
|
||||
style={{
|
||||
margin: 0,
|
||||
color: 'var(--ion-color-medium)',
|
||||
lineHeight: 1.5,
|
||||
}}
|
||||
>
|
||||
You made it to the new page.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default HelloWorld;
|
||||
@@ -0,0 +1,339 @@
|
||||
import React, { useState, useCallback, useMemo } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonIcon,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
IonSegment,
|
||||
IonSegmentButton,
|
||||
IonLabel,
|
||||
IonActionSheet,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import {
|
||||
addOutline,
|
||||
receiptOutline,
|
||||
personAddOutline,
|
||||
cashOutline,
|
||||
} from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { supabase } from '../supabase';
|
||||
import ActivityRow, { ActivityItem } from '../components/ActivityRow';
|
||||
import EmptyState from '../components/EmptyState';
|
||||
import MetricCard from '../components/MetricCard';
|
||||
import { groupItemsByDate, formatRelativeDate } from '../utils/dates';
|
||||
|
||||
const HistoryPage: React.FC = () => {
|
||||
const { user } = useAuth();
|
||||
const history = useHistory();
|
||||
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [filter, setFilter] = useState<
|
||||
'all' | 'sales' | 'credit' | 'repayments'
|
||||
>('all');
|
||||
const [items, setItems] = useState<ActivityItem[]>([]);
|
||||
const [showQuickAdd, setShowQuickAdd] = useState(false);
|
||||
|
||||
const fetchData = useCallback(async () => {
|
||||
if (!user) return;
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const [
|
||||
{ data: salesData },
|
||||
{ data: creditsData },
|
||||
{ data: repaymentsData },
|
||||
] = await Promise.all([
|
||||
supabase
|
||||
.from('sales')
|
||||
.select('*')
|
||||
.eq('user_id', user.id)
|
||||
.order('sale_date', { ascending: false }),
|
||||
supabase
|
||||
.from('credits')
|
||||
.select('*, credit_customers(name)')
|
||||
.eq('user_id', user.id)
|
||||
.order('credit_date', { ascending: false }),
|
||||
supabase
|
||||
.from('repayments')
|
||||
.select('*, credit_customers(name)')
|
||||
.eq('user_id', user.id)
|
||||
.order('repayment_date', { ascending: false }),
|
||||
]);
|
||||
|
||||
const combined: ActivityItem[] = [
|
||||
...(salesData || []).map((s) => ({
|
||||
id: s.id,
|
||||
type: 'sale' as const,
|
||||
amount: Number(s.amount),
|
||||
date: s.sale_date,
|
||||
note: s.note,
|
||||
})),
|
||||
...(creditsData || []).map((c) => ({
|
||||
id: c.id,
|
||||
type: 'credit' as const,
|
||||
amount: Number(c.amount),
|
||||
date: c.credit_date,
|
||||
customerName: (c.credit_customers as any)?.name,
|
||||
note: c.description,
|
||||
customerId: c.customer_id,
|
||||
})),
|
||||
...(repaymentsData || []).map((r) => ({
|
||||
id: r.id,
|
||||
type: 'repayment' as const,
|
||||
amount: Number(r.amount),
|
||||
date: r.repayment_date,
|
||||
customerName: (r.credit_customers as any)?.name,
|
||||
note: r.note,
|
||||
customerId: r.customer_id,
|
||||
})),
|
||||
].sort((a, b) => b.date.localeCompare(a.date));
|
||||
|
||||
setItems(combined);
|
||||
} catch (err) {
|
||||
console.error('Error fetching history:', err);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [user]);
|
||||
|
||||
useIonViewWillEnter(() => {
|
||||
fetchData();
|
||||
}, [fetchData]);
|
||||
|
||||
const handleRefresh = async (e: CustomEvent) => {
|
||||
await fetchData();
|
||||
e.detail.complete();
|
||||
};
|
||||
|
||||
const filteredItems = useMemo(() => {
|
||||
if (filter === 'all') return items;
|
||||
if (filter === 'sales') return items.filter((i) => i.type === 'sale');
|
||||
if (filter === 'credit') return items.filter((i) => i.type === 'credit');
|
||||
if (filter === 'repayments')
|
||||
return items.filter((i) => i.type === 'repayment');
|
||||
return items;
|
||||
}, [items, filter]);
|
||||
|
||||
const groupedItems = useMemo(() => {
|
||||
return groupItemsByDate(filteredItems);
|
||||
}, [filteredItems]);
|
||||
|
||||
const totals = useMemo(() => {
|
||||
const salesTotal = items
|
||||
.filter((i) => i.type === 'sale')
|
||||
.reduce((sum, i) => sum + i.amount, 0);
|
||||
const repaymentsTotal = items
|
||||
.filter((i) => i.type === 'repayment')
|
||||
.reduce((sum, i) => sum + i.amount, 0);
|
||||
return { salesTotal, repaymentsTotal };
|
||||
}, [items]);
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.35) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
|
||||
<div
|
||||
style={{
|
||||
padding: 'calc(16px + var(--ion-safe-area-top)) 20px 16px',
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<div>
|
||||
<h1 className="bold" style={{ margin: '0', fontSize: '20px' }}>
|
||||
History
|
||||
</h1>
|
||||
<p className="secondary-text" style={{ margin: '0' }}>
|
||||
All your transactions
|
||||
</p>
|
||||
</div>
|
||||
<div
|
||||
className="icon-container"
|
||||
style={{
|
||||
borderRadius: '12px',
|
||||
background: '#ffffff',
|
||||
color: 'var(--ion-color-primary)',
|
||||
}}
|
||||
onClick={() => setShowQuickAdd(true)}
|
||||
>
|
||||
<IonIcon icon={addOutline} style={{ fontSize: '22px' }} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="page-padding">
|
||||
<IonSegment
|
||||
value={filter}
|
||||
onIonChange={(e) => setFilter(e.detail.value as any)}
|
||||
style={{
|
||||
'--background': 'var(--color-surface-secondary)',
|
||||
borderRadius: '12px',
|
||||
padding: '4px',
|
||||
marginBottom: '16px',
|
||||
}}
|
||||
>
|
||||
<IonSegmentButton
|
||||
value="all"
|
||||
style={{
|
||||
'--indicator-color': 'var(--ion-color-primary)',
|
||||
color: 'var(--color-text-primary)',
|
||||
}}
|
||||
>
|
||||
<IonLabel className="semibold">All</IonLabel>
|
||||
</IonSegmentButton>
|
||||
<IonSegmentButton value="sales">
|
||||
<IonLabel className="semibold">Sales</IonLabel>
|
||||
</IonSegmentButton>
|
||||
<IonSegmentButton value="credit">
|
||||
<IonLabel className="semibold">Credit</IonLabel>
|
||||
</IonSegmentButton>
|
||||
<IonSegmentButton value="repayments">
|
||||
<IonLabel className="semibold">Paid</IonLabel>
|
||||
</IonSegmentButton>
|
||||
</IonSegment>
|
||||
|
||||
<div className="metric-pair-row">
|
||||
<MetricCard
|
||||
label="Total Sales"
|
||||
value={totals.salesTotal}
|
||||
loading={loading}
|
||||
/>
|
||||
<MetricCard
|
||||
label="Total Repaid"
|
||||
value={totals.repaymentsTotal}
|
||||
loading={loading}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="page-padding"
|
||||
style={{ paddingBottom: '120px', marginTop: '8px' }}
|
||||
>
|
||||
{loading ? (
|
||||
<div className="widget-card" style={{ gap: '16px' }}>
|
||||
{[1, 2, 3].map((i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{ display: 'flex', gap: '12px', alignItems: 'center' }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: '40px',
|
||||
height: '40px',
|
||||
borderRadius: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
}}
|
||||
/>
|
||||
<div style={{ flex: 1 }}>
|
||||
<div
|
||||
style={{
|
||||
width: '60%',
|
||||
height: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
style={{
|
||||
width: '40%',
|
||||
height: '10px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : groupedItems.length > 0 ? (
|
||||
groupedItems.map((group) => (
|
||||
<div key={group.date} style={{ marginBottom: '20px' }}>
|
||||
<div className="tertiary-text" style={{ marginBottom: '12px' }}>
|
||||
{formatRelativeDate(group.date)}
|
||||
</div>
|
||||
<div className="widget-card" style={{ padding: '8px 16px' }}>
|
||||
{group.items.map((item) => (
|
||||
<ActivityRow
|
||||
key={`${item.type}-${item.id}`}
|
||||
item={item}
|
||||
onClick={
|
||||
item.customerId
|
||||
? () => history.push(`/customers/${item.customerId}`)
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
) : (
|
||||
<EmptyState
|
||||
icon={receiptOutline}
|
||||
title={
|
||||
filter === 'all' ? 'No activity yet' : `No ${filter} found`
|
||||
}
|
||||
description={
|
||||
filter === 'all'
|
||||
? 'Start recording sales and credits to see your history.'
|
||||
: `You haven't recorded any ${filter} yet.`
|
||||
}
|
||||
actionText={
|
||||
filter === 'all' || filter === 'sales'
|
||||
? 'Add Sale'
|
||||
: filter === 'credit'
|
||||
? 'Add Credit'
|
||||
: 'Record Repayment'
|
||||
}
|
||||
onAction={() => {
|
||||
if (filter === 'sales' || filter === 'all')
|
||||
history.push('/sale/new');
|
||||
else if (filter === 'credit') history.push('/credit/new');
|
||||
else history.push('/repayment/new');
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<IonActionSheet
|
||||
isOpen={showQuickAdd}
|
||||
onDidDismiss={() => setShowQuickAdd(false)}
|
||||
header="Quick Actions"
|
||||
buttons={[
|
||||
{
|
||||
text: 'Add Sale',
|
||||
icon: receiptOutline,
|
||||
handler: () => history.push('/sale/new'),
|
||||
},
|
||||
{
|
||||
text: 'Add Credit',
|
||||
icon: personAddOutline,
|
||||
handler: () => history.push('/credit/new'),
|
||||
},
|
||||
{
|
||||
text: 'Record Repayment',
|
||||
icon: cashOutline,
|
||||
handler: () => history.push('/repayment/new'),
|
||||
},
|
||||
{ text: 'Cancel', role: 'cancel' },
|
||||
]}
|
||||
/>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default HistoryPage;
|
||||
+292
-614
@@ -1,679 +1,357 @@
|
||||
import React, { useEffect, useRef, useState } from 'react';
|
||||
import React, { useState, useCallback } from 'react';
|
||||
import {
|
||||
IonButton,
|
||||
IonContent,
|
||||
IonIcon,
|
||||
IonPage,
|
||||
IonSpinner,
|
||||
useIonViewDidEnter,
|
||||
useIonViewWillLeave,
|
||||
IonIcon,
|
||||
IonButton,
|
||||
IonActionSheet,
|
||||
IonRefresher,
|
||||
IonRefresherContent,
|
||||
useIonViewWillEnter,
|
||||
} from '@ionic/react';
|
||||
import { GoogleMap } from '@capacitor/google-maps';
|
||||
import type {
|
||||
GoogleMap as GoogleMapInstance,
|
||||
Marker,
|
||||
} from '@capacitor/google-maps';
|
||||
import {
|
||||
closeOutline,
|
||||
locateOutline,
|
||||
mapOutline,
|
||||
searchOutline,
|
||||
addCircleOutline,
|
||||
personAddOutline,
|
||||
cashOutline,
|
||||
receiptOutline,
|
||||
walletOutline,
|
||||
checkmarkCircleOutline,
|
||||
personCircleOutline,
|
||||
} from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { supabase } from '../supabase';
|
||||
|
||||
const DEFAULT_CENTER = { lat: 37.7749, lng: -122.4194 };
|
||||
const HOME_MARKER: Marker = {
|
||||
coordinate: DEFAULT_CENTER,
|
||||
title: 'San Francisco',
|
||||
snippet: 'Start searching for nearby places',
|
||||
};
|
||||
|
||||
type PlaceSuggestion = {
|
||||
placeId: string;
|
||||
text: string;
|
||||
mainText: string;
|
||||
secondaryText: string;
|
||||
};
|
||||
|
||||
type Coordinate = {
|
||||
lat: number;
|
||||
lng: number;
|
||||
};
|
||||
|
||||
type SelectedPlace = {
|
||||
placeId: string;
|
||||
name: string;
|
||||
address: string;
|
||||
coordinate: Coordinate;
|
||||
photoUrl?: string | null;
|
||||
};
|
||||
|
||||
const getErrorDetails = (error: unknown) => {
|
||||
if (error instanceof Error) {
|
||||
return error.message;
|
||||
}
|
||||
|
||||
if (typeof error === 'string') {
|
||||
return error;
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.stringify(error);
|
||||
} catch {
|
||||
return 'Unknown error';
|
||||
}
|
||||
};
|
||||
|
||||
const waitForFrame = () =>
|
||||
new Promise<void>((resolve) => {
|
||||
requestAnimationFrame(() => resolve());
|
||||
});
|
||||
|
||||
const wait = (ms: number) =>
|
||||
new Promise<void>((resolve) => {
|
||||
window.setTimeout(resolve, ms);
|
||||
});
|
||||
|
||||
const createSessionToken = () => {
|
||||
if (typeof crypto !== 'undefined' && 'randomUUID' in crypto) {
|
||||
return crypto.randomUUID();
|
||||
}
|
||||
|
||||
return `${Date.now()}-${Math.random().toString(36).slice(2)}`;
|
||||
};
|
||||
import MetricCard from '../components/MetricCard';
|
||||
import ActivityRow, { ActivityItem } from '../components/ActivityRow';
|
||||
import EmptyState from '../components/EmptyState';
|
||||
import { getTodayISO } from '../utils/dates';
|
||||
|
||||
const Home: React.FC = () => {
|
||||
const mapContainerRef = useRef<HTMLDivElement>(null);
|
||||
const mapRef = useRef<GoogleMapInstance | null>(null);
|
||||
const mapIdRef = useRef(`home-map-${createSessionToken()}`);
|
||||
const markerIdsRef = useRef<string[]>([]);
|
||||
const isActiveRef = useRef(false);
|
||||
const searchRequestRef = useRef(0);
|
||||
const sessionTokenRef = useRef(createSessionToken());
|
||||
const selectedPlaceRef = useRef<SelectedPlace | null>(null);
|
||||
const suppressNextSearchRef = useRef(false);
|
||||
const { user, profile } = useAuth();
|
||||
const history = useHistory();
|
||||
|
||||
const [mapError, setMapError] = useState<string | null>(null);
|
||||
const [query, setQuery] = useState('');
|
||||
const [suggestions, setSuggestions] = useState<PlaceSuggestion[]>([]);
|
||||
const [showSuggestions, setShowSuggestions] = useState(false);
|
||||
const [searchLoading, setSearchLoading] = useState(false);
|
||||
const [detailsLoading, setDetailsLoading] = useState(false);
|
||||
const [selectedPlace, setSelectedPlace] = useState<SelectedPlace | null>(
|
||||
null
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [showQuickActions, setShowQuickActions] = useState(false);
|
||||
const [summary, setSummary] = useState({
|
||||
todaySales: 0,
|
||||
outstandingCredit: 0,
|
||||
monthRepayments: 0,
|
||||
recentActivity: [] as ActivityItem[],
|
||||
});
|
||||
|
||||
const fetchData = useCallback(async () => {
|
||||
if (!user) return;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const today = getTodayISO();
|
||||
const firstOfMonth = new Date();
|
||||
firstOfMonth.setDate(1);
|
||||
const firstOfMonthISO = firstOfMonth.toISOString().split('T')[0];
|
||||
|
||||
// Parallel queries for efficiency
|
||||
const [
|
||||
{ data: salesToday },
|
||||
{ data: creditsData },
|
||||
{ data: repaymentsData },
|
||||
{ data: recentSales },
|
||||
{ data: recentCredits },
|
||||
{ data: recentRepayments },
|
||||
] = await Promise.all([
|
||||
supabase.from('sales').select('amount').eq('sale_date', today),
|
||||
supabase.from('credits').select('amount'),
|
||||
supabase.from('repayments').select('amount, repayment_date'),
|
||||
supabase
|
||||
.from('sales')
|
||||
.select('*')
|
||||
.order('created_at', { ascending: false })
|
||||
.limit(5),
|
||||
supabase
|
||||
.from('credits')
|
||||
.select('*, credit_customers(name)')
|
||||
.order('created_at', { ascending: false })
|
||||
.limit(5),
|
||||
supabase
|
||||
.from('repayments')
|
||||
.select('*, credit_customers(name)')
|
||||
.order('created_at', { ascending: false })
|
||||
.limit(5),
|
||||
]);
|
||||
|
||||
// Calculate totals
|
||||
const todaySalesTotal = (salesToday || []).reduce(
|
||||
(sum, s) => sum + Number(s.amount),
|
||||
0
|
||||
);
|
||||
|
||||
const clearMarkers = async (map: GoogleMapInstance) => {
|
||||
const markerIds = markerIdsRef.current;
|
||||
if (markerIds.length === 0) return;
|
||||
|
||||
markerIdsRef.current = [];
|
||||
|
||||
try {
|
||||
await map.removeMarkers(markerIds);
|
||||
} catch (error) {
|
||||
console.warn('Failed to remove Google Map markers', error);
|
||||
}
|
||||
};
|
||||
|
||||
const addMarkerSafely = async (map: GoogleMapInstance, marker: Marker) => {
|
||||
await waitForFrame();
|
||||
await wait(250);
|
||||
|
||||
if (!isActiveRef.current || mapRef.current !== map) return;
|
||||
|
||||
try {
|
||||
await clearMarkers(map);
|
||||
const markerId = await map.addMarker(marker);
|
||||
markerIdsRef.current = [markerId];
|
||||
setMapError(null);
|
||||
} catch (firstError) {
|
||||
const firstDetails = getErrorDetails(firstError);
|
||||
console.warn('First Google Map marker attempt failed', firstError);
|
||||
|
||||
await wait(500);
|
||||
|
||||
if (!isActiveRef.current || mapRef.current !== map) return;
|
||||
|
||||
try {
|
||||
await clearMarkers(map);
|
||||
const markerId = await map.addMarker(marker);
|
||||
markerIdsRef.current = [markerId];
|
||||
setMapError(null);
|
||||
} catch (retryError) {
|
||||
const retryDetails = getErrorDetails(retryError);
|
||||
console.error('Failed to add Google Map marker', retryError);
|
||||
setMapError(
|
||||
`Place selected, but the marker could not be added. First attempt: ${firstDetails}. Retry: ${retryDetails}`
|
||||
const totalCredits = (creditsData || []).reduce(
|
||||
(sum, c) => sum + Number(c.amount),
|
||||
0
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
useIonViewDidEnter(() => {
|
||||
isActiveRef.current = true;
|
||||
if (!mapContainerRef.current || mapRef.current) return;
|
||||
|
||||
const createMap = async () => {
|
||||
const apiKey = import.meta.env.VITE_GOOGLE_MAPS_KEY as string;
|
||||
if (!apiKey) {
|
||||
setMapError(
|
||||
'Google Maps API key is missing. Add VITE_GOOGLE_MAPS_KEY in Config to view the map.'
|
||||
const totalRepayments = (repaymentsData || []).reduce(
|
||||
(sum, r) => sum + Number(r.amount),
|
||||
0
|
||||
);
|
||||
return;
|
||||
}
|
||||
const monthRepaymentsTotal = (repaymentsData || [])
|
||||
.filter((r) => r.repayment_date >= firstOfMonthISO)
|
||||
.reduce((sum, r) => sum + Number(r.amount), 0);
|
||||
|
||||
try {
|
||||
const map = await GoogleMap.create({
|
||||
id: mapIdRef.current,
|
||||
element: mapContainerRef.current!,
|
||||
apiKey,
|
||||
config: {
|
||||
center: DEFAULT_CENTER,
|
||||
zoom: 12,
|
||||
disableDefaultUI: true,
|
||||
mapTypeControl: false,
|
||||
streetViewControl: false,
|
||||
fullscreenControl: false,
|
||||
} as unknown as {
|
||||
center: typeof DEFAULT_CENTER;
|
||||
zoom: number;
|
||||
},
|
||||
// Combine activity
|
||||
const activity: ActivityItem[] = [
|
||||
...(recentSales || []).map((s) => ({
|
||||
id: s.id,
|
||||
type: 'sale' as const,
|
||||
amount: Number(s.amount),
|
||||
date: s.sale_date,
|
||||
note: s.note,
|
||||
})),
|
||||
...(recentCredits || []).map((c) => ({
|
||||
id: c.id,
|
||||
type: 'credit' as const,
|
||||
amount: Number(c.amount),
|
||||
date: c.credit_date,
|
||||
customerName: (c.credit_customers as any)?.name,
|
||||
note: c.description,
|
||||
customerId: c.customer_id,
|
||||
})),
|
||||
...(recentRepayments || []).map((r) => ({
|
||||
id: r.id,
|
||||
type: 'repayment' as const,
|
||||
amount: Number(r.amount),
|
||||
date: r.repayment_date,
|
||||
customerName: (r.credit_customers as any)?.name,
|
||||
note: r.note,
|
||||
customerId: r.customer_id,
|
||||
})),
|
||||
].sort((a, b) => b.id.localeCompare(a.id)); // Simplified sort for MVP, ideally use created_at
|
||||
|
||||
setSummary({
|
||||
todaySales: todaySalesTotal,
|
||||
outstandingCredit: Math.max(0, totalCredits - totalRepayments),
|
||||
monthRepayments: monthRepaymentsTotal,
|
||||
recentActivity: activity.slice(0, 10),
|
||||
});
|
||||
|
||||
if (!isActiveRef.current) {
|
||||
await map.destroy().catch((error) => {
|
||||
console.warn('Failed to destroy inactive Google Map', error);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
mapRef.current = map;
|
||||
setMapError(null);
|
||||
await addMarkerSafely(map, HOME_MARKER);
|
||||
} catch (error) {
|
||||
const details = getErrorDetails(error);
|
||||
console.error('Failed to load Google Map', error);
|
||||
setMapError(`Unable to load the map: ${details}`);
|
||||
}
|
||||
};
|
||||
|
||||
createMap();
|
||||
});
|
||||
|
||||
useIonViewWillLeave(() => {
|
||||
isActiveRef.current = false;
|
||||
searchRequestRef.current += 1;
|
||||
|
||||
const map = mapRef.current;
|
||||
mapRef.current = null;
|
||||
markerIdsRef.current = [];
|
||||
|
||||
if (!map) return;
|
||||
|
||||
map.destroy().catch((error) => {
|
||||
console.warn('Failed to destroy Google Map', error);
|
||||
});
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const trimmedQuery = query.trim();
|
||||
|
||||
if (suppressNextSearchRef.current) {
|
||||
suppressNextSearchRef.current = false;
|
||||
searchRequestRef.current += 1;
|
||||
setSearchLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
searchRequestRef.current += 1;
|
||||
const requestId = searchRequestRef.current;
|
||||
|
||||
if (trimmedQuery.length < 2) {
|
||||
setSuggestions([]);
|
||||
setShowSuggestions(false);
|
||||
setSearchLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
setShowSuggestions(true);
|
||||
setSearchLoading(true);
|
||||
|
||||
const timeout = window.setTimeout(async () => {
|
||||
try {
|
||||
const { data, error } = await supabase.functions.invoke<{
|
||||
suggestions: PlaceSuggestion[];
|
||||
error?: string;
|
||||
}>('places-autocomplete', {
|
||||
body: {
|
||||
input: trimmedQuery,
|
||||
sessionToken: sessionTokenRef.current,
|
||||
latitude:
|
||||
selectedPlaceRef.current?.coordinate.lat ?? DEFAULT_CENTER.lat,
|
||||
longitude:
|
||||
selectedPlaceRef.current?.coordinate.lng ?? DEFAULT_CENTER.lng,
|
||||
},
|
||||
});
|
||||
|
||||
if (requestId !== searchRequestRef.current) return;
|
||||
|
||||
if (error) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
if (data?.error) {
|
||||
throw new Error(data.error);
|
||||
}
|
||||
|
||||
setSuggestions(data?.suggestions ?? []);
|
||||
setShowSuggestions(true);
|
||||
setMapError(null);
|
||||
} catch (error) {
|
||||
if (requestId !== searchRequestRef.current) return;
|
||||
const details = getErrorDetails(error);
|
||||
console.error('Places autocomplete failed', error);
|
||||
setSuggestions([]);
|
||||
setShowSuggestions(true);
|
||||
setMapError(`Place search failed: ${details}`);
|
||||
} catch (err: any) {
|
||||
console.error('Error fetching dashboard data:', err);
|
||||
setError('Could not load dashboard data');
|
||||
} finally {
|
||||
if (requestId === searchRequestRef.current) {
|
||||
setSearchLoading(false);
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
}, 350);
|
||||
}, [user]);
|
||||
|
||||
return () => {
|
||||
window.clearTimeout(timeout);
|
||||
};
|
||||
}, [query]);
|
||||
useIonViewWillEnter(() => {
|
||||
fetchData();
|
||||
}, [fetchData]);
|
||||
|
||||
const recenterMap = async () => {
|
||||
const map = mapRef.current;
|
||||
if (!map) return;
|
||||
|
||||
const coordinate = selectedPlace?.coordinate ?? DEFAULT_CENTER;
|
||||
|
||||
try {
|
||||
await map.setCamera({
|
||||
coordinate,
|
||||
zoom: selectedPlace ? 15 : 12,
|
||||
animate: true,
|
||||
});
|
||||
setMapError(null);
|
||||
} catch (error) {
|
||||
const details = getErrorDetails(error);
|
||||
console.error('Failed to recenter Google Map', error);
|
||||
setMapError(`Map loaded, but recentering failed: ${details}`);
|
||||
}
|
||||
const handleRefresh = async (e: CustomEvent) => {
|
||||
await fetchData();
|
||||
e.detail.complete();
|
||||
};
|
||||
|
||||
const selectSuggestion = async (suggestion: PlaceSuggestion) => {
|
||||
const map = mapRef.current;
|
||||
if (!map) return;
|
||||
|
||||
setDetailsLoading(true);
|
||||
suppressNextSearchRef.current = true;
|
||||
searchRequestRef.current += 1;
|
||||
setQuery(suggestion.mainText || suggestion.text);
|
||||
setSuggestions([]);
|
||||
setShowSuggestions(false);
|
||||
setSearchLoading(false);
|
||||
|
||||
try {
|
||||
const { data, error } = await supabase.functions.invoke<{
|
||||
place?: SelectedPlace;
|
||||
error?: string;
|
||||
}>('place-details', {
|
||||
body: {
|
||||
placeId: suggestion.placeId,
|
||||
sessionToken: sessionTokenRef.current,
|
||||
},
|
||||
});
|
||||
|
||||
if (error) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
if (data?.error) {
|
||||
throw new Error(data.error);
|
||||
}
|
||||
|
||||
if (!data?.place?.coordinate) {
|
||||
throw new Error('Selected place does not include a map location.');
|
||||
}
|
||||
|
||||
const place = data.place;
|
||||
selectedPlaceRef.current = place;
|
||||
setSelectedPlace(place);
|
||||
sessionTokenRef.current = createSessionToken();
|
||||
|
||||
await map.setCamera({
|
||||
coordinate: place.coordinate,
|
||||
zoom: 15,
|
||||
animate: true,
|
||||
});
|
||||
|
||||
await addMarkerSafely(map, {
|
||||
coordinate: place.coordinate,
|
||||
title: place.name,
|
||||
snippet: place.address,
|
||||
});
|
||||
} catch (error) {
|
||||
const details = getErrorDetails(error);
|
||||
console.error('Place selection failed', error);
|
||||
setMapError(`Could not open that place: ${details}`);
|
||||
} finally {
|
||||
setDetailsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const clearSearch = () => {
|
||||
searchRequestRef.current += 1;
|
||||
suppressNextSearchRef.current = false;
|
||||
setQuery('');
|
||||
setSuggestions([]);
|
||||
setShowSuggestions(false);
|
||||
setSearchLoading(false);
|
||||
const getGreeting = () => {
|
||||
const hour = new Date().getHours();
|
||||
if (hour < 12) return 'Good morning';
|
||||
if (hour < 17) return 'Good afternoon';
|
||||
return 'Good evening';
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage style={{ background: 'transparent' }}>
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{ '--background': 'transparent' } as React.CSSProperties}
|
||||
>
|
||||
<div
|
||||
ref={mapContainerRef}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
inset: 0,
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.45) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
/>
|
||||
>
|
||||
<IonRefresher slot="fixed" onIonRefresh={handleRefresh}>
|
||||
<IonRefresherContent />
|
||||
</IonRefresher>
|
||||
|
||||
<div
|
||||
slot="fixed"
|
||||
style={{
|
||||
left: 16,
|
||||
right: 16,
|
||||
top: 'calc(14px + var(--ion-safe-area-top))',
|
||||
position: 'absolute',
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: '#ffffff',
|
||||
borderRadius: 22,
|
||||
padding: '10px 12px',
|
||||
padding: 'calc(16px + var(--ion-safe-area-top)) 20px 16px',
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
gap: 10,
|
||||
boxShadow: '0 10px 34px rgba(15, 23, 42, 0.18)',
|
||||
}}
|
||||
>
|
||||
<IonIcon
|
||||
icon={searchOutline}
|
||||
<div>
|
||||
<div className="secondary-text">{getGreeting()}</div>
|
||||
<h1 className="bold" style={{ margin: '0', fontSize: '20px' }}>
|
||||
{profile?.shop_name || profile?.full_name || 'My Shop'}
|
||||
</h1>
|
||||
</div>
|
||||
<div
|
||||
className="icon-container"
|
||||
style={{
|
||||
fontSize: 22,
|
||||
color: 'var(--ion-color-medium)',
|
||||
flexShrink: 0,
|
||||
borderRadius: '999px',
|
||||
background: 'var(--color-accent-soft)',
|
||||
}}
|
||||
onClick={() => setShowQuickActions(true)}
|
||||
>
|
||||
<IonIcon icon={personCircleOutline} style={{ fontSize: '24px' }} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="page-padding">
|
||||
<MetricCard
|
||||
label="Today's Sales"
|
||||
value={summary.todaySales}
|
||||
fullWidth
|
||||
loading={loading}
|
||||
/>
|
||||
<input
|
||||
value={query}
|
||||
onChange={(event) => {
|
||||
suppressNextSearchRef.current = false;
|
||||
setShowSuggestions(true);
|
||||
setQuery(event.target.value);
|
||||
}}
|
||||
onFocus={() => {
|
||||
if (suggestions.length > 0 || query.trim().length >= 2) {
|
||||
setShowSuggestions(true);
|
||||
}
|
||||
}}
|
||||
placeholder="Search places"
|
||||
aria-label="Search places"
|
||||
style={{
|
||||
border: 0,
|
||||
outline: 'none',
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
fontSize: 16,
|
||||
color: 'var(--ion-color-dark)',
|
||||
background: 'transparent',
|
||||
}}
|
||||
|
||||
<div className="metric-pair-row" style={{ marginTop: '12px' }}>
|
||||
<MetricCard
|
||||
label="Outstanding"
|
||||
value={summary.outstandingCredit}
|
||||
icon={walletOutline}
|
||||
loading={loading}
|
||||
/>
|
||||
{(searchLoading || detailsLoading) && (
|
||||
<IonSpinner
|
||||
name="crescent"
|
||||
style={{ width: 20, height: 20, flexShrink: 0 }}
|
||||
<MetricCard
|
||||
label="Repaid (Month)"
|
||||
value={summary.monthRepayments}
|
||||
icon={checkmarkCircleOutline}
|
||||
loading={loading}
|
||||
/>
|
||||
)}
|
||||
{query && !detailsLoading && (
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="pill-toggle"
|
||||
style={{ marginTop: '12px', background: '#ffffff', padding: '8px' }}
|
||||
>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
onClick={clearSearch}
|
||||
aria-label="Clear search"
|
||||
style={
|
||||
{
|
||||
'--border-radius': '999px',
|
||||
'--padding-start': '6px',
|
||||
'--padding-end': '6px',
|
||||
width: 34,
|
||||
height: 34,
|
||||
flexShrink: 0,
|
||||
} as React.CSSProperties
|
||||
}
|
||||
className="bold"
|
||||
style={{
|
||||
flex: 1,
|
||||
fontSize: '13px',
|
||||
color: 'var(--color-text-primary)',
|
||||
}}
|
||||
onClick={() => history.push('/sale/new')}
|
||||
>
|
||||
<IonIcon icon={closeOutline} slot="icon-only" />
|
||||
<IonIcon icon={addCircleOutline} slot="start" />
|
||||
Add Sale
|
||||
</IonButton>
|
||||
)}
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="bold"
|
||||
style={{
|
||||
flex: 1,
|
||||
fontSize: '13px',
|
||||
color: 'var(--color-text-primary)',
|
||||
}}
|
||||
onClick={() => history.push('/credit/new')}
|
||||
>
|
||||
<IonIcon icon={personAddOutline} slot="start" />
|
||||
Credit
|
||||
</IonButton>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
className="bold"
|
||||
style={{
|
||||
flex: 1,
|
||||
fontSize: '13px',
|
||||
color: 'var(--color-text-primary)',
|
||||
}}
|
||||
onClick={() => history.push('/repayment/new')}
|
||||
>
|
||||
<IonIcon icon={cashOutline} slot="start" />
|
||||
Repay
|
||||
</IonButton>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{showSuggestions &&
|
||||
query.trim().length >= 2 &&
|
||||
!searchLoading &&
|
||||
suggestions.length === 0 &&
|
||||
!detailsLoading && (
|
||||
<div
|
||||
style={{
|
||||
marginTop: 10,
|
||||
background: '#ffffff',
|
||||
borderRadius: 18,
|
||||
padding: '14px 16px',
|
||||
color: 'var(--ion-color-medium)',
|
||||
fontSize: 14,
|
||||
boxShadow: '0 10px 28px rgba(15, 23, 42, 0.14)',
|
||||
}}
|
||||
>
|
||||
No places found.
|
||||
<div className="section-header">
|
||||
<h2>Recent activity</h2>
|
||||
<span className="see-all" onClick={() => history.push('/history')}>
|
||||
See all
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showSuggestions && suggestions.length > 0 && (
|
||||
<div className="page-padding" style={{ paddingBottom: '120px' }}>
|
||||
{loading ? (
|
||||
<div className="widget-card" style={{ gap: '16px' }}>
|
||||
{[1, 2, 3].map((i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{ display: 'flex', gap: '12px', alignItems: 'center' }}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
marginTop: 10,
|
||||
background: '#ffffff',
|
||||
borderRadius: 20,
|
||||
overflow: 'hidden',
|
||||
boxShadow: '0 10px 28px rgba(15, 23, 42, 0.14)',
|
||||
}}
|
||||
>
|
||||
{suggestions.map((suggestion) => (
|
||||
<button
|
||||
key={suggestion.placeId}
|
||||
type="button"
|
||||
onClick={() => selectSuggestion(suggestion)}
|
||||
style={{
|
||||
width: '100%',
|
||||
border: 0,
|
||||
background: '#ffffff',
|
||||
padding: '14px 16px',
|
||||
display: 'flex',
|
||||
gap: 12,
|
||||
textAlign: 'left',
|
||||
borderBottom: '1px solid rgba(15, 23, 42, 0.08)',
|
||||
}}
|
||||
>
|
||||
<IonIcon
|
||||
icon={mapOutline}
|
||||
style={{
|
||||
color: 'var(--ion-color-primary)',
|
||||
fontSize: 20,
|
||||
marginTop: 1,
|
||||
flexShrink: 0,
|
||||
width: '40px',
|
||||
height: '40px',
|
||||
borderRadius: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
}}
|
||||
/>
|
||||
<span style={{ minWidth: 0 }}>
|
||||
<strong
|
||||
<div style={{ flex: 1 }}>
|
||||
<div
|
||||
style={{
|
||||
display: 'block',
|
||||
color: 'var(--ion-color-dark)',
|
||||
fontSize: 14,
|
||||
fontWeight: 700,
|
||||
overflow: 'hidden',
|
||||
textOverflow: 'ellipsis',
|
||||
whiteSpace: 'nowrap',
|
||||
width: '60%',
|
||||
height: '12px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
marginBottom: '6px',
|
||||
}}
|
||||
>
|
||||
{suggestion.mainText || suggestion.text}
|
||||
</strong>
|
||||
{suggestion.secondaryText && (
|
||||
<span
|
||||
/>
|
||||
<div
|
||||
style={{
|
||||
display: 'block',
|
||||
marginTop: 3,
|
||||
color: 'var(--ion-color-medium)',
|
||||
fontSize: 12,
|
||||
overflow: 'hidden',
|
||||
textOverflow: 'ellipsis',
|
||||
whiteSpace: 'nowrap',
|
||||
width: '40%',
|
||||
height: '10px',
|
||||
background: 'var(--color-surface-secondary)',
|
||||
borderRadius: '4px',
|
||||
}}
|
||||
>
|
||||
{suggestion.secondaryText}
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
</button>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div
|
||||
slot="fixed"
|
||||
style={{
|
||||
left: 16,
|
||||
right: 16,
|
||||
bottom: 'calc(16px + var(--ion-safe-area-bottom))',
|
||||
position: 'absolute',
|
||||
zIndex: 9,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: '#ffffff',
|
||||
borderRadius: 24,
|
||||
padding: 20,
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: 16,
|
||||
boxShadow: '0 -8px 32px rgba(15, 23, 42, 0.14)',
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
width: selectedPlace?.photoUrl ? 72 : 44,
|
||||
height: selectedPlace?.photoUrl ? 72 : 44,
|
||||
borderRadius: selectedPlace?.photoUrl ? 18 : 14,
|
||||
background: 'rgba(var(--ion-color-primary-rgb), 0.12)',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
flexShrink: 0,
|
||||
overflow: 'hidden',
|
||||
}}
|
||||
>
|
||||
{selectedPlace?.photoUrl ? (
|
||||
<img
|
||||
src={selectedPlace.photoUrl}
|
||||
alt={selectedPlace.name}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
objectFit: 'cover',
|
||||
display: 'block',
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<IonIcon
|
||||
icon={mapOutline}
|
||||
style={{ fontSize: 22, color: 'var(--ion-color-primary)' }}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<div style={{ flex: 1, minWidth: 0 }}>
|
||||
<h1
|
||||
style={{
|
||||
margin: '0 0 4px',
|
||||
fontSize: 18,
|
||||
fontWeight: 700,
|
||||
color: 'var(--ion-color-dark)',
|
||||
overflow: 'hidden',
|
||||
textOverflow: 'ellipsis',
|
||||
whiteSpace: 'nowrap',
|
||||
}}
|
||||
>
|
||||
{selectedPlace?.name ?? 'Explore the map'}
|
||||
</h1>
|
||||
<p
|
||||
style={{
|
||||
margin: 0,
|
||||
color: 'var(--ion-color-medium)',
|
||||
fontSize: 13,
|
||||
lineHeight: 1.4,
|
||||
}}
|
||||
>
|
||||
{selectedPlace?.address ??
|
||||
'Search for a place to drop a marker.'}
|
||||
</p>
|
||||
</div>
|
||||
<IonButton
|
||||
fill="clear"
|
||||
onClick={recenterMap}
|
||||
aria-label="Recenter map"
|
||||
style={
|
||||
{
|
||||
'--border-radius': '999px',
|
||||
'--padding-start': '10px',
|
||||
'--padding-end': '10px',
|
||||
flexShrink: 0,
|
||||
} as React.CSSProperties
|
||||
) : summary.recentActivity.length > 0 ? (
|
||||
<div className="widget-card" style={{ padding: '8px 16px' }}>
|
||||
{summary.recentActivity.map((item) => (
|
||||
<ActivityRow
|
||||
key={`${item.type}-${item.id}`}
|
||||
item={item}
|
||||
onClick={
|
||||
item.customerId
|
||||
? () => history.push(`/customers/${item.customerId}`)
|
||||
: undefined
|
||||
}
|
||||
>
|
||||
<IonIcon icon={locateOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</div>
|
||||
|
||||
{mapError && (
|
||||
<div
|
||||
style={{
|
||||
marginTop: 12,
|
||||
background: '#ffffff',
|
||||
borderRadius: 16,
|
||||
padding: '12px 16px',
|
||||
color: 'var(--ion-color-danger)',
|
||||
fontSize: 13,
|
||||
lineHeight: 1.4,
|
||||
}}
|
||||
>
|
||||
{mapError}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<EmptyState
|
||||
icon={receiptOutline}
|
||||
title="No activity yet"
|
||||
description="Record your first sale or credit to see it here."
|
||||
actionText="Add Sale"
|
||||
onAction={() => history.push('/sale/new')}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<IonActionSheet
|
||||
isOpen={showQuickActions}
|
||||
onDidDismiss={() => setShowQuickActions(false)}
|
||||
header="Settings"
|
||||
buttons={[
|
||||
{
|
||||
text: 'Sign Out',
|
||||
role: 'destructive',
|
||||
handler: () => {
|
||||
supabase.auth.signOut();
|
||||
},
|
||||
},
|
||||
{
|
||||
text: 'Cancel',
|
||||
role: 'cancel',
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
import React, { useState } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonInput,
|
||||
IonButton,
|
||||
IonSpinner,
|
||||
IonIcon,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
|
||||
const NewPasswordPage: React.FC = () => {
|
||||
const [password, setPassword] = useState('');
|
||||
const [confirmPassword, setConfirmPassword] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
|
||||
const history = useHistory();
|
||||
|
||||
const showMessage = (msg: string) => {
|
||||
setMessage(msg);
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
};
|
||||
|
||||
const handleUpdate = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!password || !confirmPassword) {
|
||||
showMessage('Please fill in all fields');
|
||||
return;
|
||||
}
|
||||
|
||||
if (password.length < 6) {
|
||||
showMessage('Password must be at least 6 characters');
|
||||
return;
|
||||
}
|
||||
|
||||
if (password !== confirmPassword) {
|
||||
showMessage('Passwords do not match');
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
const { error } = await supabase.auth.updateUser({ password });
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
history.push('/home');
|
||||
} catch (err: any) {
|
||||
showMessage(err.message || 'An error occurred');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.52) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<div className="auth-shell">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
color="dark"
|
||||
onClick={() => history.push('/auth')}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 'calc(var(--ion-safe-area-top, 0px) + 8px)',
|
||||
left: '8px',
|
||||
'--padding-start': '8px',
|
||||
'--padding-end': '8px',
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: '#ffffff',
|
||||
width: '44px',
|
||||
height: '44px',
|
||||
borderRadius: '12px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonIcon icon={chevronBackOutline} />
|
||||
</div>
|
||||
</IonButton>
|
||||
|
||||
<div style={{ marginTop: '80px' }}>
|
||||
<h1
|
||||
className="bold"
|
||||
style={{ fontSize: '24px', margin: '0 0 8px 0' }}
|
||||
>
|
||||
Create new password
|
||||
</h1>
|
||||
<p
|
||||
className="secondary-text"
|
||||
style={{ margin: '0', fontSize: '14px' }}
|
||||
>
|
||||
Set a strong password to protect your account.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="auth-card">
|
||||
<form
|
||||
onSubmit={handleUpdate}
|
||||
style={{ display: 'flex', flexDirection: 'column', gap: '16px' }}
|
||||
>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="New Password"
|
||||
labelPlacement="floating"
|
||||
type="password"
|
||||
placeholder="Min. 6 characters"
|
||||
value={password}
|
||||
onIonChange={(e) => setPassword(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
label="Confirm Password"
|
||||
labelPlacement="floating"
|
||||
type="password"
|
||||
placeholder="Repeat your password"
|
||||
value={confirmPassword}
|
||||
onIonChange={(e) => setConfirmPassword(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background: 'var(--color-danger-soft)',
|
||||
color: 'var(--ion-color-danger-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
type="submit"
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '8px',
|
||||
}}
|
||||
disabled={submitting}
|
||||
>
|
||||
{submitting ? (
|
||||
<IonSpinner name="crescent" />
|
||||
) : (
|
||||
'Update password'
|
||||
)}
|
||||
</IonButton>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default NewPasswordPage;
|
||||
@@ -0,0 +1,353 @@
|
||||
import React, { useState, useEffect, useMemo } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
IonTitle,
|
||||
IonButtons,
|
||||
IonButton,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonTextarea,
|
||||
IonSpinner,
|
||||
IonLabel,
|
||||
IonSelect,
|
||||
IonSelectOption,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory, useLocation } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { getTodayISO } from '../utils/dates';
|
||||
import MoneyInput from '../components/MoneyInput';
|
||||
import { parseMoney, formatMoney } from '../utils/money';
|
||||
import EmptyState from '../components/EmptyState';
|
||||
|
||||
interface CustomerWithBalance {
|
||||
id: string;
|
||||
name: string;
|
||||
balance: number;
|
||||
}
|
||||
|
||||
const RepaymentFormPage: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const location = useLocation<{ customerId?: string }>();
|
||||
const { user, profile } = useAuth();
|
||||
const currency = profile?.currency || 'USD';
|
||||
|
||||
const [customers, setCustomers] = useState<CustomerWithBalance[]>([]);
|
||||
const [selectedCustomerId, setSelectedCustomerId] = useState<string>(
|
||||
location.state?.customerId || ''
|
||||
);
|
||||
const [amount, setAmount] = useState('');
|
||||
const [repaymentDate, setRepaymentDate] = useState(getTodayISO());
|
||||
const [note, setNote] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [loadingCustomers, setLoadingCustomers] = useState(true);
|
||||
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchCustomersAndBalances = async () => {
|
||||
if (!user) return;
|
||||
try {
|
||||
const [
|
||||
{ data: customersData },
|
||||
{ data: creditsData },
|
||||
{ data: repaymentsData },
|
||||
] = await Promise.all([
|
||||
supabase
|
||||
.from('credit_customers')
|
||||
.select('id, name')
|
||||
.eq('user_id', user.id),
|
||||
supabase
|
||||
.from('credits')
|
||||
.select('customer_id, amount')
|
||||
.eq('user_id', user.id),
|
||||
supabase
|
||||
.from('repayments')
|
||||
.select('customer_id, amount')
|
||||
.eq('user_id', user.id),
|
||||
]);
|
||||
|
||||
const customerBalances: CustomerWithBalance[] = (
|
||||
customersData || []
|
||||
).map((c) => {
|
||||
const totalCredits = (creditsData || [])
|
||||
.filter((cr) => cr.customer_id === c.id)
|
||||
.reduce((sum, cr) => sum + Number(cr.amount), 0);
|
||||
const totalRepayments = (repaymentsData || [])
|
||||
.filter((r) => r.customer_id === c.id)
|
||||
.reduce((sum, r) => sum + Number(r.amount), 0);
|
||||
return {
|
||||
id: c.id,
|
||||
name: c.name,
|
||||
balance: Math.max(0, totalCredits - totalRepayments),
|
||||
};
|
||||
});
|
||||
|
||||
// Filter for customers with an outstanding balance
|
||||
const activeCustomers = customerBalances.filter((c) => c.balance > 0);
|
||||
setCustomers(activeCustomers);
|
||||
|
||||
// If a customer was passed in but has no balance, we should handle it
|
||||
if (
|
||||
selectedCustomerId &&
|
||||
!activeCustomers.find((c) => c.id === selectedCustomerId)
|
||||
) {
|
||||
setSelectedCustomerId('');
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error fetching customers for repayment:', err);
|
||||
} finally {
|
||||
setLoadingCustomers(false);
|
||||
}
|
||||
};
|
||||
|
||||
fetchCustomersAndBalances();
|
||||
}, [user, selectedCustomerId]);
|
||||
|
||||
const selectedCustomer = useMemo(
|
||||
() => customers.find((c) => c.id === selectedCustomerId),
|
||||
[customers, selectedCustomerId]
|
||||
);
|
||||
|
||||
const validate = () => {
|
||||
const newErrors: Record<string, string> = {};
|
||||
const parsedAmount = parseMoney(amount);
|
||||
|
||||
if (!selectedCustomerId) {
|
||||
newErrors.customer = 'Please select a customer';
|
||||
} else if (selectedCustomer && parsedAmount > selectedCustomer.balance) {
|
||||
newErrors.amount = `Amount cannot exceed outstanding balance of ${formatMoney(
|
||||
selectedCustomer.balance,
|
||||
currency
|
||||
)}`;
|
||||
}
|
||||
|
||||
if (parsedAmount <= 0) {
|
||||
newErrors.amount = 'Amount must be greater than 0';
|
||||
}
|
||||
|
||||
if (!repaymentDate) {
|
||||
newErrors.date = 'Date is required';
|
||||
}
|
||||
|
||||
setErrors(newErrors);
|
||||
return Object.keys(newErrors).length === 0;
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!validate() || !user) return;
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
const { error } = await supabase.from('repayments').insert([
|
||||
{
|
||||
user_id: user.id,
|
||||
customer_id: selectedCustomerId,
|
||||
amount: parseMoney(amount),
|
||||
repayment_date: repaymentDate,
|
||||
note: note.trim() || null,
|
||||
},
|
||||
]);
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
history.goBack();
|
||||
} catch (err: any) {
|
||||
console.error('Error saving repayment:', err);
|
||||
setMessage(err.message || 'Could not save repayment');
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar style={{ '--background': '#f0f4ff' }}>
|
||||
<IonButtons slot="start">
|
||||
<IonButton color="dark" onClick={() => history.goBack()}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle className="bold">Record repayment</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent className="ion-padding" style={{ '--background': '#f0f4ff' }}>
|
||||
{!loadingCustomers && customers.length === 0 ? (
|
||||
<EmptyState
|
||||
icon="wallet-outline"
|
||||
title="No outstanding credit"
|
||||
description="You don't have any customers with an outstanding balance right now."
|
||||
actionText="Add Credit"
|
||||
onAction={() => history.push('/credit/new')}
|
||||
/>
|
||||
) : (
|
||||
<div className="form-card">
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Select Customer
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonSelect
|
||||
interface="action-sheet"
|
||||
placeholder="Choose a customer"
|
||||
value={selectedCustomerId}
|
||||
onIonChange={(e) => setSelectedCustomerId(e.detail.value)}
|
||||
style={{ width: '100%' }}
|
||||
disabled={loadingCustomers}
|
||||
>
|
||||
{customers.map((c) => (
|
||||
<IonSelectOption key={c.id} value={c.id}>
|
||||
{c.name} ({formatMoney(c.balance, currency)})
|
||||
</IonSelectOption>
|
||||
))}
|
||||
</IonSelect>
|
||||
</div>
|
||||
{errors.customer && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.customer}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{selectedCustomer && (
|
||||
<div
|
||||
style={{
|
||||
background: 'rgba(99,102,241,0.10)',
|
||||
borderRadius: '12px',
|
||||
padding: '16px',
|
||||
display: 'flex',
|
||||
flexDirection: 'column',
|
||||
gap: '4px',
|
||||
}}
|
||||
>
|
||||
<span className="tertiary-text" style={{ fontSize: '10px' }}>
|
||||
OUTSTANDING BALANCE
|
||||
</span>
|
||||
<span
|
||||
className="bold tabular"
|
||||
style={{
|
||||
fontSize: '22px',
|
||||
color: 'var(--ion-color-primary)',
|
||||
}}
|
||||
>
|
||||
{formatMoney(selectedCustomer.balance, currency)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<MoneyInput
|
||||
label="Repayment amount"
|
||||
value={amount}
|
||||
onValueChange={(val) => {
|
||||
setAmount(val);
|
||||
if (errors.amount) setErrors({ ...errors, amount: '' });
|
||||
}}
|
||||
error={errors.amount}
|
||||
/>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Repayment date
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
type="date"
|
||||
value={repaymentDate}
|
||||
onIonChange={(e) => setRepaymentDate(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
{errors.date && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.date}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Note (optional)
|
||||
</IonLabel>
|
||||
<div
|
||||
className="input-wrapper"
|
||||
style={{ minHeight: '96px', padding: '8px 16px' }}
|
||||
>
|
||||
<IonTextarea
|
||||
placeholder="e.g. Paid in full"
|
||||
value={note}
|
||||
onIonChange={(e) => setNote(e.detail.value!)}
|
||||
rows={4}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background: 'var(--color-danger-soft)',
|
||||
color: 'var(--ion-color-danger-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '16px',
|
||||
}}
|
||||
disabled={submitting || loadingCustomers}
|
||||
onClick={handleSave}
|
||||
>
|
||||
{submitting ? <IonSpinner name="crescent" /> : 'Save repayment'}
|
||||
</IonButton>
|
||||
</div>
|
||||
)}
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default RepaymentFormPage;
|
||||
@@ -0,0 +1,188 @@
|
||||
import React, { useState } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonHeader,
|
||||
IonToolbar,
|
||||
IonTitle,
|
||||
IonButtons,
|
||||
IonButton,
|
||||
IonIcon,
|
||||
IonInput,
|
||||
IonTextarea,
|
||||
IonSpinner,
|
||||
IonLabel,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { getTodayISO } from '../utils/dates';
|
||||
import MoneyInput from '../components/MoneyInput';
|
||||
import { parseMoney } from '../utils/money';
|
||||
|
||||
const SaleFormPage: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const { user } = useAuth();
|
||||
|
||||
const [amount, setAmount] = useState('');
|
||||
const [saleDate, setSaleDate] = useState(getTodayISO());
|
||||
const [note, setNote] = useState('');
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
|
||||
const validate = () => {
|
||||
const newErrors: Record<string, string> = {};
|
||||
const parsedAmount = parseMoney(amount);
|
||||
|
||||
if (parsedAmount <= 0) {
|
||||
newErrors.amount = 'Amount must be greater than 0';
|
||||
}
|
||||
if (!saleDate) {
|
||||
newErrors.date = 'Date is required';
|
||||
}
|
||||
|
||||
setErrors(newErrors);
|
||||
return Object.keys(newErrors).length === 0;
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!validate() || !user) return;
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
const { error } = await supabase.from('sales').insert([
|
||||
{
|
||||
user_id: user.id,
|
||||
amount: parseMoney(amount),
|
||||
sale_date: saleDate,
|
||||
note: note.trim() || null,
|
||||
},
|
||||
]);
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
history.goBack();
|
||||
} catch (err: any) {
|
||||
console.error('Error saving sale:', err);
|
||||
setMessage(err.message || 'Could not save sale');
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonHeader className="ion-no-border">
|
||||
<IonToolbar style={{ '--background': '#f0f4ff' }}>
|
||||
<IonButtons slot="start">
|
||||
<IonButton color="dark" onClick={() => history.goBack()}>
|
||||
<IonIcon icon={chevronBackOutline} slot="icon-only" />
|
||||
</IonButton>
|
||||
</IonButtons>
|
||||
<IonTitle className="bold">Add sale</IonTitle>
|
||||
</IonToolbar>
|
||||
</IonHeader>
|
||||
|
||||
<IonContent className="ion-padding" style={{ '--background': '#f0f4ff' }}>
|
||||
<div className="form-card">
|
||||
<MoneyInput
|
||||
label="Sale amount"
|
||||
value={amount}
|
||||
onValueChange={(val) => {
|
||||
setAmount(val);
|
||||
if (errors.amount) setErrors({ ...errors, amount: '' });
|
||||
}}
|
||||
error={errors.amount}
|
||||
/>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Sale date
|
||||
</IonLabel>
|
||||
<div className="input-wrapper">
|
||||
<IonInput
|
||||
type="date"
|
||||
value={saleDate}
|
||||
onIonChange={(e) => setSaleDate(e.detail.value!)}
|
||||
/>
|
||||
</div>
|
||||
{errors.date && (
|
||||
<IonLabel
|
||||
color="danger"
|
||||
style={{ fontSize: '12px', marginTop: '4px' }}
|
||||
>
|
||||
{errors.date}
|
||||
</IonLabel>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="form-field">
|
||||
<IonLabel
|
||||
className="semibold"
|
||||
style={{
|
||||
marginBottom: '8px',
|
||||
display: 'block',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
Note (optional)
|
||||
</IonLabel>
|
||||
<div
|
||||
className="input-wrapper"
|
||||
style={{ minHeight: '96px', padding: '8px 16px' }}
|
||||
>
|
||||
<IonTextarea
|
||||
placeholder="e.g. Morning rush items"
|
||||
value={note}
|
||||
onIonChange={(e) => setNote(e.detail.value!)}
|
||||
rows={4}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background: 'var(--color-danger-soft)',
|
||||
color: 'var(--ion-color-danger-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '16px',
|
||||
}}
|
||||
disabled={submitting}
|
||||
onClick={handleSave}
|
||||
>
|
||||
{submitting ? <IonSpinner name="crescent" /> : 'Save sale'}
|
||||
</IonButton>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default SaleFormPage;
|
||||
@@ -0,0 +1,275 @@
|
||||
import React, { useState, useRef, useEffect } from 'react';
|
||||
import {
|
||||
IonContent,
|
||||
IonPage,
|
||||
IonInput,
|
||||
IonButton,
|
||||
IonSpinner,
|
||||
IonIcon,
|
||||
IonText,
|
||||
} from '@ionic/react';
|
||||
import { chevronBackOutline } from 'ionicons/icons';
|
||||
import { useHistory, useLocation } from 'react-router-dom';
|
||||
import { supabase } from '../supabase';
|
||||
|
||||
interface LocationState {
|
||||
email: string;
|
||||
type?: 'signup' | 'recovery';
|
||||
resent?: boolean;
|
||||
}
|
||||
|
||||
const VerifyEmailPage: React.FC = () => {
|
||||
const history = useHistory();
|
||||
const location = useLocation<LocationState>();
|
||||
const email = location.state?.email || '';
|
||||
const type = location.state?.type || 'signup';
|
||||
|
||||
const [digits, setDigits] = useState<string[]>(['', '', '', '', '', '']);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const [resending, setResending] = useState(false);
|
||||
const [cooldown, setCooldown] = useState(location.state?.resent ? 60 : 0);
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [messageType, setMessageType] = useState<'error' | 'success'>('error');
|
||||
|
||||
const inputRefs = useRef<HTMLIonInputElement[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
if (cooldown > 0) {
|
||||
const timer = setInterval(() => {
|
||||
setCooldown((c) => c - 1);
|
||||
}, 1000);
|
||||
return () => clearInterval(timer);
|
||||
}
|
||||
}, [cooldown]);
|
||||
|
||||
const showMessage = (msg: string, type: 'error' | 'success' = 'error') => {
|
||||
setMessage(msg);
|
||||
setMessageType(type);
|
||||
setTimeout(() => setMessage(null), 4000);
|
||||
};
|
||||
|
||||
const handleDigitChange = (index: number, value: string) => {
|
||||
const newDigits = [...digits];
|
||||
// Only take the last character (for overwriting)
|
||||
const val = value.slice(-1);
|
||||
|
||||
if (val && !/^\d+$/.test(val)) return;
|
||||
|
||||
newDigits[index] = val;
|
||||
setDigits(newDigits);
|
||||
|
||||
if (val && index < 5) {
|
||||
inputRefs.current[index + 1]?.setFocus();
|
||||
}
|
||||
};
|
||||
|
||||
const handleKeyDown = (index: number, e: any) => {
|
||||
if (e.key === 'Backspace' && !digits[index] && index > 0) {
|
||||
inputRefs.current[index - 1]?.setFocus();
|
||||
}
|
||||
};
|
||||
|
||||
const handleVerify = async () => {
|
||||
const code = digits.join('');
|
||||
if (code.length < 6) {
|
||||
showMessage('Please enter the 6-digit code');
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmitting(true);
|
||||
setMessage(null);
|
||||
|
||||
try {
|
||||
const { data, error } = await supabase.auth.verifyOtp({
|
||||
email,
|
||||
token: code,
|
||||
type: (type === 'recovery' ? 'recovery' : 'signup') as any,
|
||||
});
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
if (type === 'recovery') {
|
||||
history.push('/new-password');
|
||||
} else {
|
||||
history.push('/home');
|
||||
}
|
||||
} catch (err: any) {
|
||||
showMessage(err.message || 'Invalid or expired code');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleResend = async () => {
|
||||
if (cooldown > 0) return;
|
||||
|
||||
setResending(true);
|
||||
try {
|
||||
const { error } = await supabase.auth.resend({
|
||||
type: (type === 'recovery' ? 'recovery' : 'signup') as any,
|
||||
email,
|
||||
});
|
||||
|
||||
if (error) throw error;
|
||||
|
||||
showMessage('A new code has been sent', 'success');
|
||||
setCooldown(60);
|
||||
} catch (err: any) {
|
||||
showMessage(err.message || 'Failed to resend code');
|
||||
} finally {
|
||||
setResending(false);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<IonPage>
|
||||
<IonContent
|
||||
fullscreen
|
||||
style={{
|
||||
'--background':
|
||||
'linear-gradient(160deg, rgba(199,210,254,0.52) 0%, #f0f4ff 58%, #f8fafc 100%)',
|
||||
}}
|
||||
>
|
||||
<div className="auth-shell">
|
||||
<IonButton
|
||||
fill="clear"
|
||||
color="dark"
|
||||
onClick={() => history.push('/auth')}
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 'calc(var(--ion-safe-area-top, 0px) + 8px)',
|
||||
left: '8px',
|
||||
'--padding-start': '8px',
|
||||
'--padding-end': '8px',
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
background: '#ffffff',
|
||||
width: '44px',
|
||||
height: '44px',
|
||||
borderRadius: '12px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonIcon icon={chevronBackOutline} />
|
||||
</div>
|
||||
</IonButton>
|
||||
|
||||
<div style={{ marginTop: '80px' }}>
|
||||
<h1
|
||||
className="bold"
|
||||
style={{ fontSize: '24px', margin: '0 0 8px 0' }}
|
||||
>
|
||||
Verify your email
|
||||
</h1>
|
||||
<p
|
||||
className="secondary-text"
|
||||
style={{ margin: '0', fontSize: '14px' }}
|
||||
>
|
||||
We've sent a 6-digit code to <span className="bold">{email}</span>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="auth-card">
|
||||
<div
|
||||
style={{ display: 'flex', gap: '8px', justifyContent: 'center' }}
|
||||
>
|
||||
{digits.map((digit, i) => (
|
||||
<div
|
||||
key={i}
|
||||
style={{
|
||||
width: '44px',
|
||||
height: '52px',
|
||||
background: '#e8edf8',
|
||||
borderRadius: '12px',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
}}
|
||||
>
|
||||
<IonInput
|
||||
ref={(el) => {
|
||||
inputRefs.current[i] = el!;
|
||||
}}
|
||||
value={digit}
|
||||
onIonInput={(e) => handleDigitChange(i, e.detail.value!)}
|
||||
onKeyDown={(e) => handleKeyDown(i, e)}
|
||||
type="text"
|
||||
inputMode="numeric"
|
||||
style={{
|
||||
textAlign: 'center',
|
||||
fontSize: '22px',
|
||||
fontWeight: '700',
|
||||
color: '#111827',
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{message && (
|
||||
<div
|
||||
style={{
|
||||
background:
|
||||
messageType === 'error'
|
||||
? 'var(--color-danger-soft)'
|
||||
: 'var(--color-success-soft)',
|
||||
color:
|
||||
messageType === 'error'
|
||||
? 'var(--ion-color-danger-shade)'
|
||||
: 'var(--ion-color-success-shade)',
|
||||
padding: '12px',
|
||||
borderRadius: '12px',
|
||||
fontSize: '13px',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<IonButton
|
||||
expand="block"
|
||||
className="bold"
|
||||
style={{
|
||||
height: '52px',
|
||||
'--border-radius': 'var(--radius-pill)',
|
||||
marginTop: '16px',
|
||||
}}
|
||||
disabled={submitting}
|
||||
onClick={handleVerify}
|
||||
>
|
||||
{submitting ? <IonSpinner name="crescent" /> : 'Verify code'}
|
||||
</IonButton>
|
||||
|
||||
<div style={{ textAlign: 'center', marginTop: '8px' }}>
|
||||
<IonText
|
||||
color={cooldown > 0 ? 'medium' : 'primary'}
|
||||
className="semibold"
|
||||
style={{
|
||||
fontSize: '13px',
|
||||
cursor: cooldown > 0 ? 'default' : 'pointer',
|
||||
}}
|
||||
onClick={handleResend}
|
||||
>
|
||||
{resending ? (
|
||||
<IonSpinner name="dots" />
|
||||
) : cooldown > 0 ? (
|
||||
`Resend in ${cooldown}s`
|
||||
) : (
|
||||
'Resend code'
|
||||
)}
|
||||
</IonText>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</IonContent>
|
||||
</IonPage>
|
||||
);
|
||||
};
|
||||
|
||||
export default VerifyEmailPage;
|
||||
+2
-2
@@ -2,6 +2,6 @@ import { createClient } from '@supabase/supabase-js';
|
||||
import type { Database } from './database.types';
|
||||
|
||||
export const supabase = createClient<Database>(
|
||||
'https://twfddmesszhmlsvdgrcv.supabase.co',
|
||||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InR3ZmRkbWVzc3pobWxzdmRncmN2Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3Nzk1Njg0NDQsImV4cCI6MjA5NTE0NDQ0NH0.52RDOTgew7wQLK4dILj_Trxox7VLr7pv6dYX--UO10M',
|
||||
'https://sxdbfylkgcfmsatqipli.supabase.co',
|
||||
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InN4ZGJmeWxrZ2NmbXNhdHFpcGxpIiwicm9sZSI6ImFub24iLCJpYXQiOjE3ODExMTI5NjcsImV4cCI6MjA5NjY4ODk2N30.8ZvpjRBskCIH3FFnOkWsxZCOwNMX5txinffgXMDinKI',
|
||||
);
|
||||
|
||||
Vendored
+51
@@ -0,0 +1,51 @@
|
||||
// Ambient test globals for optional *.test.* files in the editor / tsc.
|
||||
// No test runner is installed in the template; stubs avoid spurious TS errors.
|
||||
|
||||
interface Matchers<R = void> {
|
||||
toBeDefined(): R;
|
||||
toBe(expected: unknown): R;
|
||||
toEqual(expected: unknown): R;
|
||||
toBeTruthy(): R;
|
||||
toBeFalsy(): R;
|
||||
toBeNull(): R;
|
||||
toContain(item: unknown): R;
|
||||
toHaveLength(length: number): R;
|
||||
toMatch(expected: string | RegExp): R;
|
||||
toThrow(expected?: string | RegExp | Error): R;
|
||||
not: Matchers<R>;
|
||||
}
|
||||
|
||||
interface Expect {
|
||||
<T = unknown>(actual: T): Matchers;
|
||||
}
|
||||
|
||||
declare const expect: Expect;
|
||||
|
||||
type TestCaseFn = (
|
||||
name: string,
|
||||
fn?: () => void | Promise<void>,
|
||||
timeout?: number,
|
||||
) => void;
|
||||
|
||||
declare const test: TestCaseFn;
|
||||
declare const it: TestCaseFn;
|
||||
declare const describe: TestCaseFn;
|
||||
|
||||
declare function beforeEach(fn: () => void | Promise<void>): void;
|
||||
declare function afterEach(fn: () => void | Promise<void>): void;
|
||||
declare function beforeAll(fn: () => void | Promise<void>): void;
|
||||
declare function afterAll(fn: () => void | Promise<void>): void;
|
||||
|
||||
declare module "@testing-library/react" {
|
||||
export function render(
|
||||
ui: unknown,
|
||||
options?: object,
|
||||
): {
|
||||
baseElement: Element;
|
||||
container: Element;
|
||||
unmount(): void;
|
||||
rerender(ui: unknown): void;
|
||||
};
|
||||
export const screen: Record<string, (...args: unknown[]) => Element>;
|
||||
export function cleanup(): void;
|
||||
}
|
||||
+274
-48
@@ -1,65 +1,291 @@
|
||||
/* Ionic CSS Variables — customise to match your app's brand */
|
||||
/* ShopKeep — Custom Palette & Shared Styles */
|
||||
:root {
|
||||
--ion-color-primary: #3880ff;
|
||||
--ion-color-primary-rgb: 56, 128, 255;
|
||||
/** ShopKeep Brand Palette **/
|
||||
--ion-color-primary: #6366f1;
|
||||
--ion-color-primary-rgb: 99, 102, 241;
|
||||
--ion-color-primary-contrast: #ffffff;
|
||||
--ion-color-primary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-primary-shade: #3171e0;
|
||||
--ion-color-primary-tint: #4c8dff;
|
||||
--ion-color-primary-shade: #5759d4;
|
||||
--ion-color-primary-tint: #7375f2;
|
||||
|
||||
--ion-color-secondary: #3dc2ff;
|
||||
--ion-color-secondary-rgb: 61, 194, 255;
|
||||
--ion-color-secondary: #818cf8;
|
||||
--ion-color-secondary-rgb: 129, 140, 248;
|
||||
--ion-color-secondary-contrast: #ffffff;
|
||||
--ion-color-secondary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-secondary-shade: #36abe0;
|
||||
--ion-color-secondary-tint: #50c8ff;
|
||||
--ion-color-secondary-shade: #727bda;
|
||||
--ion-color-secondary-tint: #8e98f9;
|
||||
|
||||
--ion-color-tertiary: #5260ff;
|
||||
--ion-color-tertiary-rgb: 82, 96, 255;
|
||||
--ion-color-tertiary-contrast: #ffffff;
|
||||
--ion-color-tertiary-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-tertiary-shade: #4854e0;
|
||||
--ion-color-tertiary-tint: #6370ff;
|
||||
--ion-color-tertiary: #c7d2fe;
|
||||
--ion-color-tertiary-rgb: 199, 210, 254;
|
||||
--ion-color-tertiary-contrast: #111827;
|
||||
--ion-color-tertiary-contrast-rgb: 17, 24, 39;
|
||||
--ion-color-tertiary-shade: #afb9e0;
|
||||
--ion-color-tertiary-tint: #cdd7fe;
|
||||
|
||||
--ion-color-success: #2dd36f;
|
||||
--ion-color-success-rgb: 45, 211, 111;
|
||||
--ion-color-success: #3aa67a;
|
||||
--ion-color-success-rgb: 58, 166, 122;
|
||||
--ion-color-success-contrast: #ffffff;
|
||||
--ion-color-success-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-success-shade: #28ba62;
|
||||
--ion-color-success-tint: #42d77d;
|
||||
--ion-color-success-shade: #33926b;
|
||||
--ion-color-success-tint: #4eb088;
|
||||
|
||||
--ion-color-warning: #ffc409;
|
||||
--ion-color-warning-rgb: 255, 196, 9;
|
||||
--ion-color-warning-contrast: #000000;
|
||||
--ion-color-warning-contrast-rgb: 0, 0, 0;
|
||||
--ion-color-warning-shade: #e0ac08;
|
||||
--ion-color-warning-tint: #ffca22;
|
||||
|
||||
--ion-color-danger: #eb445a;
|
||||
--ion-color-danger-rgb: 235, 68, 90;
|
||||
--ion-color-danger: #cf6679;
|
||||
--ion-color-danger-rgb: 207, 102, 121;
|
||||
--ion-color-danger-contrast: #ffffff;
|
||||
--ion-color-danger-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-danger-shade: #cf3c4f;
|
||||
--ion-color-danger-tint: #ed576b;
|
||||
--ion-color-danger-shade: #b65a6a;
|
||||
--ion-color-danger-tint: #d57587;
|
||||
|
||||
--ion-color-dark: #222428;
|
||||
--ion-color-dark-rgb: 34, 36, 40;
|
||||
--ion-color-dark-contrast: #ffffff;
|
||||
--ion-color-dark-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-dark-shade: #1e2023;
|
||||
--ion-color-dark-tint: #383a3e;
|
||||
--ion-color-light: #f3f5fb;
|
||||
--ion-color-light-rgb: 243, 245, 251;
|
||||
--ion-color-light-contrast: #111827;
|
||||
--ion-color-light-contrast-rgb: 17, 24, 39;
|
||||
--ion-color-light-shade: #d6d8dd;
|
||||
--ion-color-light-tint: #f4f6fb;
|
||||
|
||||
--ion-color-medium: #92949c;
|
||||
--ion-color-medium-rgb: 146, 148, 156;
|
||||
--ion-color-medium-contrast: #ffffff;
|
||||
--ion-color-medium-contrast-rgb: 255, 255, 255;
|
||||
--ion-color-medium-shade: #808289;
|
||||
--ion-color-medium-tint: #9d9fa6;
|
||||
/** App Custom Tokens **/
|
||||
--color-bg: #f0f4ff;
|
||||
--color-surface: #ffffff;
|
||||
--color-surface-secondary: #e8edf8;
|
||||
--color-text-primary: #111827;
|
||||
--color-text-secondary: rgba(17, 24, 39, 0.6);
|
||||
--color-text-tertiary: rgba(17, 24, 39, 0.38);
|
||||
--color-accent-soft: rgba(99, 102, 241, 0.18);
|
||||
--color-success-soft: rgba(58, 166, 122, 0.12);
|
||||
--color-danger-soft: rgba(207, 102, 121, 0.12);
|
||||
|
||||
--ion-color-light: #f4f5f8;
|
||||
--ion-color-light-rgb: 244, 245, 248;
|
||||
--ion-color-light-contrast: #000000;
|
||||
--ion-color-light-contrast-rgb: 0, 0, 0;
|
||||
--ion-color-light-shade: #d7d8da;
|
||||
--ion-color-light-tint: #f5f6f9;
|
||||
/** Radii **/
|
||||
--radius-pill: 999px;
|
||||
--radius-card: 24px;
|
||||
--radius-inner: 12px;
|
||||
|
||||
/** Typography **/
|
||||
--font-tabular: 'SF Mono', 'Roboto Mono', Menlo, monospace;
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--color-bg);
|
||||
color: var(--color-text-primary);
|
||||
font-family:
|
||||
-apple-system, BlinkMacSystemFont, 'Inter', Roboto, Helvetica, Arial,
|
||||
sans-serif;
|
||||
}
|
||||
|
||||
/** Shared Auth Styles **/
|
||||
.auth-shell {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 24px;
|
||||
padding: calc(var(--ion-safe-area-top, 0px) + 18px) 20px
|
||||
calc(var(--ion-safe-area-bottom, 0px) + 28px);
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
.auth-card {
|
||||
background: var(--color-surface);
|
||||
border-radius: var(--radius-card);
|
||||
padding: 24px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
/** Shared Form Styles **/
|
||||
.form-card {
|
||||
background: var(--color-surface);
|
||||
border-radius: var(--radius-card);
|
||||
padding: 20px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.form-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.input-wrapper {
|
||||
background: var(--color-surface-secondary);
|
||||
border-radius: var(--radius-inner);
|
||||
padding: 0 16px;
|
||||
min-height: 52px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.input-wrapper ion-input,
|
||||
.input-wrapper ion-textarea,
|
||||
.input-wrapper ion-select {
|
||||
--padding-start: 0;
|
||||
--padding-end: 0;
|
||||
--placeholder-color: var(--color-text-tertiary);
|
||||
--placeholder-opacity: 1;
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.money-input-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/** Widget Styles **/
|
||||
.widget-card {
|
||||
background: var(--color-surface);
|
||||
border-radius: var(--radius-card);
|
||||
padding: 20px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.metric-pair-row {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.metric-pair-row .widget-card {
|
||||
flex: 1;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.skeleton-text {
|
||||
animation: skeleton-loading 1s linear infinite alternate;
|
||||
}
|
||||
|
||||
@keyframes skeleton-loading {
|
||||
0% {
|
||||
background-color: var(--color-surface-secondary);
|
||||
opacity: 0.5;
|
||||
}
|
||||
100% {
|
||||
background-color: var(--color-surface-secondary);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
/** Icon Containers **/
|
||||
.icon-container {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: var(--radius-inner);
|
||||
background: var(--color-accent-soft);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
color: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
.icon-container ion-icon {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
/** Tab Bar Styling **/
|
||||
ion-tab-bar {
|
||||
--background: var(--color-surface);
|
||||
--border-width: 0;
|
||||
height: calc(64px + var(--ion-safe-area-bottom));
|
||||
padding-bottom: var(--ion-safe-area-bottom);
|
||||
border-top-left-radius: var(--radius-card);
|
||||
border-top-right-radius: var(--radius-card);
|
||||
box-shadow: 0 -8px 24px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
ion-tab-button {
|
||||
--color: var(--color-text-tertiary);
|
||||
--color-selected: var(--ion-color-primary);
|
||||
}
|
||||
|
||||
ion-tab-button ion-label {
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
ion-tab-button ion-icon {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
/** Generic Utilities **/
|
||||
.tabular {
|
||||
font-family: var(--font-tabular);
|
||||
}
|
||||
|
||||
.semibold {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.bold {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.tertiary-text {
|
||||
color: var(--color-text-tertiary);
|
||||
text-transform: uppercase;
|
||||
font-size: 11px;
|
||||
letter-spacing: 0.05em;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.secondary-text {
|
||||
color: var(--color-text-secondary);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.pill-toggle {
|
||||
background: var(--color-surface-secondary);
|
||||
border-radius: var(--radius-pill);
|
||||
display: flex;
|
||||
padding: 4px;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.pill-toggle-btn {
|
||||
flex: 1;
|
||||
border-radius: var(--radius-pill);
|
||||
height: 36px;
|
||||
border: none;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: var(--color-text-secondary);
|
||||
background: transparent;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.pill-toggle-btn.active {
|
||||
background: var(--ion-color-primary);
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
/** Page Spacing **/
|
||||
.page-padding {
|
||||
padding: 0 20px;
|
||||
}
|
||||
|
||||
.section-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin: 24px 20px 12px;
|
||||
}
|
||||
|
||||
.section-header h2 {
|
||||
margin: 0;
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
color: var(--color-text-primary);
|
||||
}
|
||||
|
||||
.section-header .see-all {
|
||||
color: var(--ion-color-primary);
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
/** Custom Searchbar **/
|
||||
.custom-searchbar {
|
||||
--padding-start: 0;
|
||||
--padding-end: 0;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
/**
|
||||
* Date utilities for ShopKeep.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns today's date in YYYY-MM-DD format (local time).
|
||||
*/
|
||||
export const getTodayISO = (): string => {
|
||||
const now = new Date();
|
||||
const year = now.getFullYear();
|
||||
const month = String(now.getMonth() + 1).padStart(2, '0');
|
||||
const day = String(now.getDate()).padStart(2, '0');
|
||||
return `${year}-${month}-${day}`;
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats a date string (YYYY-MM-DD) or ISO string for display.
|
||||
*/
|
||||
export const formatDisplayDate = (
|
||||
dateStr: string,
|
||||
options: Intl.DateTimeFormatOptions = {
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
year: 'numeric',
|
||||
}
|
||||
): string => {
|
||||
if (!dateStr) return '';
|
||||
const date = new Date(dateStr);
|
||||
if (isNaN(date.getTime())) return dateStr;
|
||||
return new Intl.DateTimeFormat('en-US', options).format(date);
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns a relative date string (Today, Yesterday, or formatted date).
|
||||
*/
|
||||
export const formatRelativeDate = (dateStr: string): string => {
|
||||
const today = getTodayISO();
|
||||
const date = new Date(dateStr);
|
||||
const dateISO = date.toISOString().split('T')[0];
|
||||
|
||||
if (dateISO === today) return 'Today';
|
||||
|
||||
const yesterday = new Date();
|
||||
yesterday.setDate(yesterday.getDate() - 1);
|
||||
const yesterdayISO = yesterday.toISOString().split('T')[0];
|
||||
|
||||
if (dateISO === yesterdayISO) return 'Yesterday';
|
||||
|
||||
return formatDisplayDate(dateStr);
|
||||
};
|
||||
|
||||
/**
|
||||
* Group items by date.
|
||||
*/
|
||||
export const groupItemsByDate = <T extends { date: string }>(
|
||||
items: T[]
|
||||
): { date: string; items: T[] }[] => {
|
||||
const groups: Record<string, T[]> = {};
|
||||
|
||||
items.forEach((item) => {
|
||||
if (!groups[item.date]) {
|
||||
groups[item.date] = [];
|
||||
}
|
||||
groups[item.date].push(item);
|
||||
});
|
||||
|
||||
return Object.keys(groups)
|
||||
.sort((a, b) => b.localeCompare(a)) // Sort by date descending
|
||||
.map((date) => ({
|
||||
date,
|
||||
items: groups[date],
|
||||
}));
|
||||
};
|
||||
@@ -0,0 +1,65 @@
|
||||
/**
|
||||
* Money utilities for sanitizing, parsing, and formatting currency values.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Sanitizes input string to allow only digits and one decimal point.
|
||||
*/
|
||||
export const sanitizeMoneyInput = (value: string): string => {
|
||||
// Remove anything that isn't a digit or a period
|
||||
let sanitized = value.replace(/[^0-9.]/g, '');
|
||||
|
||||
// Ensure only one period exists
|
||||
const parts = sanitized.split('.');
|
||||
if (parts.length > 2) {
|
||||
sanitized = parts[0] + '.' + parts.slice(1).join('');
|
||||
}
|
||||
|
||||
// Limit to 2 decimal places
|
||||
if (parts.length === 2 && parts[1].length > 2) {
|
||||
sanitized = parts[0] + '.' + parts[1].slice(0, 2);
|
||||
}
|
||||
|
||||
return sanitized;
|
||||
};
|
||||
|
||||
/**
|
||||
* Parses a sanitized string into a number.
|
||||
*/
|
||||
export const parseMoney = (value: string): number => {
|
||||
const parsed = parseFloat(value);
|
||||
return isNaN(parsed) ? 0 : parsed;
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats a number as currency.
|
||||
*/
|
||||
export const formatMoney = (
|
||||
amount: number,
|
||||
currency: string = 'USD',
|
||||
locale: string = 'en-US'
|
||||
): string => {
|
||||
return new Intl.NumberFormat(locale, {
|
||||
style: 'currency',
|
||||
currency: currency,
|
||||
minimumFractionDigits: 2,
|
||||
maximumFractionDigits: 2,
|
||||
}).format(amount);
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns the currency symbol for a given currency code.
|
||||
*/
|
||||
export const getCurrencySymbol = (
|
||||
currency: string = 'USD',
|
||||
locale: string = 'en-US'
|
||||
): string => {
|
||||
return (
|
||||
new Intl.NumberFormat(locale, {
|
||||
style: 'currency',
|
||||
currency: currency,
|
||||
})
|
||||
.formatToParts(0)
|
||||
.find((part) => part.type === 'currency')?.value || '$'
|
||||
);
|
||||
};
|
||||
@@ -1,18 +0,0 @@
|
||||
ext {
|
||||
minSdkVersion = 24
|
||||
compileSdkVersion = 36
|
||||
targetSdkVersion = 36
|
||||
androidxActivityVersion = '1.11.0'
|
||||
androidxAppCompatVersion = '1.7.1'
|
||||
androidxCoordinatorLayoutVersion = '1.3.0'
|
||||
androidxCoreVersion = '1.17.0'
|
||||
androidxFragmentVersion = '1.8.9'
|
||||
coreSplashScreenVersion = '1.2.0'
|
||||
androidxWebkitVersion = '1.14.0'
|
||||
junitVersion = '4.13.2'
|
||||
androidxJunitVersion = '1.3.0'
|
||||
androidxEspressoCoreVersion = '3.7.0'
|
||||
cordovaAndroidVersion = '14.0.1'
|
||||
rgcfaIncludeGoogle = true
|
||||
androidxCredentialsVersion = '1.3.0'
|
||||
}
|
||||
+4
-3
@@ -1,3 +1,6 @@
|
||||
// NOTE: @ionic/react and @ionic/react-router are pinned to 8.8.7 in package.json.
|
||||
// 8.8.8 introduced a regression that breaks IonRouterOutlet page transition animations.
|
||||
// Do not upgrade until the upstream fix is confirmed.
|
||||
import { defineConfig, type Plugin } from 'vite';
|
||||
import react from '@vitejs/plugin-react';
|
||||
|
||||
@@ -21,9 +24,7 @@ export default defineConfig({
|
||||
port: 8100,
|
||||
allowedHosts: true,
|
||||
hmr: {
|
||||
clientPort: process.env.HMR_CLIENT_PORT
|
||||
? parseInt(process.env.HMR_CLIENT_PORT)
|
||||
: undefined,
|
||||
clientPort: process.env.HMR_CLIENT_PORT ? parseInt(process.env.HMR_CLIENT_PORT) : undefined,
|
||||
},
|
||||
},
|
||||
css: { devSourcemap: false },
|
||||
|
||||
@@ -217,15 +217,15 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"@capacitor-firebase/authentication@npm:^8.0.0":
|
||||
version: 8.2.0
|
||||
resolution: "@capacitor-firebase/authentication@npm:8.2.0"
|
||||
version: 8.3.0
|
||||
resolution: "@capacitor-firebase/authentication@npm:8.3.0"
|
||||
peerDependencies:
|
||||
"@capacitor/core": ">=8.0.0"
|
||||
firebase: ^12.6.0
|
||||
peerDependenciesMeta:
|
||||
firebase:
|
||||
optional: true
|
||||
checksum: 10c0/497c8063e3145ee719dbeb206bd30d7e9581471a7dfa6e6bb3067e96c29468a8035430101abcb0c724bec936e30ca1863344723115ae0b3a9a317e192c0ef3d2
|
||||
checksum: 10c0/a52f6ec85d18438ed616c78f29a8cea4a64621d13208a4d79d914344090630ce549f4e2d5d75da94b012e8799b4794e0af8d0e736edd97973b57205b62258ed9
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1043,11 +1043,11 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"@googlemaps/js-api-loader@npm:^2.0.2":
|
||||
version: 2.0.2
|
||||
resolution: "@googlemaps/js-api-loader@npm:2.0.2"
|
||||
version: 2.1.1
|
||||
resolution: "@googlemaps/js-api-loader@npm:2.1.1"
|
||||
dependencies:
|
||||
"@types/google.maps": "npm:^3.53.1"
|
||||
checksum: 10c0/1bd8f1e117145de83a7cfca7c05cf4cfb2d9095d507497f8b0e590be94de3a6a27a7a3c80801de6f58d77e5a2ce169a6b6d9c9d0dfc20ea1039d890226318c46
|
||||
checksum: 10c0/06cb6eaf686b838be51efd8293010b7bee42e341e9ad41b42a0ee8909cf06cc5711ba6cfdbcd0c62ff05c8ba35d8622c34130e738bc5844011c8bc457d14de64
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1086,6 +1086,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@hookform/resolvers@npm:^3.9.0":
|
||||
version: 3.10.0
|
||||
resolution: "@hookform/resolvers@npm:3.10.0"
|
||||
peerDependencies:
|
||||
react-hook-form: ^7.0.0
|
||||
checksum: 10c0/7ee44533b4cdc28c4fa2a94894c735411e5a1f830f4a617c580533321a9b901df0cc8c1e2fad81ad8d55154ebc5cb844cf9c116a3148ffae2bc48758c33cbb8e
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@ionic/cli-framework-output@npm:^2.2.8":
|
||||
version: 2.2.8
|
||||
resolution: "@ionic/cli-framework-output@npm:2.2.8"
|
||||
@@ -1732,21 +1741,21 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/auth-js@npm:2.106.2":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/auth-js@npm:2.106.2"
|
||||
"@supabase/auth-js@npm:2.108.1":
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/auth-js@npm:2.108.1"
|
||||
dependencies:
|
||||
tslib: "npm:2.8.1"
|
||||
checksum: 10c0/dc82807064bcf751c5378a9cc08a77d3732505434847af8c323355b63d417bfbfaa0e807c17eea7d0b7e022c8dadd7c9aa4c886554d60c599298e928d1035a98
|
||||
checksum: 10c0/8bf1bce42703b63284a0562d5a6588ac879b4fdeb477046a92fa9ba6fa0d75de7d85f4177d389654f68b812e359e9f0c9c3a659e7d37d96aaa2f6eba12d9cff0
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/functions-js@npm:2.106.2":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/functions-js@npm:2.106.2"
|
||||
"@supabase/functions-js@npm:2.108.1":
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/functions-js@npm:2.108.1"
|
||||
dependencies:
|
||||
tslib: "npm:2.8.1"
|
||||
checksum: 10c0/256ca5134b22b90edab4c7c1f3c5db3ba8e80adbb15c3725e5ed2456a39fe21af5b7cacb2966590f6fbd17812761d2086fcad5db09eba90490911d2a66f880f1
|
||||
checksum: 10c0/da67a82c4a79e049fa3d077f1ca3917a58707fa35df642d39d8b23edf5056a2a2427ea201d3f49bb11eafb06413dfde552a6bf63b2da4865a421d44c690c0fe7
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1757,45 +1766,45 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/postgrest-js@npm:2.106.2":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/postgrest-js@npm:2.106.2"
|
||||
"@supabase/postgrest-js@npm:2.108.1":
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/postgrest-js@npm:2.108.1"
|
||||
dependencies:
|
||||
tslib: "npm:2.8.1"
|
||||
checksum: 10c0/57c1a78428d59dfa7a89ef7901f28f756068ce9dd27ff97bf133be6ba77a4a1f13dab38bfa1a2e40cf5fab5c9d84bea394aff73514da0d6062b5b10732631127
|
||||
checksum: 10c0/29168464f44a723175ef510410df36f993581229d617816dfd33eb9bf5378742910fb9c18508040188ba2a16c20988f84d6f722decd79e34190daea35a5374af
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/realtime-js@npm:2.106.2":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/realtime-js@npm:2.106.2"
|
||||
"@supabase/realtime-js@npm:2.108.1":
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/realtime-js@npm:2.108.1"
|
||||
dependencies:
|
||||
"@supabase/phoenix": "npm:^0.4.2"
|
||||
tslib: "npm:2.8.1"
|
||||
checksum: 10c0/18cb4015e26e6eb10c45b8546c02eefdae0461123f05ff614d49107f97560b12c6e87a7cb810bc1a5e4618ad5286cc9cc5283800285e94356ea8e38a69910c10
|
||||
checksum: 10c0/bb4cea92714389b6f5f4b626e4c3cbacee2a57c543b71217d3d3032bfe35574cd26fe305bfbde0426230ca3b887e2116c78d47aa37117160b2b9d5ba11564ded
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/storage-js@npm:2.106.2":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/storage-js@npm:2.106.2"
|
||||
"@supabase/storage-js@npm:2.108.1":
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/storage-js@npm:2.108.1"
|
||||
dependencies:
|
||||
iceberg-js: "npm:^0.8.1"
|
||||
tslib: "npm:2.8.1"
|
||||
checksum: 10c0/efb0904f1311d568c6b75336771933eb9f4bea93a1cb0f90fe54422d00162d5793e404974eefc509c93dba3f337d9d6897d6ed228657590150a1346eae8f01f7
|
||||
checksum: 10c0/5a010b4d3af565b26ceb1d07e3d3f0541c8fe538350931c4fc15d0b560b3e40c354cc66259882a8b378e70dace59bc83dd53849feb48509155b8b342e00724a2
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@supabase/supabase-js@npm:^2.0.0":
|
||||
version: 2.106.2
|
||||
resolution: "@supabase/supabase-js@npm:2.106.2"
|
||||
version: 2.108.1
|
||||
resolution: "@supabase/supabase-js@npm:2.108.1"
|
||||
dependencies:
|
||||
"@supabase/auth-js": "npm:2.106.2"
|
||||
"@supabase/functions-js": "npm:2.106.2"
|
||||
"@supabase/postgrest-js": "npm:2.106.2"
|
||||
"@supabase/realtime-js": "npm:2.106.2"
|
||||
"@supabase/storage-js": "npm:2.106.2"
|
||||
checksum: 10c0/3d9418360b43cdf950c4d7496b368dd1c526cfc717dd3016ac032b904367476f31495c75c6ae905ef49e8b5b375416cb5cc354fb888d1e2fc596611824df2e97
|
||||
"@supabase/auth-js": "npm:2.108.1"
|
||||
"@supabase/functions-js": "npm:2.108.1"
|
||||
"@supabase/postgrest-js": "npm:2.108.1"
|
||||
"@supabase/realtime-js": "npm:2.108.1"
|
||||
"@supabase/storage-js": "npm:2.108.1"
|
||||
checksum: 10c0/9b8c3dd7153b4eb3c0bf47296e326c3e57bf77b979a5dc5d18b96a25c041195de942d227d13a5ce83a20203163580204e9102f2346f0a9461de4042b95f69f03
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1864,9 +1873,9 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"@types/google.maps@npm:^3.53.1, @types/google.maps@npm:^3.58.1":
|
||||
version: 3.64.1
|
||||
resolution: "@types/google.maps@npm:3.64.1"
|
||||
checksum: 10c0/4ade621941045c7e1b1ead30e0b4025b7fccf2b4cfb7c9b5f48c31cceb964c74d17c28b6105be15b99df85c23e19b25415e9fd7bdd7b1d40b7000d22dbbb4e7e
|
||||
version: 3.65.1
|
||||
resolution: "@types/google.maps@npm:3.65.1"
|
||||
checksum: 10c0/9a7da04d9f27be7a3f9a4de2e6dd9271b68b83aa8a6050fc53ec5cc1366669ead4c27185200adf56f07d69c9a2bba72d82a0cf706e41ed4e7e89d98c44c5c6a1
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -1884,7 +1893,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
|
||||
"@types/node@npm:*":
|
||||
version: 25.9.1
|
||||
resolution: "@types/node@npm:25.9.1"
|
||||
dependencies:
|
||||
@@ -1893,6 +1902,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0":
|
||||
version: 25.9.2
|
||||
resolution: "@types/node@npm:25.9.2"
|
||||
dependencies:
|
||||
undici-types: "npm:>=7.24.0 <7.24.7"
|
||||
checksum: 10c0/f14c0d56361febb985eccc45cf0834ee6e2f07c4389a636f3e1a55ebde320077a80bface18c9afd3092f5fa295925502c1a9d55f805efa813f634aa9c941cbac
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/react-dom@npm:^19.0.0":
|
||||
version: 19.2.3
|
||||
resolution: "@types/react-dom@npm:19.2.3"
|
||||
@@ -2018,6 +2036,7 @@ __metadata:
|
||||
"@capacitor/keyboard": "npm:8.0.3"
|
||||
"@capacitor/push-notifications": "npm:^8.1.1"
|
||||
"@capacitor/status-bar": "npm:8.0.2"
|
||||
"@hookform/resolvers": "npm:^3.9.0"
|
||||
"@ionic/pwa-elements": "npm:^3.0.0"
|
||||
"@ionic/react": "npm:8.8.7"
|
||||
"@ionic/react-router": "npm:8.8.7"
|
||||
@@ -2969,8 +2988,8 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"protobufjs@npm:^7.2.5":
|
||||
version: 7.6.1
|
||||
resolution: "protobufjs@npm:7.6.1"
|
||||
version: 7.6.3
|
||||
resolution: "protobufjs@npm:7.6.3"
|
||||
dependencies:
|
||||
"@protobufjs/aspromise": "npm:^1.1.2"
|
||||
"@protobufjs/base64": "npm:^1.1.2"
|
||||
@@ -2984,7 +3003,7 @@ __metadata:
|
||||
"@protobufjs/utf8": "npm:^1.1.1"
|
||||
"@types/node": "npm:>=13.7.0"
|
||||
long: "npm:^5.3.2"
|
||||
checksum: 10c0/364c6914facac19ace915e353f71c5d5996bfa8177a3a68c09bd2513a3ecf780538aca06cb3439237f50489db2fae321c4a4db60fd7f9ec65315b7ad66bea029
|
||||
checksum: 10c0/e1132b1ff82684280041550d720398568763ff40928def03e8bb409eaed6edd222e63372e3f52d7c19e5a8e9975333480e26950759086eb5a1f5b5c118da7bf8
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -3568,13 +3587,13 @@ __metadata:
|
||||
linkType: hard
|
||||
|
||||
"websocket-driver@npm:>=0.5.1":
|
||||
version: 0.7.4
|
||||
resolution: "websocket-driver@npm:0.7.4"
|
||||
version: 0.7.5
|
||||
resolution: "websocket-driver@npm:0.7.5"
|
||||
dependencies:
|
||||
http-parser-js: "npm:>=0.5.1"
|
||||
safe-buffer: "npm:>=5.1.0"
|
||||
websocket-extensions: "npm:>=0.1.1"
|
||||
checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
|
||||
checksum: 10c0/843a3c9f529ce07f2721829f70f62986247525ab22625e857b69da13dc90967bacfe57b85e196801b565cd797e309ddd5b06fa8435732e34e8a8ab6201d7abed
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Reference in New Issue
Block a user