From 041cc30eb8b04a322250290bee22c9f02b9317b1 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Fri, 9 Aug 2024 07:20:01 -0600 Subject: [PATCH 1/7] refactor confirmation section to show together and more cleanly --- src/views/ClaimView.vue | 59 +++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 7972dce1b..e2e5142a8 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -131,33 +131,7 @@ -
- - - - - Confirmation Details... - - - +
-
-

Confirmations

+
+ +

Confirmations

+ + + + Details... + + +
+ Nobody has confirmed this. From 024fc6be064670dd42b30b8ce0648b4ed7e4ae28 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Fri, 9 Aug 2024 07:27:29 -0600 Subject: [PATCH 2/7] show image on the view-claim screen --- src/views/ClaimView.vue | 5 +++++ src/views/GiftedDetails.vue | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index e2e5142a8..5df9fc49a 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -75,6 +75,11 @@ {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
+
+ + + +
diff --git a/src/views/GiftedDetails.vue b/src/views/GiftedDetails.vue index 7658714ea..3e1466c5a 100644 --- a/src/views/GiftedDetails.vue +++ b/src/views/GiftedDetails.vue @@ -66,7 +66,7 @@
- + Date: Fri, 9 Aug 2024 07:55:31 -0600 Subject: [PATCH 3/7] add image on entries in a project --- src/views/ProjectViewView.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue index 49c06f470..242960a25 100644 --- a/src/views/ProjectViewView.vue +++ b/src/views/ProjectViewView.vue @@ -345,6 +345,11 @@
+
+ + + +
From 70a1ea362f9af88f27331a822172f5036107a00e Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 10 Aug 2024 08:11:31 -0600 Subject: [PATCH 4/7] fix a test, add potential-failing comment --- test-playwright/00-noid-tests.spec.ts | 2 +- test-playwright/40-add-contact.spec.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test-playwright/00-noid-tests.spec.ts b/test-playwright/00-noid-tests.spec.ts index 7f2619dc8..12746ff39 100644 --- a/test-playwright/00-noid-tests.spec.ts +++ b/test-playwright/00-noid-tests.spec.ts @@ -1,6 +1,6 @@ import { test, expect } from '@playwright/test'; -test('Confirm usage of test API', async ({ page }, testInfo) => { +test('Confirm usage of test API (may fail if you are running your own Time Safari)', async ({ page }, testInfo) => { // Load account view await page.goto('./account'); await page.getByRole('heading', { name: 'Advanced' }).click(); diff --git a/test-playwright/40-add-contact.spec.ts b/test-playwright/40-add-contact.spec.ts index 204dbd97c..f6254745f 100644 --- a/test-playwright/40-add-contact.spec.ts +++ b/test-playwright/40-add-contact.spec.ts @@ -81,6 +81,5 @@ test('Add contact, record gift, confirm gift', async ({ page }) => { // Refresh claim page, Confirm button should be hidden await page.reload(); - await expect(page.getByRole('button', { name: 'Confirm' })).toBeVisible(); await expect(page.getByRole('button', { name: 'Confirm' })).toBeHidden(); }); \ No newline at end of file From 01a8814b4ed6bcd49df0d36510a9800173351d57 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 10 Aug 2024 13:37:31 -0600 Subject: [PATCH 5/7] fix linting, and give instructions for current test suite --- README.md | 28 ++++++++++++++++++---------- package.json | 4 +++- src/views/ClaimView.vue | 4 ++-- src/views/HomeView.vue | 5 +---- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 92ba190de..c4350bc0b 100644 --- a/README.md +++ b/README.md @@ -71,10 +71,7 @@ npm run build ### Automated -Using the global test Endorser (ledger) server: -`npx playwright test` - -Using the locally running Endorser server: +Use the locally running Endorser server: * Clone and set up https://github.com/trentlarson/endorser-ch and run the following in that directory: ``` @@ -82,7 +79,23 @@ test/test.sh NODE_ENV=test-local npm run dev ``` -Alternatively, you can run the following which starts with the bare minimum test data: +* Now run the local tests: +``` +npm run test-all +``` + +Note that a test will sometimes fail and rerunning may succeed (and repeat if a different test fails). + + + + +It's possible to use the global test Endorser (ledger) server (but currently the tests don't all succeed): +`npx playwright test` + + + + +It's possible to run with a minimal set of data: the following starts with the bare minimum of test data (but currently the tests don't all succeed): ``` rm ../endorser-ch-test-local.sqlite3 NODE_ENV=test-local npm run flyway migrate @@ -91,11 +104,6 @@ NODE_ENV=test-local npm run dev ``` -* Now run the local tests: -``` -npx playwright test -c playwright.config-local.ts -``` - ### Register new user on test server On the test server, User #0 has rights to register others, so you can start diff --git a/package.json b/package.json index 6db0d6b0e..a769e5554 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build", "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src", "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src", - "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js" + "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js", + "test-local": "npx playwright test -c playwright.config-local.ts --trace on", + "test-all": "npm run build && npx playwright test -c playwright.config-local.ts --trace on" }, "dependencies": { "@dicebear/collection": "^5.4.1", diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 5df9fc49a..1d6ff2851 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -150,7 +150,7 @@
-

Confirmations

+

Confirmations

-
+
From cfb8b7841e48b55f0fe7bfe896a0507680b54d84 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 10 Aug 2024 16:08:34 -0600 Subject: [PATCH 6/7] bump to version 0.3.16 --- CHANGELOG.md | 11 ++++++++++- package.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf6c5d44..4f72edf23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,16 @@ 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.3.15] - 2024.06.22 - c8f0f2c2b16b9f0b4b47d40f7bf29058c7baa68e +## [0.3.16] - 2024.07.10 +### Added +- Photos on more screens +### Fixed +- Share of a photo, including sharing a photo from webkit/Safari which never worked +### Changed in DB or environment +- Nothing (though there's a new temp field in IndexedDB) + + +## [0.3.15] - 2024.08.04 - c8f0f2c2b16b9f0b4b47d40f7bf29058c7baa68e ### Added - Edit gives - Page to edit claim JSON before submitting diff --git a/package.json b/package.json index a769e5554..a50abbb20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TimeSafari", - "version": "0.3.16-beta", + "version": "0.3.16", "scripts": { "dev": "vite", "serve": "vite preview", From 6728cbe93e97e46df00703ca037a811892ff6db8 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 10 Aug 2024 16:11:28 -0600 Subject: [PATCH 7/7] bump version and add "-beta" --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 165053a6d..d3e1ef964 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "TimeSafari", - "version": "0.3.16-beta", + "version": "0.3.17-beta", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "TimeSafari", - "version": "0.3.16-beta", + "version": "0.3.17-beta", "dependencies": { "@dicebear/collection": "^5.4.1", "@dicebear/core": "^5.4.1", diff --git a/package.json b/package.json index a50abbb20..ffb4caed5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TimeSafari", - "version": "0.3.16", + "version": "0.3.17-beta", "scripts": { "dev": "vite", "serve": "vite preview",