Skip to content

Commit

Permalink
Merge pull request #14 from covidpass-org/dev
Browse files Browse the repository at this point in the history
Merge development version into main
  • Loading branch information
SoerenBusse authored Jun 28, 2021
2 parents 15d9dc3 + 288bde0 commit 742e1c4
Show file tree
Hide file tree
Showing 9 changed files with 155 additions and 105 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This is a basic workflow to help you get started with Actions

name: Publish
on:
push:
branches:
- '**'
tags:
- 'v*.*.*'
pull_request:

jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Docker meta
id: meta
uses: docker/metadata-action@v3
with:
# list of Docker images to use as base name for tags
images: ghcr.io/covidpass-org/covidpass
# generate Docker tags based on the following events/attributes
tags: |
type=schedule
type=edge,branch=dev
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
6 changes: 3 additions & 3 deletions components/Alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export function Alert() {
}

return(
<div id="alert" style={{"display": "none"}} className="bg-red-100 border border-red-400 text-red-700 px-4 mx-4 py-3 rounded relative" role="alert">
<strong className="font-bold pr-2" id="heading"></strong>
<span className="block sm:inline" id="message"></span>
<div id="alert" style={{"display": "none"}} className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 mt-5 rounded relative" role="alert">
<strong className="font-bold pr-2" id="heading"/>
<span className="block sm:inline" id="message"/>
<span className="absolute top-0 bottom-0 right-0 px-4 py-3" onClick={close}>
<svg className="fill-current h-6 w-6 text-red-500" role="button" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><title>Close</title><path d="M14.348 14.849a1.2 1.2 0 0 1-1.697 0L10 11.819l-2.651 3.029a1.2 1.2 0 1 1-1.697-1.697l2.758-3.15-2.759-3.152a1.2 1.2 0 1 1 1.697-1.697L10 8.183l2.651-3.031a1.2 1.2 0 1 1 1.697 1.697l-2.758 3.152 2.758 3.15a1.2 1.2 0 0 1 0 1.698z"/></svg>
</span>
Expand Down
26 changes: 12 additions & 14 deletions components/Form.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ const PDFJS = require('pdfjs-dist')
PDFJS.GlobalWorkerOptions.workerSrc = `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/${PDFJS.version}/pdf.worker.js`

import jsQR from "jsqr"
import { saveAs } from 'file-saver'
import {saveAs} from 'file-saver'

import { decodeData } from "../src/decode"
import { createPass } from "../src/pass"
import {decodeData} from "../src/decode"
import {createPass} from "../src/pass"
import Card from "../components/Card"
import Alert from "../components/Alert"

Expand Down Expand Up @@ -43,12 +43,12 @@ function Form() {
const file = document.getElementById('pdf').files[0]

const result = await readFileAsync(file)
var typedarray = new Uint8Array(result)
let typedArray = new Uint8Array(result)

const canvas = document.getElementById('canvas')
const ctx = canvas.getContext('2d')

var loadingTask = PDFJS.getDocument(typedarray)
let loadingTask = PDFJS.getDocument(typedArray)
await loadingTask.promise.then(async function (pdfDocument) {
const pdfPage = await pdfDocument.getPage(1)
const viewport = pdfPage.getViewport({ scale: 1 })
Expand All @@ -63,8 +63,8 @@ function Form() {
return await renderTask.promise
})

var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height)
var code = jsQR(imageData.data, imageData.width, imageData.height, {
let imageData = ctx.getImageData(0, 0, canvas.width, canvas.height)
let code = jsQR(imageData.data, imageData.width, imageData.height, {
inversionAttempts: 'dontInvert',
})

Expand All @@ -78,9 +78,7 @@ function Form() {
error('Invalid QR code found', 'Make sure that you picked the correct PDF')
}

const result = { decoded: decoded, raw: rawData }

return result
return {decoded: decoded, raw: rawData}
} else {
error('No QR code found', 'Try scanning the PDF again')
}
Expand Down Expand Up @@ -119,7 +117,7 @@ function Form() {
saveAs(passBlob, 'covid.pkpass')
}
} catch (e) {
error('Error:', error.message)
error('Error:', e.message)
} finally {
document.getElementById('spin').style.display = 'none'
}
Expand Down Expand Up @@ -155,7 +153,7 @@ function Form() {
<option value="teal">teal</option>
</select>
<div className="absolute inset-y-0 right-0 flex items-center px-2 pointer-events-none">
<svg className="w-5 h-5 fill-current" viewBox="0 0 20 20"><path d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clipRule="evenodd" fillRule="evenodd"></path></svg>
<svg className="w-5 h-5 fill-current" viewBox="0 0 20 20"><path d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clipRule="evenodd" fillRule="evenodd"/></svg>
</div>
</div>
} />
Expand All @@ -177,8 +175,8 @@ function Form() {
</button>
<div id="spin" style={{ "display": "none" }}>
<svg className="animate-spin h-5 w-5 ml-2" viewBox="0 0 24 24">
<circle className="opacity-0" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
<circle className="opacity-0" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"/>
<path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"/>
</svg>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions pages/api/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default function handler(req, res) {
// Return the API_BASE_URL. This Endpoint allows us to access the env Variable in client javascript
res.status(200).json({ apiBaseUrl: process.env.API_BASE_URL })
}
1 change: 0 additions & 1 deletion pages/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { NextSeo } from 'next-seo';

import Form from '../components/Form'
import Logo from '../components/Logo'
import Card from '../components/Card'
import Page from '../components/Page'

Expand Down
27 changes: 14 additions & 13 deletions src/constants.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
exports.BASE_URL = 'https://raw.githubusercontent.com/ehn-dcc-development/ehn-dcc-valuesets/main/'
exports.API_BASE_URL = 'https://api.covidpass.marvinsextro.de/'
exports.VALUE_SET_BASE_URL = 'https://raw.githubusercontent.com/ehn-dcc-development/ehn-dcc-valuesets/main/'
exports.VALUE_TYPES = {
medicalProducts: 'vaccine-medicinal-product.json',
countryCodes: 'country-2-codes.json',
manufacturers: 'vaccine-mah-manf.json',
medicalProducts: 'vaccine-medicinal-product.json',
countryCodes: 'country-2-codes.json',
manufacturers: 'vaccine-mah-manf.json',
}
exports.COLORS = {
white: 'rgb(255, 255, 255)',
black: 'rgb(0, 0, 0)',
grey: 'rgb(33, 33, 33)',
green: 'rgb(27, 94, 32)',
indigo: 'rgb(26, 35, 126)',
blue: 'rgb(1, 87, 155)',
purple: 'rgb(74, 20, 140)',
teal: 'rgb(0, 77, 64)',
white: 'rgb(255, 255, 255)',
black: 'rgb(0, 0, 0)',
grey: 'rgb(33, 33, 33)',
green: 'rgb(27, 94, 32)',
indigo: 'rgb(26, 35, 126)',
blue: 'rgb(1, 87, 155)',
purple: 'rgb(74, 20, 140)',
teal: 'rgb(0, 77, 64)',
}
exports.NAME = 'CovidPass'
exports.PASS_IDENTIFIER = 'pass.de.marvinsextro.covidpass' // WELL KNOWN
exports.TEAM_IDENTIFIER = 'X8Q7Q2RLTD' // WELL KNOWN
Loading

0 comments on commit 742e1c4

Please sign in to comment.