From d1f70167b66c3f43d90b95d32fef4325d035bb2e Mon Sep 17 00:00:00 2001 From: Billy Lo Date: Thu, 14 Oct 2021 23:07:52 -0400 Subject: [PATCH] deployed version - 1.10.0 after merge and a few fixes --- components/Page.tsx | 2 +- next-env.d.ts | 3 --- package.json | 2 +- pages/index.tsx | 5 ++--- public/locales/en/common.yml | 4 ++-- src/process.ts | 21 --------------------- src/sentry.ts | 2 +- 7 files changed, 7 insertions(+), 32 deletions(-) diff --git a/components/Page.tsx b/components/Page.tsx index 3f17a66..cb90e15 100644 --- a/components/Page.tsx +++ b/components/Page.tsx @@ -36,7 +36,7 @@ function Page(props: PageProps): JSX.Element { {t('common:gitHub')} {t('common:returnToMainSite')} -
Last updated: 2021-10-06 (v1.9.23)
+
Last updated: 2021-10-14 (v1.10.0)
diff --git a/next-env.d.ts b/next-env.d.ts index 9bc3dd4..c6643fd 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,3 @@ /// /// /// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/package.json b/package.json index a0608ca..3501480 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grassroots_covidpass", - "version": "1.9.7", + "version": "1.10.0", "author": "Billy Lo ", "license": "MIT", "private": false, diff --git a/pages/index.tsx b/pages/index.tsx index 5a25978..ccea8b0 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -74,12 +74,11 @@ function Index(): JSX.Element {

{t('common:subtitle')}


{t('common:subtitle2')}


{displayPassCount}

- Oct 3 evening update: + Oct 14 evening update:

    -
  • Added expiration date to Apple Wallet pass so it aligns with the province's schedule.
    • -
  • On Oct 22, we will update this tool as well so you can import the official QR code into your mobile wallet too.
    • +
  • You can now import the new enhanced receipt from Ontario into your Apple Wallet.

{t('common:continueSpirit')}


diff --git a/public/locales/en/common.yml b/public/locales/en/common.yml index 59db56d..1543c28 100644 --- a/public/locales/en/common.yml +++ b/public/locales/en/common.yml @@ -1,6 +1,6 @@ title: Vaccination Receipt to Wallet -subtitle: This utility (created by volunteers) converts your vaccination receipt from Ontario Ministry of Health to an Apple Wallet pass for easy access in the interim. Android users can create a photo pass while we await Google Pay COVID Card API Access from Google. -subtitle2: Once Ontario's official QR code is available on Oct 22, you will be able to update your Apple Wallet pass or Android photo pass by visiting this site again. +subtitle: This utility (created by volunteers) imports your vaccination receipt from Ontario Ministry of Health into Apple Wallet for easy access. +subtitle2: Android users can create a photo pass while we await Google Pay COVID Card API Access from Google. update1Date: Sep 23 Updates update1: Thanks so much for all the encouragements and suggestions to make this better. We plan to keep enhancing this to help more Canadians. Stay tuned! continueSpirit: Continuing the spirit of ❤️ @VaxHuntersCanada ❤️. diff --git a/src/process.ts b/src/process.ts index 3eb1f1b..e6132a5 100644 --- a/src/process.ts +++ b/src/process.ts @@ -35,26 +35,6 @@ export async function getPayloadBodyFromFile(file: File): Promise { imageData = await getImageDataFromPdf(fileBuffer); } break; -======= -import {PayloadBody} from "./payload"; -import * as PdfJS from 'pdfjs-dist' -import jsQR, {QRCode} from "jsqr"; -import {decodeData} from "./decode"; -import {Result} from "@zxing/library"; -import {COLORS} from "./colors"; - -PdfJS.GlobalWorkerOptions.workerSrc = `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/${PdfJS.version}/pdf.worker.js` - -export async function getPayloadBodyFromFile(file: File, color: COLORS): Promise { - let imageData: ImageData; - - switch (file.type) { - case 'application/pdf': - console.log('pdf') - // Read file - const fileBuffer = await file.arrayBuffer(); - imageData = await getImageDataFromPdf(fileBuffer) - break case 'image/png': case 'image/jpeg': case 'image/webp': @@ -327,7 +307,6 @@ async function getImageDataFromPdf(fileBuffer: ArrayBuffer): Promise { console.log('processSHC'); diff --git a/src/sentry.ts b/src/sentry.ts index 5d2f443..2c7525c 100644 --- a/src/sentry.ts +++ b/src/sentry.ts @@ -3,7 +3,7 @@ import { Integrations } from '@sentry/tracing'; export const initSentry = () => { SentryModule.init({ - release: 'grassroots_covidpass@1.9.23', // App version. Needs to be manually updated as we go unless we make the build smarter + release: 'grassroots_covidpass@1.10.0', // App version. Needs to be manually updated as we go unless we make the build smarter dsn: 'https://7120dcf8548c4c5cb148cdde2ed6a778@o1015766.ingest.sentry.io/5981424', integrations: [ new Integrations.BrowserTracing(),