Skip to content
Snippets Groups Projects
Commit c93f9d39 authored by Boyan Tsolov's avatar Boyan Tsolov
Browse files

bs test 2

parent 0ab25d27
No related branches found
No related tags found
1 merge request!91DRAFT: TEST (delete when done testing) upgrade yarn
Pipeline #68505 passed
...@@ -140,12 +140,20 @@ const defaultTemplateOptions = { ...@@ -140,12 +140,20 @@ const defaultTemplateOptions = {
* @returns * @returns
*/ */
const generateQrCode = (text, qrCodeOptions, templateOptions) => { const generateQrCode = (text, qrCodeOptions, templateOptions) => {
console.log("--------------", {
qrCodeOptions,
templateOptions,
});
qrCodeOptions = qrCodeOptions qrCodeOptions = qrCodeOptions
? Object.assign(defaultOptions, qrCodeOptions) ? Object.assign(defaultOptions, qrCodeOptions)
: defaultOptions; : defaultOptions;
templateOptions = templateOptions templateOptions = templateOptions
? Object.assign(defaultTemplateOptions, templateOptions) ? Object.assign(defaultTemplateOptions, templateOptions)
: defaultTemplateOptions; : defaultTemplateOptions;
console.log("--------------", {
qrCodeOptions,
templateOptions,
});
const options = { const options = {
text, text,
width: qrCodeOptions.width, width: qrCodeOptions.width,
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"full-icu": "^1.3.1", "full-icu": "^1.3.1",
"husky": "^4.2.5", "husky": "^4.2.5",
"jest": "^26.6.3", "jest": "^26.6.3",
"jsdom": "^16.5.3", "jsdom": "16.5.3",
"lint-staged": "^10.2.13", "lint-staged": "^10.2.13",
"pbjs": "^0.0.14", "pbjs": "^0.0.14",
"prettier": "^2.1.1", "prettier": "^2.1.1",
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment