From 1e9c3f3101d44ac5c54c188aea0c577635a41133 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Mon, 17 Feb 2025 19:19:38 -0700 Subject: [PATCH] add Discover query param searchPeople to go straight to people map --- BUILDING.md | 27 +++++++++++++------------- CHANGELOG.md | 18 +++++++++++------- package-lock.json | 4 ++-- package.json | 2 +- src/views/DiscoverView.vue | 39 +++++++++++++++++++++++--------------- 5 files changed, 51 insertions(+), 39 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index ca85fb1..cb6c3db 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -259,13 +259,23 @@ See `.env.*` files for configuration. ## Deployment +### Version Management +1. Update CHANGELOG.md with new changes +2. Update version in package.json +3. Commit changes and tag release: + ```bash + git tag + git push origin + ``` +4. After deployment, update package.json with next version + "-beta" + ### Test Server ```bash # Build using staging environment npm run build -- --mode staging # Deploy to test server -rsync -azvu -e "ssh -i ~/.ssh/your_key" dist ubuntutest@test.timesafari.app:time-safari/ +rsync -azvu -e "ssh -i ~/.ssh/" dist ubuntutest@test.timesafari.app:time-safari/ ``` ### Production Server @@ -274,26 +284,15 @@ rsync -azvu -e "ssh -i ~/.ssh/your_key" dist ubuntutest@test.timesafari.app:time pkgx +npm sh cd crowd-funder-for-time-pwa git checkout master && git pull -git checkout +git checkout npm install npm run build cd - # Backup and deploy -mv time-safari/dist time-safari-dist-prev.0 -mv crowd-funder-for-time-pwa/dist time-safari/ +mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist time-safari/ ``` -### Version Management -1. Update CHANGELOG.md with new changes -2. Update version in package.json -3. Commit changes and tag release: - ```bash - git tag - git push origin - ``` -4. After deployment, update package.json with next version + "-beta" - ## Troubleshooting ### Common Build Issues diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b0c377..131e6d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,17 @@ 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). -== [0.4.2] - 2025.02.17 -### Merged -- Master to split_process_build -- fixed path issues -- all tests passing -- capacitor build to Android working +## [0.4.3] - 2025.02.17 +### Added +- Discover query parameter searchPeople to go directly to the people map + + +## [0.4.2] - 2025.02.17 +### Added +- Capacitor build to Android +### Fixed +- Path issues + ## [0.4.1] - 2025.02.16 ### Fixed @@ -23,7 +28,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Images in the home feed now take up the full width of the card. - Clicking the image previously, would open the image in a new tab. Now, clicking the image opens the image in a lightbox view. - ### Added - Clicking an image also now displays an in-app lightbox view of the image. - The lightbox view includes a download button for the image in mobile view. diff --git a/package-lock.json b/package-lock.json index 65cae7d..09d2ea4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "timesafari", - "version": "0.4.2-beta", + "version": "0.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "timesafari", - "version": "0.4.2-beta", + "version": "0.4.3", "dependencies": { "@capacitor/android": "^6.2.0", "@capacitor/cli": "^6.2.0", diff --git a/package.json b/package.json index deafa97..e6f22b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "timesafari", - "version": "0.4.2-beta", + "version": "0.4.3", "description": "TimeSafari Desktop Application", "author": { "name": "TimeSafari Team" diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index 6dd9214..c5a81ad 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -352,9 +352,9 @@ export default class DiscoverView extends Vue { allMyDids: Array = []; apiServer = ""; isLoading = false; - isLocalActive = true; + isLocalActive = false; isMappedActive = false; - isAnywhereActive = false; + isAnywhereActive = true; isProjectsActive = true; isPeopleActive = false; isSearchVisible = true; @@ -375,6 +375,11 @@ export default class DiscoverView extends Vue { didInfo = didInfo; async mounted() { + + this.searchTerms = this.$route.query["searchText"]?.toString() || ""; + + const searchPeople = !!this.$route.query["searchPeople"]; + const settings = await retrieveSettingsForActiveAccount(); this.activeDid = (settings.activeDid as string) || ""; this.apiServer = (settings.apiServer as string) || ""; @@ -386,26 +391,30 @@ export default class DiscoverView extends Vue { this.allMyDids = await retrieveAccountDids(); - this.searchTerms = this.$route.query["searchText"]?.toString() || ""; - if (!settings.finishedOnboarding) { (this.$refs.onboardingDialog as OnboardingDialog).open( OnboardPage.Discover, ); } - if (this.searchBox) { - await this.searchLocal(); - - const bbox = this.searchBox.bbox; - this.localCenterLat = (bbox.maxLat + bbox.minLat) / 2; - this.localCenterLong = (bbox.eastLong + bbox.westLong) / 2; - } else { - this.isLocalActive = false; - this.isMappedActive = false; - this.isAnywhereActive = true; - await this.searchAll(); + // Someday we'll have enough people that we can default to their local area. + // if (this.searchBox) { + // this.isLocalActive = true; + // this.isAnywhereActive = false; + // await this.searchLocal(); + // + // const bbox = this.searchBox.bbox; + // this.localCenterLat = (bbox.maxLat + bbox.minLat) / 2; + // this.localCenterLong = (bbox.eastLong + bbox.westLong) / 2; + // } else { + + if (searchPeople) { + this.isPeopleActive = true; + this.isProjectsActive = false; + this.isMappedActive = true; + this.isAnywhereActive = false; } + await this.searchAll(); } public resetCounts() {