Fix

emg110 · Feb 11, 2023 · 8013918 · 8013918
1 parent 9ba389e
commit 8013918
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 76 deletions.
diff --git a/bin/algo-qrcode.js b/bin/algo-qrcode.js
@@ -1,5 +1,5 @@
 const QRCode = require("qrcode-svg")
-const QRCodeTerminal = require("../terminal.js")
+const QRCodeTerminal = require("../src/terminal.js")
 const yargs = require('yargs');
 
 

diff --git a/index.mjs b/index.mjs
@@ -1,73 +1,2 @@
-import QRCode from "qrcode-svg"
-import QRCodeTerminal from "./src/terminal"
-
-
-import { isBrowser, isNode, isWebWorker, isJsDom, isDeno } from "browser-or-node";
-function parseOptions(args) {
-    /* 
-  content: "https://github.com/",
-  padding: 4,
-  width: 256,
-  height: 256,
-  color: "#000000",
-  background: "#ffffff",
-  ecl: "M",
-*/
-    let content = "algorand://"
-    let amount = args.amount;
-    let wallet = args.wallet;
-    let label = args.label;
-    let asset = args.asset;
-    let note = args.note;
-    if (!!label && !!wallet) {
-        content = "algorand://" + wallet+ "?" + "&label=" + label;
-    } else if (!!asset && !!wallet) {
-        if (!!note && amount > 0) {
-            content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&asset=" + asset + "&note=" + note;
-        } else if (amount > 0) {
-            content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&asset=" + asset;
-        } else if (amount === 0) {
-            content = "algorand://?" + "amount=0"  + "&asset=" + asset;
-        }
-
-    } else if (!!note && !!wallet && !!amount) {
-        content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&note=" + note;
-    } else if ( !!wallet && !!amount){
-        content = "algorand://" + wallet+ "?" + "&amount=" + amount;
-    }
-    let options = {
-        content: content,
-        container: "svg-viewbox",
-        ecl: args.ecl || "H",
-        file: args.file || "algorand-qrcode.svg",
-        padding: args.margin || 4,
-        width: args.width || 256,
-        height: args.height || 256,
-        output: args.output || "terminal",
-        background: args.background || "#e1dede",
-        color: args.color || "#000000"
-    }
-    return options
-}
-const algoqrcode = (options) =>{
-    if (isBrowser) {
-        let opts = parseOptions(options)
-        let qrcode = new QRCode(opts);
-        return qrcode
-
-    } else if (isNode) {
-        if (options.output === 'svg') {
-            let opts = parseOptions(options)
-            let  qrcode  = new QRCode(opts);
-            return qrcode
-        } else {
-            let opts = parseOptions(options)
-            return QRCodeTerminal.generate(opts.content);
-        }
-
-
-    }
-
-}
-export default algoqrcode
-
+import algoqrcode from "./src/index.mjs";
+export default algoqrcode
diff --git a/lib/bundle.min.js.map b/lib/bundle.min.js.map
diff --git a/rollup.config.js b/rollup.config.js
@@ -9,7 +9,7 @@ const babelConfig = {
 }
 
 export default [{
-  input: 'index.mjs',
+  input: 'src',
   output: [{
     file: 'lib/bundle.min.js',
     format: "es",

diff --git a/src/index.mjs b/src/index.mjs
@@ -0,0 +1,73 @@
+import QRCode from "qrcode-svg"
+import QRCodeTerminal from "./terminal"
+
+
+import { isBrowser, isNode, isWebWorker, isJsDom, isDeno } from "browser-or-node";
+function parseOptions(args) {
+    /* 
+  content: "https://github.com/",
+  padding: 4,
+  width: 256,
+  height: 256,
+  color: "#000000",
+  background: "#ffffff",
+  ecl: "M",
+*/
+    let content = "algorand://"
+    let amount = args.amount;
+    let wallet = args.wallet;
+    let label = args.label;
+    let asset = args.asset;
+    let note = args.note;
+    if (!!label && !!wallet) {
+        content = "algorand://" + wallet+ "?" + "&label=" + label;
+    } else if (!!asset && !!wallet) {
+        if (!!note && amount > 0) {
+            content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&asset=" + asset + "&note=" + note;
+        } else if (amount > 0) {
+            content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&asset=" + asset;
+        } else if (amount === 0) {
+            content = "algorand://?" + "amount=0"  + "&asset=" + asset;
+        }
+
+    } else if (!!note && !!wallet && !!amount) {
+        content = "algorand://" + wallet+ "?" + "&amount=" + amount + "&note=" + note;
+    } else if ( !!wallet && !!amount){
+        content = "algorand://" + wallet+ "?" + "&amount=" + amount;
+    }
+    let options = {
+        content: content,
+        container: "svg-viewbox",
+        ecl: args.ecl || "H",
+        file: args.file || "algorand-qrcode.svg",
+        padding: args.margin || 4,
+        width: args.width || 256,
+        height: args.height || 256,
+        output: args.output || "terminal",
+        background: args.background || "#e1dede",
+        color: args.color || "#000000"
+    }
+    return options
+}
+const algoqrcode = (options) =>{
+    if (isBrowser) {
+        let opts = parseOptions(options)
+        let qrcode = new QRCode(opts);
+        return qrcode
+
+    } else if (isNode) {
+        if (options.output === 'svg') {
+            let opts = parseOptions(options)
+            let  qrcode  = new QRCode(opts);
+            return qrcode
+        } else {
+            let opts = parseOptions(options)
+            return QRCodeTerminal.generate(opts.content);
+        }
+
+
+    }
+
+}
+export default algoqrcode
+