From 82d321731787036fa5af4fd081f7a880350bbb15 Mon Sep 17 00:00:00 2001 From: stdavis Date: Wed, 24 Apr 2024 16:27:35 -0600 Subject: [PATCH] release: v3.0.9 (643) --- CHANGELOG.md | 11 ++ README.md | 4 +- changelog_context.json | 2 +- data/knexfile.js | 5 +- src/front/app.config.js | 6 +- src/front/services/constants.json.lazy | 197 +++++++------------------ 6 files changed, 77 insertions(+), 148 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2d4d38a..e94d344f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## [v3.0.9-643](https://github.com/agrc/roadkill-mobile/compare/v3.0.8-640...v3.0.9-643) (2024-04-24) + + +### Bug Fixes + +* **back:** fix invalid lock file ([21932b1](https://github.com/agrc/roadkill-mobile/commit/21932b1db1a0a14b0585d234b7cceab981046ff4)) +* **back:** remove logs ([504ffc7](https://github.com/agrc/roadkill-mobile/commit/504ffc722a24d39619250b0f240f7ce294e525db)) +* **website:** update prod serve command ([ffbce2c](https://github.com/agrc/roadkill-mobile/commit/ffbce2c9ea64a9b3b82d49ce96ad60c4b3d26c82)) + + + ## [v3.0.8-640](https://github.com/agrc/roadkill-mobile/compare/v3.0.7-639...v3.0.8-640) (2024-03-06) diff --git a/README.md b/README.md index 44a3d8e2..94e46876 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ Press "j" in console after starting expo project. See [Expo Debugging & Profilin | git branch | app version | runtime version | deployed | release-channel | expo version | |------------|-------------|-----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|--------------| -| dev | 3.0.8 | 2.1.0 | custom dev clients for simulators are in `src/front/dev-clients`, app has an orange icon (dev clients for for physical devices can be installed directly from the expo build website) | default | 49 | -| staging | 3.0.8 | 2.1.0 | [TestFlight](https://appstoreconnect.apple.com/apps/1613421729/testflight) and [Google Play internal testing](https://play.google.com/console/u/1/developers/6377537875100906890/app/4974417822540767109/tracks/internal-testing) separate apps from production with a blue icon | staging | 49 | +| dev | 3.0.9 | 3.1.0 | custom dev clients for simulators are in `src/front/dev-clients`, app has an orange icon (dev clients for for physical devices can be installed directly from the expo build website) | default | 50 | +| staging | 3.0.9 | 3.1.0 | [TestFlight](https://appstoreconnect.apple.com/apps/1613421729/testflight) and [Google Play internal testing](https://play.google.com/console/u/1/developers/6377537875100906890/app/4974417822540767109/tracks/internal-testing) separate apps from production with a blue icon | staging | 50 | | production | 3.0.8 | 2.1.0 | App Stores | production | 49 | These three environments are three separate bundle IDs (see `src/front/app.config.js`) and can all be installed on the same device simultaneously. diff --git a/changelog_context.json b/changelog_context.json index 810e9b82..d1eb7f0b 100644 --- a/changelog_context.json +++ b/changelog_context.json @@ -1,3 +1,3 @@ { - "version": "v3.0.8-640" + "version": "v3.0.9-643" } diff --git a/data/knexfile.js b/data/knexfile.js index 642c1354..9d8237f0 100644 --- a/data/knexfile.js +++ b/data/knexfile.js @@ -12,7 +12,10 @@ const connection = { module.exports = { development: { client, - connection, + connection: { + ...connection, + user: 'postgres' + }, }, // this needs to match the GitHub environment name Staging: { diff --git a/src/front/app.config.js b/src/front/app.config.js index 331b2e7f..52526329 100644 --- a/src/front/app.config.js +++ b/src/front/app.config.js @@ -12,7 +12,7 @@ const names = { const name = names[process.env.ENVIRONMENT]; // perhaps this bump could be automated using a combo of app.config.json and this file? -const buildNumber = 642; +const buildNumber = 643; export default { name, @@ -22,7 +22,7 @@ export default { owner: 'ugrc', scheme: bundleId, githubUrl: 'https://github.com/agrc/roadkill-mobile', - version: '3.0.8', + version: '3.0.9', orientation: 'portrait', icon: process.env.ENVIRONMENT === 'production' @@ -134,7 +134,7 @@ export default { /* required for eas update command bump major version when upgrading expo version */ - runtimeVersion: '2.1.0', + runtimeVersion: '3.1.0', updates: { url: 'https://u.expo.dev/648c99de-696c-4704-8723-7f8838dc6896', }, diff --git a/src/front/services/constants.json.lazy b/src/front/services/constants.json.lazy index 90e5b919..182c7b2a 100644 --- a/src/front/services/constants.json.lazy +++ b/src/front/services/constants.json.lazy @@ -154,6 +154,17 @@ "rare": false, "frequent": false }, + { + "species_id": 15, + "common_name": "Cougar (Mountiain Lion)", + "scientific_name": "Puma concolor", + "species_type": "wild", + "species_class": "mammals", + "species_order": "carnivores", + "family": "cats", + "rare": false, + "frequent": false + }, { "species_id": 16, "common_name": "Bobcat", @@ -374,6 +385,17 @@ "rare": false, "frequent": false }, + { + "species_id": 37, + "common_name": "Spotted Shunk", + "scientific_name": "Spilogale putorius", + "species_type": "wild", + "species_class": "mammals", + "species_order": "carnivores", + "family": "skunks", + "rare": false, + "frequent": false + }, { "species_id": 38, "common_name": "Cottontail Rabbit", @@ -957,17 +979,6 @@ "rare": false, "frequent": false }, - { - "species_id": 15, - "common_name": "Cougar (Mountain Lion)", - "scientific_name": "Puma concolor", - "species_type": "wild", - "species_class": "mammals", - "species_order": "carnivores", - "family": "cats", - "rare": false, - "frequent": false - }, { "species_id": 91, "common_name": "Long-nosed Leopard Lizard", @@ -1562,17 +1573,6 @@ "rare": false, "frequent": false }, - { - "species_id": 37, - "common_name": "Spotted Skunk", - "scientific_name": "Spilogale putorius", - "species_type": "wild", - "species_class": "mammals", - "species_order": "carnivores", - "family": "skunks", - "rare": false, - "frequent": false - }, { "species_id": 144, "common_name": "Peregrine Falcon", @@ -1691,78 +1691,78 @@ "org_type": "agency" }, { - "id": 1, - "name": "Redrock Kleanup llc ", - "org_type": "contractor" + "id": 18, + "name": "UGRC", + "org_type": "agency" }, { - "id": 5, - "name": "Wasatch County resident ", + "id": 19, + "name": "UGRC", "org_type": "agency" }, { - "id": 9, - "name": "Department of Natural Resources ", + "id": 20, + "name": "THE ugrc", "org_type": "agency" }, { - "id": 17, - "name": "Department of Transportation ", + "id": 21, + "name": "THE ugrc", "org_type": "agency" }, { - "id": 18, - "name": "Department of Agriculture and Food ", + "id": 22, + "name": "THE ugrc", "org_type": "agency" }, { - "id": 19, - "name": "Public", - "org_type": "agency" + "id": 23, + "name": "THE ugrc", + "org_type": "contractor" }, { - "id": 20, - "name": "Kearns Improvement District ", + "id": 24, + "name": "Ugrc", "org_type": "agency" }, { - "id": 21, - "name": "N/a", + "id": 26, + "name": "Test Org", "org_type": "contractor" }, { - "id": 22, - "name": "Springdale Police", + "id": 27, + "name": "DWR", "org_type": "agency" }, { - "id": 23, - "name": "Department of health and human services ", - "org_type": "agency" + "id": 28, + "name": "DWR", + "org_type": "contractor" }, { - "id": 24, - "name": "Utah Trust Lands Administration ", - "org_type": "agency" + "id": 1, + "name": "Redrock Kleanup llc ", + "org_type": "contractor" }, { - "id": 25, - "name": "Utah Department of Public Safety", + "id": 5, + "name": "Wasatch County resident ", "org_type": "agency" }, { - "id": 26, - "name": "Emery School District ", + "id": 9, + "name": "Department of Natural Resources ", "org_type": "agency" }, { - "id": 27, - "name": "Cottonwood improvement district ", + "id": 17, + "name": "Department of Transportation ", "org_type": "agency" }, { - "id": 28, - "name": "Dnr state parks ", + "id": 25, + "name": "Utah Department of Public Safety", "org_type": "agency" }, { @@ -1799,91 +1799,6 @@ "id": 35, "name": "UDAF", "org_type": "agency" - }, - { - "id": 36, - "name": "CWMU Association ", - "org_type": "contractor" - }, - { - "id": 37, - "name": "Department of Enviornmental Quality", - "org_type": "agency" - }, - { - "id": 38, - "name": "Salt Lake County Parks", - "org_type": "agency" - }, - { - "id": 39, - "name": "University of Utah ", - "org_type": "agency" - }, - { - "id": 40, - "name": "Sandy city public utilities ", - "org_type": "agency" - }, - { - "id": 41, - "name": "Draper Police", - "org_type": "agency" - }, - { - "id": 42, - "name": "Weber County Animal Control", - "org_type": "agency" - }, - { - "id": 43, - "name": "Taylorsville City", - "org_type": "agency" - }, - { - "id": 44, - "name": "Hideout", - "org_type": "agency" - }, - { - "id": 45, - "name": "Draper City Public Works", - "org_type": "agency" - }, - { - "id": 46, - "name": "J Fulton Thompson Corp", - "org_type": "contractor" - }, - { - "id": 48, - "name": "Kananb City", - "org_type": "agency" - }, - { - "id": 49, - "name": "Marc Bowler", - "org_type": "contractor" - }, - { - "id": 50, - "name": "Utah County Sheriff's Office", - "org_type": "agency" - }, - { - "id": 51, - "name": "Syracuse City", - "org_type": "agency" - }, - { - "id": 52, - "name": "Utah Highway Patrol ", - "org_type": "agency" - }, - { - "id": 47, - "name": "Utah Department of Environmental Quality", - "org_type": "agency" } ] } \ No newline at end of file