Compare commits

..

No commits in common. "16deab5308b7245860d42b8f49aba0706595d95f" and "1c5e2460958919951968c8c20eb69929cfba81d5" have entirely different histories.

4 changed files with 9 additions and 22 deletions

View File

@ -36,7 +36,6 @@
"@odit/license-exporter": "0.0.12", "@odit/license-exporter": "0.0.12",
"@sveltejs/adapter-static": "2.0.2", "@sveltejs/adapter-static": "2.0.2",
"@sveltejs/kit": "1.5.0", "@sveltejs/kit": "1.5.0",
"@types/bwip-js": "^3.2.0",
"@typescript-eslint/eslint-plugin": "5.45.0", "@typescript-eslint/eslint-plugin": "5.45.0",
"@typescript-eslint/parser": "5.45.0", "@typescript-eslint/parser": "5.45.0",
"auto-changelog": "2.4.0", "auto-changelog": "2.4.0",
@ -67,7 +66,7 @@
"commit": true, "commit": true,
"requireCleanWorkingDir": false, "requireCleanWorkingDir": false,
"commitMessage": "🚀Bumped version to ${version}", "commitMessage": "🚀Bumped version to ${version}",
"requireBranch": "main", "requireBranch": "dev",
"push": true, "push": true,
"tag": true, "tag": true,
"tagName": null, "tagName": null,
@ -77,7 +76,7 @@
"publish": false "publish": false
}, },
"hooks": { "hooks": {
"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && pnpm licenses:export && git add CHANGELOG.md licenses.md" "after:bump": "pnpx auto-changelog --commit-limit false -p -u --hide-credit && pnpm licenses:export && git add CHANGELOG.md licenses.md"
} }
}, },
"volta": { "volta": {

15
pnpm-lock.yaml generated
View File

@ -2,7 +2,7 @@ lockfileVersion: '6.0'
dependencies: dependencies:
'@odit/lfk-client-js': '@odit/lfk-client-js':
specifier: 1.0.1 specifier: ^1.0.1
version: 1.0.1 version: 1.0.1
bwip-js: bwip-js:
specifier: 3.4.0 specifier: 3.4.0
@ -18,9 +18,6 @@ devDependencies:
'@sveltejs/kit': '@sveltejs/kit':
specifier: 1.5.0 specifier: 1.5.0
version: 1.5.0(svelte@3.54.0)(vite@4.2.0) version: 1.5.0(svelte@3.54.0)(vite@4.2.0)
'@types/bwip-js':
specifier: ^3.2.0
version: 3.2.0
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: 5.45.0 specifier: 5.45.0
version: 5.45.0(@typescript-eslint/parser@5.45.0)(eslint@8.28.0)(typescript@5.0.4) version: 5.45.0(@typescript-eslint/parser@5.45.0)(eslint@8.28.0)(typescript@5.0.4)
@ -606,12 +603,6 @@ packages:
engines: {node: '>= 6'} engines: {node: '>= 6'}
dev: true dev: true
/@types/bwip-js@3.2.0:
resolution: {integrity: sha512-UNcuIorD+Cw+jlJm9YExx0fkUeR0z3a6bidcgvK13GmBshShLv6NTWkuzklBeFl+90ZxBvJx1CHkDFNptSCbAA==}
dependencies:
'@types/node': 18.15.11
dev: true
/@types/cookie@0.5.1: /@types/cookie@0.5.1:
resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==} resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==}
dev: true dev: true
@ -624,10 +615,6 @@ packages:
resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
dev: true dev: true
/@types/node@18.15.11:
resolution: {integrity: sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==}
dev: true
/@types/pug@2.0.6: /@types/pug@2.0.6:
resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==} resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
dev: true dev: true

View File

@ -5,7 +5,7 @@ type UserState = {
access_token: string; access_token: string;
refresh_token: string; refresh_token: string;
isLoggedIn: boolean; isLoggedIn: boolean;
refreshInterval: NodeJS.Timer | undefined refreshInterval: number
}; };
const userStore = () => { const userStore = () => {
@ -13,7 +13,7 @@ const userStore = () => {
access_token: '', access_token: '',
refresh_token: '', refresh_token: '',
isLoggedIn: false, isLoggedIn: false,
refreshInterval: undefined refreshInterval: 0
}; };
const { subscribe, set, update } = writable(state); const { subscribe, set, update } = writable(state);
@ -75,7 +75,7 @@ const userStore = () => {
state.isLoggedIn = false; state.isLoggedIn = false;
state.access_token = ''; state.access_token = '';
state.refresh_token = ''; state.refresh_token = '';
state.refreshInterval = undefined; state.refreshInterval = 0;
localStorage.clear(); localStorage.clear();
return state; return state;
}); });

View File

@ -36,7 +36,7 @@
if (is_qrcode) { if (is_qrcode) {
bcid = 'qrcode'; bcid = 'qrcode';
} }
bwipjs.toCanvas(canvas, { let codeconfig = {
bcid, bcid,
text: `${text}`, text: `${text}`,
scale: 10, scale: 10,
@ -44,7 +44,8 @@
textxalign: 'center', textxalign: 'center',
backgroundcolor: 'ffffff', backgroundcolor: 'ffffff',
height: 10 height: 10
}); };
bwipjs.toCanvas(canvas, codeconfig);
return canvas.toDataURL('image/png'); return canvas.toDataURL('image/png');
} }
</script> </script>