Refactor pdf (#75)

* refactor pdf generation; add eu icon * fix text and space Co-authored-by: Gordon Grund <[email protected]>
eu-digital-green-certificates · May 21, 2021 · 6620270 · 6620270
1 parent 18a861d
commit 6620270
Show file tree

Hide file tree

Showing 13 changed files with 503 additions and 477 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,6 @@
     "json-schema-to-typescript": "^10.1.4",
     "jsonschema": "^1.4.0",
     "jspdf": "^2.3.1",
-    "jspdf-customfonts": "^0.0.4-rc.4",
     "keycloak-js": "^10.0.1",
     "lint-staged": "^10.5.4",
     "moment": "^2.29.1",
@@ -51,8 +50,12 @@
     "web-vitals": "^1.0.1"
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": ["eslint --fix"],
-    "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": ["prettier --write"]
+    "*.{js,jsx,ts,tsx}": [
+      "eslint --fix"
+    ],
+    "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
+      "prettier --write"
+    ]
   },
   "proxy": "http://localhost:8080",
   "scripts": {

diff --git a/src/assets/SCSS/custom.scss b/src/assets/SCSS/custom.scss
@@ -315,11 +315,6 @@ hr {
     display: none;
 }
 
-.eu-logo {
-    margin-left: 1rem;
-    margin: 13px 0px 13px 16px;
-}
-
 .header-title {
     font-size: 18px;
     margin-left: 16px;

diff --git a/src/assets/SCSS/fonts/calibri-bold.js b/src/assets/SCSS/fonts/calibri-bold.js
diff --git a/src/assets/SCSS/fonts/calibri-bolditalic.js b/src/assets/SCSS/fonts/calibri-bolditalic.js
diff --git a/src/assets/SCSS/fonts/calibri-italic.js b/src/assets/SCSS/fonts/calibri-italic.js
diff --git a/src/assets/SCSS/fonts/calibri-normal.js b/src/assets/SCSS/fonts/calibri-normal.js
diff --git a/src/assets/i18n/en/translation.json b/src/assets/i18n/en/translation.json
@@ -38,7 +38,8 @@
   "patientdata-exclude": "Include patient data in QR-Code",
   "patient-data-correction": "Correct patient data",
   "process-finish": "Finish process",
-  "generate-pdf": "Generate PDF", 
+  "generate-pdf": "Generate PDF",
+  "show-pdf": "Show PDF",
   "qr-code": "QR Code",
   "your-certificate": "Your Certificate",
   "personal-data": "Personal Details",

diff --git a/src/assets/images/Flag+EU.png b/src/assets/images/Flag+EU.png
diff --git a/src/components/header.component.tsx b/src/components/header.component.tsx
@@ -26,7 +26,7 @@ import '../i18n';
 import { useTranslation } from 'react-i18next';
 
 import useNavigation from '../misc/navigation';
-import EULogo from '../assets/images/EU_logo@3x.png'
+import EULogo from '../assets/images/Flag+EU.png'
 
 const Header = (props: any) => {
 
@@ -44,7 +44,7 @@ const Header = (props: any) => {
         <>
         <Container className='bg-white px-0 position-relative'>
             {/* simple header with logo */}
-            <Image src={EULogo} className='eu-logo' />
+            <Image src={EULogo} className='m-3' />
         </Container>
         <Container className='d-flex bg-gray-1 px-0 position-relative'>
             <span className='header-title'>{t('translation:title')}</span>