migrate to bwip-js
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Philipp Dormann 2023-02-01 17:36:22 +01:00
parent e5a01bcd76
commit 8cfddb5029
Signed by: philipp
GPG Key ID: 3BB9ADD52DCA4314
3 changed files with 411 additions and 115 deletions

View File

@ -8,6 +8,7 @@
"postbuild": "node env_fix.js"
},
"dependencies": {
"bwip-js": "^3.2.2",
"jsbarcode": "^3.11.5",
"marked": "2.0.3",
"redaxios": "0.4.1",

View File

@ -7,6 +7,8 @@ const config = {
baseurl_selfservice: '/selfservice/',
// full url (including fqdn)
baseurl_documentserver: 'http://localhost:4010/documents',
// optional, will fallback to code128
code_format: 'ean13',
// optional, will fallback to baseurl_selfservice/imprint
url_imprint: '',
// optional, will fallback to baseurl_selfservice/privacy

View File

@ -3,19 +3,42 @@
<section class="text-white body-font">
<div class="container mx-auto flex items-center md:flex-row flex-col">
<div
class="flex flex-col md:pr-10 md:mb-0 mb-6 pr-0 w-full md:w-auto md:text-left text-center text-black dark:text-gray-200"
class="
flex flex-col
md:pr-10 md:mb-0
mb-6
pr-0
w-full
md:w-auto md:text-left
text-center text-black
dark:text-gray-200
"
>
<p
class="text-3xl font-bold whitespace-nowrap"
v-text="(state.firstname || '') + ' ' + (state.middlename || '') + ' ' + (state.lastname || '')"
v-text="
(state.firstname || '') +
' ' +
(state.middlename || '') +
' ' +
(state.lastname || '')
"
></p>
<p class="text-md whitespace-nowrap">{{ state.group }}</p>
</div>
<div class="inline-flex md:ml-auto md:mr-0 mx-auto items-center">
<div v-if="(state.delete_active === false)">
<div v-if="state.delete_active === false">
<button
type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-sm
py-2.5
px-5
rounded-md
bg-blue-500
hover:bg-blue-600 hover:shadow-lg
"
@click="get_certificate"
>
<svg
@ -29,18 +52,31 @@
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-download"
style="display: inline;height: 1rem;vertical-align: sub;"
style="display: inline; height: 1rem; vertical-align: sub"
>
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
<polyline points="7 10 12 15 17 10" />
<line x1="12" y1="15" x2="12" y2="3" />
</svg>
{{ $t('download_certificate') }}
{{ $t("download_certificate") }}
</button>
<button
type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
@click="() => { state.delete_active = true }"
class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-sm
py-2.5
px-5
rounded-md
bg-red-600
hover:bg-red-700 hover:shadow-lg
ml-1
"
@click="
() => {
state.delete_active = true;
}
"
>
<svg
xmlns="http://www.w3.org/2000/svg"
@ -53,7 +89,7 @@
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-download"
style="display: inline;height: 1rem;vertical-align: sub;"
style="display: inline; height: 1rem; vertical-align: sub"
>
<path d="M0 0h24v24H0z" />
<path
@ -61,14 +97,26 @@
d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
/>
</svg>
{{ $t('delete_my_data') }}
{{ $t("delete_my_data") }}
</button>
</div>
<div v-if="(state.delete_active === true)">
<div v-if="state.delete_active === true">
<button
type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
@click="() => { state.delete_active = false }"
class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-sm
py-2.5
px-5
rounded-md
bg-blue-500
hover:bg-blue-600 hover:shadow-lg
"
@click="
() => {
state.delete_active = false;
}
"
>
<svg
xmlns="http://www.w3.org/2000/svg"
@ -81,16 +129,28 @@
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-download"
style="display: inline;height: 1rem;vertical-align: sub;"
style="display: inline; height: 1rem; vertical-align: sub"
>
<path fill="none" d="M0 0h24v24H0z" />
<path fill="currentColor" d="M12 11l5-5 1 1-5 5 5 5-1 1-5-5-5 5-1-1 5-5-5-5 1-1z" />
<path
fill="currentColor"
d="M12 11l5-5 1 1-5 5 5 5-1 1-5-5-5 5-1-1 5-5-5-5 1-1z"
/>
</svg>
{{ $t('cancel_keep_my_data') }}
{{ $t("cancel_keep_my_data") }}
</button>
<button
type="button"
class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-red-600 hover:bg-red-700 hover:shadow-lg ml-1"
class="
focus:border-black focus:ring-2 focus:ring-black
text-white text-sm
py-2.5
px-5
rounded-md
bg-red-600
hover:bg-red-700 hover:shadow-lg
ml-1
"
@click="delete_me"
>
<svg
@ -104,7 +164,7 @@
stroke-linecap="round"
stroke-linejoin="round"
class="feather feather-download"
style="display: inline;height: 1rem;vertical-align: sub;"
style="display: inline; height: 1rem; vertical-align: sub"
>
<path d="M0 0h24v24H0z" />
<path
@ -112,7 +172,7 @@
d="M17 6h5v2h-2v13a1 1 0 01-1 1H5a1 1 0 01-1-1V8H2V6h5V3a1 1 0 011-1h8a1 1 0 011 1v3zm1 2H6v12h12V8zm-5 6l2 2-1 1-2-2-2 2-1-1 2-2-2-2 1-1 2 2 2-2 1 1-2 2zM9 4v2h6V4H9z"
/>
</svg>
{{ $t('confirm_delete_all_of_my_data') }}
{{ $t("confirm_delete_all_of_my_data") }}
</button>
</div>
</div>
@ -124,68 +184,170 @@
<div class="flex lg:flex-wrap flex-row lg:space-x-2">
<div class="flex-none">
<button
@click="() => { state.activetab = 'profile' }"
:class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'profile') }"
@click="
() => {
state.activetab = 'profile';
}
"
:class="{
'tab-active border-b-2 font-medium border-blue-500':
state.activetab === 'profile',
}"
class="tab tab-underline py-4 px-6 block"
type="button"
>{{ $t('profile') }}</button>
>
{{ $t("profile") }}
</button>
</div>
<div class="flex-none">
<button
@click="() => { state.activetab = 'laptimes' }"
:class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'laptimes') }"
@click="
() => {
state.activetab = 'laptimes';
}
"
:class="{
'tab-active border-b-2 font-medium border-blue-500':
state.activetab === 'laptimes',
}"
class="tab tab-underline py-4 px-6 block"
type="button"
>{{ $t('lap_times') }}</button>
>
{{ $t("lap_times") }}
</button>
</div>
<div class="flex-none">
<button
@click="() => { state.activetab = 'sponsorings' }"
:class="{ 'tab-active border-b-2 font-medium border-blue-500': (state.activetab === 'sponsorings') }"
@click="
() => {
state.activetab = 'sponsorings';
}
"
:class="{
'tab-active border-b-2 font-medium border-blue-500':
state.activetab === 'sponsorings',
}"
class="tab tab-underline py-4 px-6 block"
type="button"
>{{ $t('sponsoring') }}</button>
>
{{ $t("sponsoring") }}
</button>
</div>
</div>
<div v-if="(state.activetab === 'profile')" class="tab-content block">
<div v-if="state.activetab === 'profile'" class="tab-content block">
<div class="py-4 w-full">
<div class="flex flex-col">
<form class="form flex flex-wrap w-full">
<div class="w-full">
<div class="form-element">
<div class="text-lg">{{ $t('registrierungscode') }}</div>
<img alt="Registrierungscode" :src="state.barcode">
<div class="text-lg">{{ $t('vorname') }}</div>
<div class="text-lg">{{ $t("registrierungscode") }}</div>
<img alt="Registrierungscode" :src="state.barcode" />
<div class="text-lg">{{ $t("vorname") }}</div>
<p
class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
class="
h-10
w-full
dark:bg-gray-800
rounded
text-base
outline-none
dark:text-gray-100
text-gray-600
py-1
px-3
leading-8
transition-colors
duration-200
ease-in-out
"
v-text="state.firstname"
/>
</div>
<div class="form-element">
<div class="text-lg">{{ $t('mittelname') }}</div>
<div class="text-lg">{{ $t("mittelname") }}</div>
<p
class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
class="
h-10
w-full
dark:bg-gray-800
rounded
text-base
outline-none
dark:text-gray-100
text-gray-600
py-1
px-3
leading-8
transition-colors
duration-200
ease-in-out
"
v-text="state.middlename"
/>
</div>
<div class="form-element">
<div class="text-lg">{{ $t('nachname') }}</div>
<div class="text-lg">{{ $t("nachname") }}</div>
<p
class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
class="
h-10
w-full
dark:bg-gray-800
rounded
text-base
outline-none
dark:text-gray-100
text-gray-600
py-1
px-3
leading-8
transition-colors
duration-200
ease-in-out
"
v-text="state.lastname"
/>
</div>
<div class="form-element">
<div class="text-lg">{{ $t('e_mail_adress') }}</div>
<div class="text-lg">{{ $t("e_mail_adress") }}</div>
<p
class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
class="
h-10
w-full
dark:bg-gray-800
rounded
text-base
outline-none
dark:text-gray-100
text-gray-600
py-1
px-3
leading-8
transition-colors
duration-200
ease-in-out
"
v-text="state.email"
/>
</div>
<div class="form-element">
<div class="text-lg">{{ $t('phone_number') }}</div>
<div class="text-lg">{{ $t("phone_number") }}</div>
<p
class="h-10 w-full dark:bg-gray-800 rounded text-base outline-none dark:text-gray-100 text-gray-600 py-1 px-3 leading-8 transition-colors duration-200 ease-in-out"
class="
h-10
w-full
dark:bg-gray-800
rounded
text-base
outline-none
dark:text-gray-100
text-gray-600
py-1
px-3
leading-8
transition-colors
duration-200
ease-in-out
"
v-text="state.phone"
/>
</div>
@ -194,7 +356,7 @@
</div>
</div>
</div>
<div v-if="(state.activetab === 'laptimes')" class="tab-content block">
<div v-if="state.activetab === 'laptimes'" class="tab-content block">
<div class="py-4 w-full">
<section class="text-gray-400 dark:bg-gray-900 body-font">
<div class="container mx-auto">
@ -204,15 +366,37 @@
class="table-auto w-full text-left whitespace-no-wrap"
>
<thead
class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
class="
text-black
bg-gray-300
dark:text-white
text-sm
dark:bg-gray-800
"
>
<tr>
<th
class="px-4 py-3 title-font tracking-wider font-medium"
>{{ $t('distance') }}</th>
class="
px-4
py-3
title-font
tracking-wider
font-medium
"
>
{{ $t("distance") }}
</th>
<th
class="px-4 py-3 title-font tracking-wider font-medium"
>{{ $t('lap_time') }}</th>
class="
px-4
py-3
title-font
tracking-wider
font-medium
"
>
{{ $t("lap_time") }}
</th>
</tr>
</thead>
<tbody class="text-gray-900 dark:text-gray-50">
@ -224,20 +408,32 @@
</tr>
</tbody>
</table>
<div v-else class="text-center font-bold text-black dark:text-white text-2xl">
<div
v-else
class="
text-center
font-bold
text-black
dark:text-white
text-2xl
"
>
<img
src="../assets/empty_laps.svg"
style="height:25rem; margin:0 auto;"
style="height: 25rem; margin: 0 auto"
:alt="[[$t('no_laps_scans_were_recorded_yet')]]"
/>
{{ $t('no_laps_scans_were_recorded_yet') }}
{{ $t("no_laps_scans_were_recorded_yet") }}
</div>
</div>
</div>
</section>
</div>
</div>
<div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
<div
v-if="state.activetab === 'sponsorings'"
class="tab-content block"
>
<div class="py-4 w-full">
<section class="text-gray-400 dark:bg-gray-900 body-font">
<div class="container mx-auto">
@ -247,16 +443,48 @@
class="table-auto w-full text-left whitespace-no-wrap"
>
<thead
class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
class="
text-black
bg-gray-300
dark:text-white
text-sm
dark:bg-gray-800
"
>
<tr>
<th class="px-4 py-3 title-font tracking-wider font-medium">Name</th>
<th
class="px-4 py-3 title-font tracking-wider font-medium"
>{{ $t('amount_per_kilometer_in_eur') }}</th>
class="
px-4
py-3
title-font
tracking-wider
font-medium
"
>
Name
</th>
<th
class="px-4 py-3 title-font tracking-wider font-medium"
>{{ $t('current_total_amount_in_eur') }}</th>
class="
px-4
py-3
title-font
tracking-wider
font-medium
"
>
{{ $t("amount_per_kilometer_in_eur") }}
</th>
<th
class="
px-4
py-3
title-font
tracking-wider
font-medium
"
>
{{ $t("current_total_amount_in_eur") }}
</th>
</tr>
</thead>
<tbody class="text-gray-900 dark:text-gray-50">
@ -270,51 +498,86 @@
</td>
<td class="px-4 py-3">
<span
v-text="(s.amountPerDistance / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })"
></span>
v-text="
(s.amountPerDistance / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })
"
></span
>
</td>
<td class="px-4 py-3">
<span
v-text="(s.amount / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })"
></span>
v-text="
(s.amount / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })
"
></span
>
</td>
</tr>
</tbody>
<tfoot class="text-gray-900 dark:text-gray-50">
<tr>
<td class="px-4 py-3">{{ $t('total') }}</td>
<td class="px-4 py-3">{{ $t("total") }}</td>
<td class="px-4 py-3">
<span
v-text="(state.sponsorings.reduce(function(sum, current) {
return sum + current.amountPerDistance;
}, 0) / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })"
></span>
v-text="
(
state.sponsorings.reduce(function (
sum,
current
) {
return sum + current.amountPerDistance;
},
0) / 100
)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })
"
></span
>
</td>
<td class="px-4 py-3">
<span
v-text="(state.sponsorings.reduce(function(sum, current) {
return sum + current.amount;
}, 0) / 100)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })"
></span>
v-text="
(
state.sponsorings.reduce(function (
sum,
current
) {
return sum + current.amount;
},
0) / 100
)
.toFixed(2)
.toLocaleString('de-DE', { valute: 'EUR' })
"
></span
>
</td>
</tr>
</tfoot>
</table>
<div v-else class="text-center font-bold text-black dark:text-white text-2xl">
<div
v-else
class="
text-center
font-bold
text-black
dark:text-white
text-2xl
"
>
<img
src="../assets/empty_laps.svg"
style="height:25rem; margin:0 auto;"
:alt="[[$t('no_sponsorings_for_you_were_recorded_yet')]]"
style="height: 25rem; margin: 0 auto"
:alt="[
[$t('no_sponsorings_for_you_were_recorded_yet')],
]"
/>
{{ $t('no_sponsorings_for_you_were_recorded_yet') }}
{{ $t("no_sponsorings_for_you_were_recorded_yet") }}
</div>
</div>
</div>
@ -332,11 +595,22 @@ import { reactive } from "vue";
import { TYPE, useToast } from "vue-toastification";
import axios from "redaxios";
import JsBarcode from "jsbarcode";
import bwipjs from "bwip-js";
function textToBase64Barcode(text){
function textToBase64Barcode(text) {
var canvas = document.createElement("canvas");
JsBarcode(canvas, text, {format: "CODE128", displayValue:false});
return canvas.toDataURL("image/png");
// bwipjs.toCanvas(canvas, text, {format: config.code_format || "code128", displayValue:false});
bwipjs.toCanvas(canvas, {
bcid: config.code_format || "code128",
text: `${text}` || "?",
scale: 3, // 3x scaling factor
height: 10, // Bar height, in millimeters
includetext: false, // Show human-readable text
textxalign: "center", // Always good to set this
});
const base64 = canvas.toDataURL("image/png");
console.log(base64);
return base64;
}
const state = reactive({
@ -351,14 +625,15 @@ const state = reactive({
group: "",
activetab: "profile",
delete_active: false,
fullobject: {}
})
fullobject: {},
});
const toast = useToast();
const props = defineProps({
token: String
})
token: String,
});
const accesstoken = atob(props.token);
axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
axios
.get(`${config.baseurl}api/runners/me/${accesstoken}`)
.then(({ data }) => {
state.phone = data.phone;
state.email = data.email;
@ -368,26 +643,38 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
state.group = data.group;
state.sponsorings = data.distanceDonations;
state.fullobject = data;
state.barcode = textToBase64Barcode(state.fullobject.id);
}).catch((error) => {
toast.error("Profil konnte nicht geladen werden...");
state.barcode = textToBase64Barcode(data.id);
})
axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
.catch((error) => {
toast.error("Profil konnte nicht geladen werden...");
});
axios
.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
.then(({ data }) => {
data.map(function(s) {
s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
s.distance = Math.floor(s.distance / 1000) + 'km ' + (Math.floor(s.distance % 1000) + "").padStart(3, "0") + "m"
data.map(function (s) {
s.lapTime =
Math.floor(s.lapTime / 60) +
"min " +
(Math.floor(s.lapTime % 60) + "").padStart(2, "0") +
"s";
s.distance =
Math.floor(s.distance / 1000) +
"km " +
(Math.floor(s.distance % 1000) + "").padStart(3, "0") +
"m";
return s;
})
data.filter(s => s.valid === true);
});
data.filter((s) => s.valid === true);
state.scans = data;
}).catch((error) => {
toast.error("Profil konnte nicht geladen werden...");
})
.catch((error) => {
toast.error("Profil konnte nicht geladen werden...");
});
function delete_me() {
toast("Profil wird gelöscht...");
let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`
axios.delete(url)
let url = `${config.baseurl}api/runners/me/${accesstoken}?force=true`;
axios
.delete(url)
.then(() => {
toast("Alle Daten gelöscht!");
location.replace(`${config.baseurl_selfservice}`);
@ -398,31 +685,37 @@ function delete_me() {
}
function get_certificate() {
toast("Urkunde wird generiert...");
const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
const browserlocale = (
(navigator.languages && navigator.languages[0]) ||
""
).substr(0, 2);
let url = `${config.baseurl_documentserver}certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
let postdata = Object.assign({}, state.fullobject);
postdata.group = {
name: postdata.group
}
postdata = [postdata]
axios.post(url, postdata, {
responseType: "blob"
})
name: postdata.group,
};
postdata = [postdata];
axios
.post(url, postdata, {
responseType: "blob",
})
.then((response) => {
console.log(response)
console.log(response);
if (response.status != "200") {
toast.error("Urkunde konnte nicht generiert werden...");
} else {
var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
var fileLink = document.createElement('a');
var fileURL = window.URL.createObjectURL(
new Blob([response.data], { type: "application/pdf" })
);
var fileLink = document.createElement("a");
fileLink.href = fileURL;
fileLink.setAttribute('download', 'Certificate.pdf');
fileLink.setAttribute("download", "Certificate.pdf");
document.body.appendChild(fileLink);
fileLink.click();
fileLink.remove();
toast("Urkunde generiert!",{type:TYPE.SUCCESS});
toast("Urkunde generiert!", { type: TYPE.SUCCESS });
}
})
.catch((err) => {