diff --git a/BUILDING.md b/BUILDING.md index 04531f01..81ff3d1d 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -362,7 +362,7 @@ Prerequisites: macOS with Xcode installed 4. Bump the version to match Android & package.json: ``` - cd ios/App && xcrun agvtool new-version 35 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.2;/g" App.xcodeproj/project.pbxproj && cd - + cd ios/App && xcrun agvtool new-version 36 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.3;/g" App.xcodeproj/project.pbxproj && cd - # Unfortunately this edits Info.plist directly. #xcrun agvtool new-marketing-version 0.4.5 ``` @@ -385,11 +385,12 @@ Prerequisites: macOS with Xcode installed * This will trigger a build and take time, needing user's "login" keychain password (user's login password), repeatedly. * If it fails with `building for 'iOS', but linking in dylib (.../.pkgx/zlib.net/v1.3.0/lib/libz.1.3.dylib) built for 'macOS'` then run XCode outside that terminal (ie. not with `npx cap open ios`). * Click Distribute -> App Store Connect - * In AppStoreConnect, add the build to the distribution: remove the current build with the "-" when you hover over it, then "Add Build" with the new build. + * In AppStoreConnect, add the build to the distribution. You may have to remove the current build with the "-" when you hover over it, then "Add Build" with the new build. * May have to go to App Review, click Submission, then hover over the build and click "-". * It can take 15 minutes for the build to show up in the list of builds. * You'll probably have to "Manage" something about encryption, disallowed in France. * Then "Save" and "Add to Review" and "Resubmit to App Review". + * Eventually it'll be "Ready for Distribution" which means ### Android Build diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c9eb2a7..00662f25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.0.3] - 2025.07.12 ### Changed - Photo is pinned to profile mode +### Fixed +- Deep link URLs (and other prod settings) +- Error in BVC begin view ## [1.0.2] - 2025.06.20 - 276e0a741bc327de3380c4e508cccb7fee58c06d diff --git a/README.md b/README.md index d673c279..b3559d1b 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ See [TESTING.md](test-playwright/TESTING.md) for detailed test instructions. Application icons are in the `assets` directory, processed by the `capacitor-assets` command. -To add a Font Awesome icon, add to main.ts and reference with `font-awesome` element and `icon` attribute with the hyphenated name. +To add a Font Awesome icon, add to fontawesome.ts and reference with `font-awesome` element and `icon` attribute with the hyphenated name. ## Other diff --git a/android/app/build.gradle b/android/app/build.gradle index 0843dce8..ddad5b5d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "app.timesafari.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 35 - versionName "1.0.2" + versionCode 36 + versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 01ed14fe..a3afcb31 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -403,7 +403,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -413,7 +413,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.3; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -430,7 +430,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 35; + CURRENT_PROJECT_VERSION = 36; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -440,7 +440,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.2; + MARKETING_VERSION = 1.0.3; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/package-lock.json b/package-lock.json index a0f90964..3b183e19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "timesafari", - "version": "1.0.3-beta", + "version": "1.0.4-beta", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "timesafari", - "version": "1.0.3-beta", + "version": "1.0.4-beta", "dependencies": { "@capacitor-community/sqlite": "6.0.2", "@capacitor-mlkit/barcode-scanning": "^6.0.0", diff --git a/package.json b/package.json index a2152348..13e52ae8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "timesafari", - "version": "1.0.3-beta", + "version": "1.0.4-beta", "description": "Time Safari Application", "author": { "name": "Time Safari Team" diff --git a/src/views/QuickActionBvcBeginView.vue b/src/views/QuickActionBvcBeginView.vue index 596b1ca5..74bd49af 100644 --- a/src/views/QuickActionBvcBeginView.vue +++ b/src/views/QuickActionBvcBeginView.vue @@ -144,7 +144,7 @@ export default class QuickActionBvcBeginView extends Vue { "HUR", BVC_MEETUPS_PROJECT_CLAIM_ID, ); - if (timeResult.type === "success") { + if (timeResult.success) { timeSuccess = true; } else { logger.error("Error sending time:", timeResult); @@ -154,7 +154,7 @@ export default class QuickActionBvcBeginView extends Vue { type: "danger", title: "Error", text: - timeResult?.error?.userMessage || + timeResult?.error || "There was an error sending the time.", }, 5000, @@ -171,7 +171,7 @@ export default class QuickActionBvcBeginView extends Vue { apiServer, axios, ); - if (attendResult.type === "success") { + if (attendResult.success) { attendedSuccess = true; } else { logger.error("Error sending attendance:", attendResult); @@ -181,7 +181,7 @@ export default class QuickActionBvcBeginView extends Vue { type: "danger", title: "Error", text: - attendResult?.error?.userMessage || + attendResult?.error || "There was an error sending the attendance.", }, 5000, diff --git a/vite.config.common.mts b/vite.config.common.mts index 6b238be9..355c377f 100644 --- a/vite.config.common.mts +++ b/vite.config.common.mts @@ -6,7 +6,9 @@ import path from "path"; import { fileURLToPath } from 'url'; // Load environment variables -dotenv.config(); +console.log('NODE_ENV:', process.env.NODE_ENV) +dotenv.config({ path: `.env.${process.env.NODE_ENV}` }) + const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename);