filippodb
/
covidpass-greenpass-su-iphone-ios-android-wallet
mirror of https://github.com/covidpass-org/covidpass.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean up for Save as Photos release 1.6

This commit is contained in:
Billy Lo 2021-09-09 17:08:49 -04:00
parent 6b4cfaf42c
commit 6303637f9a
9 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/Form.tsx
View File

@ -14,6 +14,8 @@ import {PassData} from "../src/pass";
import {Photo} from "../src/photo";
import {COLORS} from "../src/colors";
import Colors from './Colors';
import {isIOS, isMacOs, isSafari} from 'react-device-detect';
function Form(): JSX.Element {
const {t} = useTranslation(['index', 'errors', 'common']);
@ -59,6 +61,7 @@ function Form(): JSX.Element {
}
});
}
checkBrowserType();
}, [inputFile])
// Show file Dialog
@ -198,6 +201,18 @@ function Form(): JSX.Element {
setLoading(false);
}
}
async function checkBrowserType() {
if (isMacOs || (isIOS && isSafari)) {
document.getElementById('download').hidden = false;
} else {
document.getElementById('download').hidden = true;
}
}
return (
<div>
<form className="space-y-5" id="form" onSubmit={addToWallet}>
@ -259,7 +274,7 @@ function Form(): JSX.Element {
</div>
}/>
<Card step="3" heading={t('index:addToWallet')} content={
<Card step="3" heading={t('index:addToWalletHeader')} content={
<div className="space-y-5">
<p>
{t('index:dataPrivacyDescription')}

5
components/Page.tsx
View File

@ -34,7 +34,7 @@ function Page(props: PageProps): JSX.Element {
{/* <a href="https://github.com/billylo1/covidpass" className="hover:underline">{t('common:gitHub')}</a> */}
</nav>
<div className="flex pt-4 flex-row space-x-4 justify-center text-md flex-wrap">Last updated: 2021-09-09 (v1.5)</div>
<div className="flex pt-4 flex-row space-x-4 justify-center text-md flex-wrap">Last updated: 2021-09-09 (v1.6)</div>
</footer>
</main>
</div>
@ -85,9 +85,6 @@ function Page(props: PageProps): JSX.Element {
<br/>
<br/>
</div>
<div id='canvas-container'>
</div>
</div>
)
}

44
package-lock.json generated
View File

@ -32,6 +32,7 @@
"pngjs": "^6.0.0",
"qrcode": "^1.4.4",
"react": "^17.0.2",
"react-device-detect": "^1.17.0",
"react-dom": "^17.0.2",
"tls": "^0.0.1",
"uuid": "^8.3.2",
@ -3685,6 +3686,18 @@
"node": ">=0.10.0"
}
},
"node_modules/react-device-detect": {
"version": "1.17.0",
"resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-1.17.0.tgz",
"integrity": "sha512-bBblIStwpHmoS281JFIVqeimcN3LhpoP5YKDWzxQdBIUP8S2xPvHDgizLDhUq2ScguLfVPmwfF5y268EEQR60w==",
"dependencies": {
"ua-parser-js": "^0.7.24"
},
"peerDependencies": {
"react": ">= 0.14.0 < 18.0.0",
"react-dom": ">= 0.14.0 < 18.0.0"
}
},
"node_modules/react-dom": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@ -4614,6 +4627,24 @@
"node": ">=4.2.0"
}
},
"node_modules/ua-parser-js": {
"version": "0.7.28",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
"integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
"funding": [
{
"type": "opencollective",
"url": "https://opencollective.com/ua-parser-js"
},
{
"type": "paypal",
"url": "https://paypal.me/faisalman"
}
],
"engines": {
"node": "*"
}
},
"node_modules/unbox-primitive": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
@ -7976,6 +8007,14 @@
"object-assign": "^4.1.1"
}
},
"react-device-detect": {
"version": "1.17.0",
"resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-1.17.0.tgz",
"integrity": "sha512-bBblIStwpHmoS281JFIVqeimcN3LhpoP5YKDWzxQdBIUP8S2xPvHDgizLDhUq2ScguLfVPmwfF5y268EEQR60w==",
"requires": {
"ua-parser-js": "^0.7.24"
}
},
"react-dom": {
"version": "17.0.2",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
@ -8682,6 +8721,11 @@
"integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
"dev": true
},
"ua-parser-js": {
"version": "0.7.28",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
"integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
},
"unbox-primitive": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",

1
package.json
View File

@ -39,6 +39,7 @@
"pngjs": "^6.0.0",
"qrcode": "^1.4.4",
"react": "^17.0.2",
"react-device-detect": "^1.17.0",
"react-dom": "^17.0.2",
"tls": "^0.0.1",
"uuid": "^8.3.2",

4
pages/index.tsx
View File

@ -32,8 +32,8 @@ function Index(): JSX.Element {
site_name: title,
}}
twitter={{
handle: '@vaxtoronto',
site: '@vaxtotorono',
handle: '@grassroots_team',
site: '@grassroots_team',
cardType: 'summary_large_image',
}}
/>

3
public/locales/en/index.yml
View File

@ -22,7 +22,8 @@ colorIndigo: indigo
colorBlue: blue
colorPurple: purple
colorTeal: teal
addToWallet: Add to Wallet
addToWallet: Add to Apple Wallet
addToWalletHeader: Add to Apple Wallet / Save as Photos
saveAsPhoto: Save as Photo
dataPrivacyDescription: |
Press the "Add to Wallet" below to import data into Wallet.

BIN
remove.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
shield2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

16
yarn.lock
View File

@ -2585,7 +2585,14 @@
"iconv-lite" "0.4.24"
"unpipe" "1.0.0"
"react-dom@^16 || ^17 || ^18", "react-dom@^17.0.2", "react-dom@>=16.0.0":
"react-device-detect@^1.17.0":
"integrity" "sha512-bBblIStwpHmoS281JFIVqeimcN3LhpoP5YKDWzxQdBIUP8S2xPvHDgizLDhUq2ScguLfVPmwfF5y268EEQR60w=="
"resolved" "https://registry.npmjs.org/react-device-detect/-/react-device-detect-1.17.0.tgz"
"version" "1.17.0"
dependencies:
"ua-parser-js" "^0.7.24"
"react-dom@^16 || ^17 || ^18", "react-dom@^17.0.2", "react-dom@>= 0.14.0 < 18.0.0", "react-dom@>=16.0.0":
"integrity" "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="
"resolved" "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz"
"version" "17.0.2"
@ -2622,7 +2629,7 @@
"resolved" "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz"
"version" "0.8.3"
"react@^16 || ^17 || ^18", "react@^16.8.0 || ^17.0.0", "react@^17.0.2", "react@>= 16.8.0", "react@>=16.0.0", "react@15.x.x || 16.x.x || 17.x.x", "react@17.0.2":
"react@^16 || ^17 || ^18", "react@^16.8.0 || ^17.0.0", "react@^17.0.2", "react@>= 0.14.0 < 18.0.0", "react@>= 16.8.0", "react@>=16.0.0", "react@15.x.x || 16.x.x || 17.x.x", "react@17.0.2":
"integrity" "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="
"resolved" "https://registry.npmjs.org/react/-/react-17.0.2.tgz"
"version" "17.0.2"
@ -3179,6 +3186,11 @@
"resolved" "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"
"version" "4.3.5"
"ua-parser-js@^0.7.24":
"integrity" "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
"resolved" "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz"
"version" "0.7.28"
"unbox-primitive@^1.0.1":
"integrity" "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="
"resolved" "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"