From 68f9b0d8ffd5cadb5dad96192b9d67eaf8c96bc9 Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Fri, 1 Oct 2021 11:39:00 +1300 Subject: [PATCH 1/4] Fix QR code snippet when `brew.shareId` doesn't exist --- client/homebrew/editor/snippetbar/snippets/snippets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index 15fc5ba14..b7bfaf07d 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -55,7 +55,7 @@ module.exports = [ gen : (brew)=>{ return `![]` + `(https://api.qrserver.com/v1/create-qr-code/?data=` + - `https://homebrewery.naturalcrit.com/share/${brew.shareId}` + + `https://homebrewery.naturalcrit.com` + `${brew.shareId ? `/share/${brew.shareId}` : ''}` + `&size=100x100) {width:100px;mix-blend-mode:multiply}`; } }, From b24c3527cabbc3f0de6792894bfaa9e2c977c3b8 Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Fri, 1 Oct 2021 12:44:28 +1300 Subject: [PATCH 2/4] Update to use `dedent` in the same manner as other snippets --- client/homebrew/editor/snippetbar/snippets/snippets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index b7bfaf07d..d2bcc656f 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -53,10 +53,10 @@ module.exports = [ name : 'QR Code', icon : 'fas fa-qrcode', gen : (brew)=>{ - return `![]` + - `(https://api.qrserver.com/v1/create-qr-code/?data=` + - `https://homebrewery.naturalcrit.com` + `${brew.shareId ? `/share/${brew.shareId}` : ''}` + - `&size=100x100) {width:100px;mix-blend-mode:multiply}`; + return dedent`![] + (https://api.qrserver.com/v1/create-qr-code/?data= + https://homebrewery.naturalcrit.com${brew.shareId ? `/share/${brew.shareId}` : ''} + &size=100x100) {width:100px;mix-blend-mode:multiply}`; } }, { From f69f73fcda845b203e2385f395fa4b2ec8c0715a Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Fri, 1 Oct 2021 13:03:08 +1300 Subject: [PATCH 3/4] Revert "Update to use `dedent` in the same manner as other snippets" This reverts commit b24c3527cabbc3f0de6792894bfaa9e2c977c3b8. --- client/homebrew/editor/snippetbar/snippets/snippets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index d2bcc656f..b7bfaf07d 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -53,10 +53,10 @@ module.exports = [ name : 'QR Code', icon : 'fas fa-qrcode', gen : (brew)=>{ - return dedent`![] - (https://api.qrserver.com/v1/create-qr-code/?data= - https://homebrewery.naturalcrit.com${brew.shareId ? `/share/${brew.shareId}` : ''} - &size=100x100) {width:100px;mix-blend-mode:multiply}`; + return `![]` + + `(https://api.qrserver.com/v1/create-qr-code/?data=` + + `https://homebrewery.naturalcrit.com` + `${brew.shareId ? `/share/${brew.shareId}` : ''}` + + `&size=100x100) {width:100px;mix-blend-mode:multiply}`; } }, { From d9893e29ff73dc392449eea0dc937dd575bf44ef Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 30 Sep 2021 21:06:25 -0400 Subject: [PATCH 4/4] Update client/homebrew/editor/snippetbar/snippets/snippets.js --- client/homebrew/editor/snippetbar/snippets/snippets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index b7bfaf07d..7b008fe1e 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -55,7 +55,7 @@ module.exports = [ gen : (brew)=>{ return `![]` + `(https://api.qrserver.com/v1/create-qr-code/?data=` + - `https://homebrewery.naturalcrit.com` + `${brew.shareId ? `/share/${brew.shareId}` : ''}` + + `https://homebrewery.naturalcrit.com${brew.shareId ? `/share/${brew.shareId}` : ''}` + `&size=100x100) {width:100px;mix-blend-mode:multiply}`; } },