diff --git a/basicswap/static/css/style.css b/basicswap/static/css/style.css index 933cab6..8f8ce14 100644 --- a/basicswap/static/css/style.css +++ b/basicswap/static/css/style.css @@ -161,3 +161,59 @@ background-position: center; background-size: 20px 20px; } + +.input-like-container { + max-width: 100%; + background-color: #ffffff; + width: 360px; + padding: 1rem; + color: #374151; + border-radius: 0.375rem; + font-size: 0.875rem; + line-height: 1.25rem; + outline: none; + word-wrap: break-word; + height: 90px; + color: #374151; + border-radius: 0.375rem; + font-size: 0.875rem; + line-height: 1.25rem; + outline: none; + word-break: break-all; + display: flex; + align-items: center; + justify-content: center; + position: relative; +} + +.input-like-container.copying { + width: inherit; +} + +.qrcode { + position: relative; + display: inline-block; + padding: 10px; + overflow: hidden; + position: relative; +} + +.qrcode-border { + border: 2px solid; + border-color: rgba(59, 130, 246, var(--tw-border-opacity)); + border-radius: 20px; +} + +.qrcode img { + width: 100%; + height: auto; + border-radius: 15px; +} + +#showQR { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + height:25px; +} \ No newline at end of file diff --git a/basicswap/static/images/coins/Decred-20.png b/basicswap/static/images/coins/Decred-20.png new file mode 100644 index 0000000..0f632c6 Binary files /dev/null and b/basicswap/static/images/coins/Decred-20.png differ diff --git a/basicswap/static/images/coins/Decred.png b/basicswap/static/images/coins/Decred.png new file mode 100644 index 0000000..d69b98c Binary files /dev/null and b/basicswap/static/images/coins/Decred.png differ diff --git a/basicswap/static/images/coins/Zano-20.png b/basicswap/static/images/coins/Zano-20.png new file mode 100644 index 0000000..7f84c17 Binary files /dev/null and b/basicswap/static/images/coins/Zano-20.png differ diff --git a/basicswap/static/images/coins/Zano.png b/basicswap/static/images/coins/Zano.png new file mode 100644 index 0000000..f513b70 Binary files /dev/null and b/basicswap/static/images/coins/Zano.png differ diff --git a/basicswap/static/js/libs/qrcode.js b/basicswap/static/js/libs/qrcode.js new file mode 100644 index 0000000..c77e2b1 --- /dev/null +++ b/basicswap/static/js/libs/qrcode.js @@ -0,0 +1,614 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);} + return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);} + if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);} + this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}} + return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;} + for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}} + for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}} + this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);} + var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;} + this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}} + row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. (" + +buffer.getLengthInBits() + +">" + +totalDataCount*8 + +")");} + if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);} + while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);} + while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD1,8);} + return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}} + var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));} + return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));} + return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;} + return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}} + for(var row=0;row=256){n-=255;} + return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);} + if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));} + this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]]; + + function _isSupportCanvas() { + return typeof CanvasRenderingContext2D != "undefined"; + } + + // android 2.x doesn't support Data-URI spec + function _getAndroid() { + var android = false; + var sAgent = navigator.userAgent; + + if (/android/i.test(sAgent)) { // android + android = true; + var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i); + + if (aMat && aMat[1]) { + android = parseFloat(aMat[1]); + } + } + + return android; + } + + var svgDrawer = (function() { + + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + + this.clear(); + + function makeSVG(tag, attrs) { + var el = document.createElementNS('http://www.w3.org/2000/svg', tag); + for (var k in attrs) + if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]); + return el; + } + + var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight}); + svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink"); + _el.appendChild(svg); + + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"})); + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"})); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + if (oQRCode.isDark(row, col)) { + var child = makeSVG("use", {"x": String(row), "y": String(col)}); + child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template") + svg.appendChild(child); + } + } + } + }; + Drawing.prototype.clear = function () { + while (this._el.hasChildNodes()) + this._el.removeChild(this._el.lastChild); + }; + return Drawing; + })(); + + var useSVG = document.documentElement.tagName.toLowerCase() === "svg"; + + // Drawing in DOM by using Table tag + var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + var aHTML = ['']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
'); + _el.innerHTML = aHTML.join(''); + + // Fix the margin values as real size. + var elTable = _el.childNodes[0]; + var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2; + var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2; + + if (nLeftMarginTable > 0 && nTopMarginTable > 0) { + elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px"; + } + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._el.innerHTML = ''; + }; + + return Drawing; + })() : (function () { // Drawing in Canvas + function _onMakeImage() { + this._elImage.src = this._elCanvas.toDataURL("image/png"); + this._elImage.style.display = "block"; + this._elCanvas.style.display = "none"; + } + + // Android 2.1 bug workaround + // http://code.google.com/p/android/issues/detail?id=5141 + if (this._android && this._android <= 2.1) { + var factor = 1 / window.devicePixelRatio; + var drawImage = CanvasRenderingContext2D.prototype.drawImage; + CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) { + if (("nodeName" in image) && /img/i.test(image.nodeName)) { + for (var i = arguments.length - 1; i >= 1; i--) { + arguments[i] = arguments[i] * factor; + } + } else if (typeof dw == "undefined") { + arguments[1] *= factor; + arguments[2] *= factor; + arguments[3] *= factor; + arguments[4] *= factor; + } + + drawImage.apply(this, arguments); + }; + } + + /** + * Check whether the user's browser supports Data URI or not + * + * @private + * @param {Function} fSuccess Occurs if it supports Data URI + * @param {Function} fFail Occurs if it doesn't support Data URI + */ + function _safeSetDataURI(fSuccess, fFail) { + var self = this; + self._fFail = fFail; + self._fSuccess = fSuccess; + + // Check it just once + if (self._bSupportDataURI === null) { + var el = document.createElement("img"); + var fOnError = function() { + self._bSupportDataURI = false; + + if (self._fFail) { + self._fFail.call(self); + } + }; + var fOnSuccess = function() { + self._bSupportDataURI = true; + + if (self._fSuccess) { + self._fSuccess.call(self); + } + }; + + el.onabort = fOnError; + el.onerror = fOnError; + el.onload = fOnSuccess; + el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data. + return; + } else if (self._bSupportDataURI === true && self._fSuccess) { + self._fSuccess.call(self); + } else if (self._bSupportDataURI === false && self._fFail) { + self._fFail.call(self); + } + }; + + /** + * Drawing QRCode by using canvas + * + * @constructor + * @param {HTMLElement} el + * @param {Object} htOption QRCode Options + */ + var Drawing = function (el, htOption) { + this._bIsPainted = false; + this._android = _getAndroid(); + + this._htOption = htOption; + this._elCanvas = document.createElement("canvas"); + this._elCanvas.width = htOption.width; + this._elCanvas.height = htOption.height; + el.appendChild(this._elCanvas); + this._el = el; + this._oContext = this._elCanvas.getContext("2d"); + this._bIsPainted = false; + this._elImage = document.createElement("img"); + this._elImage.alt = "Scan me!"; + this._elImage.style.display = "none"; + this._el.appendChild(this._elImage); + this._bSupportDataURI = null; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _elImage = this._elImage; + var _oContext = this._oContext; + var _htOption = this._htOption; + + var nCount = oQRCode.getModuleCount(); + var nWidth = _htOption.width / nCount; + var nHeight = _htOption.height / nCount; + var nRoundedWidth = Math.round(nWidth); + var nRoundedHeight = Math.round(nHeight); + + _elImage.style.display = "none"; + this.clear(); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + var bIsDark = oQRCode.isDark(row, col); + var nLeft = col * nWidth; + var nTop = row * nHeight; + _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.lineWidth = 1; + _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.fillRect(nLeft, nTop, nWidth, nHeight); + + // 안티 앨리어싱 방지 처리 + _oContext.strokeRect( + Math.floor(nLeft) + 0.5, + Math.floor(nTop) + 0.5, + nRoundedWidth, + nRoundedHeight + ); + + _oContext.strokeRect( + Math.ceil(nLeft) - 0.5, + Math.ceil(nTop) - 0.5, + nRoundedWidth, + nRoundedHeight + ); + } + } + + this._bIsPainted = true; + }; + + /** + * Make the image from Canvas if the browser supports Data URI. + */ + Drawing.prototype.makeImage = function () { + if (this._bIsPainted) { + _safeSetDataURI.call(this, _onMakeImage); + } + }; + + /** + * Return whether the QRCode is painted or not + * + * @return {Boolean} + */ + Drawing.prototype.isPainted = function () { + return this._bIsPainted; + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height); + this._bIsPainted = false; + }; + + /** + * @private + * @param {Number} nNumber + */ + Drawing.prototype.round = function (nNumber) { + if (!nNumber) { + return nNumber; + } + + return Math.floor(nNumber * 1000) / 1000; + }; + + return Drawing; + })(); + + /** + * Get the type by string length + * + * @private + * @param {String} sText + * @param {Number} nCorrectLevel + * @return {Number} type + */ + function _getTypeNumber(sText, nCorrectLevel) { + var nType = 1; + var length = _getUTF8Length(sText); + + for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) { + var nLimit = 0; + + switch (nCorrectLevel) { + case QRErrorCorrectLevel.L : + nLimit = QRCodeLimitLength[i][0]; + break; + case QRErrorCorrectLevel.M : + nLimit = QRCodeLimitLength[i][1]; + break; + case QRErrorCorrectLevel.Q : + nLimit = QRCodeLimitLength[i][2]; + break; + case QRErrorCorrectLevel.H : + nLimit = QRCodeLimitLength[i][3]; + break; + } + + if (length <= nLimit) { + break; + } else { + nType++; + } + } + + if (nType > QRCodeLimitLength.length) { + throw new Error("Too long data"); + } + + return nType; + } + + function _getUTF8Length(sText) { + var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a'); + return replacedText.length + (replacedText.length != sText ? 3 : 0); + } + + /** + * @class QRCode + * @constructor + * @example + * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie"); + * + * @example + * var oQRCode = new QRCode("test", { + * text : "http://naver.com", + * width : 128, + * height : 128 + * }); + * + * oQRCode.clear(); // Clear the QRCode. + * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode. + * + * @param {HTMLElement|String} el target element or 'id' attribute of element. + * @param {Object|String} vOption + * @param {String} vOption.text QRCode link data + * @param {Number} [vOption.width=256] + * @param {Number} [vOption.height=256] + * @param {String} [vOption.colorDark="#000000"] + * @param {String} [vOption.colorLight="#ffffff"] + * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H] + */ + QRCode = function (el, vOption) { + this._htOption = { + width : 256, + height : 256, + typeNumber : 4, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRErrorCorrectLevel.H + }; + + if (typeof vOption === 'string') { + vOption = { + text : vOption + }; + } + + // Overwrites options + if (vOption) { + for (var i in vOption) { + this._htOption[i] = vOption[i]; + } + } + + if (typeof el == "string") { + el = document.getElementById(el); + } + + if (this._htOption.useSVG) { + Drawing = svgDrawer; + } + + this._android = _getAndroid(); + this._el = el; + this._oQRCode = null; + this._oDrawing = new Drawing(this._el, this._htOption); + + if (this._htOption.text) { + this.makeCode(this._htOption.text); + } + }; + + /** + * Make the QRCode + * + * @param {String} sText link data + */ + QRCode.prototype.makeCode = function (sText) { + this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel); + this._oQRCode.addData(sText); + this._oQRCode.make(); + this._el.title = sText; + this._oDrawing.draw(this._oQRCode); + this.makeImage(); + }; + + /** + * Make the Image from Canvas element + * - It occurs automatically + * - Android below 3 doesn't support Data-URI spec. + * + * @private + */ + QRCode.prototype.makeImage = function () { + if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) { + this._oDrawing.makeImage(); + } + }; + + /** + * Clear the QRCode + */ + QRCode.prototype.clear = function () { + this._oDrawing.clear(); + }; + + /** + * @name QRCode.CorrectLevel + */ + QRCode.CorrectLevel = QRErrorCorrectLevel; +})(); diff --git a/basicswap/templates/404.html b/basicswap/templates/404.html index 37c28aa..b2529cb 100644 --- a/basicswap/templates/404.html +++ b/basicswap/templates/404.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg %}
@@ -9,19 +10,11 @@

Home

-
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • 404
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -37,7 +30,6 @@
    Go Back
    Try Again
    -
    diff --git a/basicswap/templates/active.html b/basicswap/templates/active.html index fcba481..111645d 100644 --- a/basicswap/templates/active.html +++ b/basicswap/templates/active.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg %}
    @@ -9,19 +10,11 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Swaps In Progress
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -39,23 +32,13 @@
    {% if refresh %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh 30 seconds {% else %} - - - - - - + {{ circular_arrows_svg | safe }} Refresh {% endif %} @@ -83,22 +66,22 @@
    - Offer ID + Offer ID
    - Bid Status + Bid Status
    - ITX Status + ITX Status
    - PTX Status + PTX Status
    diff --git a/basicswap/templates/automation_strategies.html b/basicswap/templates/automation_strategies.html index ffc9e5d..580164f 100644 --- a/basicswap/templates/automation_strategies.html +++ b/basicswap/templates/automation_strategies.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, white_automation_svg, page_forwards_svg, page_back_svg, filter_apply_svg %}
    @@ -8,19 +9,11 @@

    Home

     -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Automation Strategies
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -34,25 +27,11 @@
    -

    Automation Strategies

    -

    +

    Automation Strategies

    - - - - - - - - - - - - - - - + + {{ white_automation_svg | safe }} Create New Strategy
    @@ -121,30 +100,11 @@
    - +
    - +
    @@ -204,10 +164,8 @@
    @@ -217,10 +175,8 @@
    diff --git a/basicswap/templates/automation_strategy.html b/basicswap/templates/automation_strategy.html index a672e60..dff928b 100644 --- a/basicswap/templates/automation_strategy.html +++ b/basicswap/templates/automation_strategy.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg %}
    @@ -8,21 +9,13 @@

    Home

     -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Automation Strategies
    • +
  • {{ breadcrumb_line_svg | safe }}
  • - - - -
    • -
  • - ID: + ID:
    • @@ -38,7 +31,7 @@

    Automation Strategy {{ strategy_id }}

    -

    ID: +

    ID:

    @@ -66,7 +59,7 @@
    - Type + Input
    @@ -114,42 +107,17 @@
    {% if show_edit_form %}
    - +
    - -
    {% else %}
    - + +
    + {% else %} +
    +
    - - - - - - - - - Back + Back
    {% endif %} diff --git a/basicswap/templates/automation_strategy_new.html b/basicswap/templates/automation_strategy_new.html index ac448d0..8e0d916 100644 --- a/basicswap/templates/automation_strategy_new.html +++ b/basicswap/templates/automation_strategy_new.html @@ -1,51 +1,44 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg %}
    -
    -
    -
    - - +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + + +
    +
    +

    New Automation Strategy

    +

    TODO/WIP: +

    -
    -
    -
    -
    - - - -
    -
    -

    New Automation Strategy

    -

    Todo -

    -
    -
    -
    -
    -
    - {% include 'inc_messages.html' %} +
    +
    +
    +{% include 'inc_messages.html' %}
    diff --git a/basicswap/templates/bid.html b/basicswap/templates/bid.html index 7c518d9..9da4a7f 100644 --- a/basicswap/templates/bid.html +++ b/basicswap/templates/bid.html @@ -38,23 +38,17 @@

    Bid {% if debug_mode == true %} (Debug: bid template) {% endif %}

    -

    Bid ID: {{ bid_id }}

    +

    Bid ID: {{ bid_id }}

    -
    {% if refresh %} - - - - - - +
    + {% if refresh %} + + {{ circular_arrows_svg | safe }} Refresh {{ refresh }} seconds - {% else %} - - - - - - + + {% else %} + + {{ circular_arrows_svg | safe }} Refresh {% endif %} diff --git a/basicswap/templates/bid_xmr.html b/basicswap/templates/bid_xmr.html index b7dbb01..7a4847b 100644 --- a/basicswap/templates/bid_xmr.html +++ b/basicswap/templates/bid_xmr.html @@ -40,25 +40,17 @@

    Bid {% if debug_mode == true %} (Debug: bid_xmr template) {% endif %}

    -

    Bid ID: {{ bid_id }}

    +

    Bid ID: {{ bid_id }}

    -
    {% if refresh %} - - - - - - +
    + {% if refresh %} + + {{ circular_arrows_svg | safe }} Refresh {{ refresh }} seconds {% else %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh {% endif %} @@ -101,7 +93,7 @@ - {{ data.amt_from }} {{ data.ticker_from }} + {{ data.amt_from }} {{ data.ticker_from }}
    diff --git a/basicswap/templates/bids.html b/basicswap/templates/bids.html index ddc44dd..b8a3a8f 100644 --- a/basicswap/templates/bids.html +++ b/basicswap/templates/bids.html @@ -1,288 +1,220 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, page_back_svg, page_forwards_svg, filter_clear_svg, filter_apply_svg, circular_arrows_svg, input_arrow_down_svg %}
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - - -
    -
    -

    {{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}

    -

    {{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}

    -
    -
    {% if refresh %} - - - - - - - Refresh {{ refresh }} seconds - - {% endif %} +
    +
    +
    +
    -
    -
    -
    - {% include 'inc_messages.html' %} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - -
    +
    +
    +
    +
    + + +
    +
    +

    {{ page_type_available }} {{ page_type_received }} {{ page_type_sent }}

    +

    {{ page_type_available_description }} {{ page_type_received_description }} {{ page_type_sent_description }}

    -
    -
    - - - - -
    -
    -
    -
    -

    State:

    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -

    Include Expired:

    -
    -
    -
    -
    - - - - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    +
    + {% if refresh %} + + {{ circular_arrows_svg | safe }} + Refresh {{ refresh }} seconds + + {% endif %} +
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - {% for b in bids %} - - - - - - - - - {% if page_type_received or page_type_sent %} - - {% elif page_type_available %} - - {% endif %} - - - {% endfor %} -
    -
    - Date/Time at -
    -     		-
    - Bid ID -
    -     		-
    - Offer ID -
    -     		-
    - Bid From -
    -     		-
    - Bid Status -
    -     		-
    - ITX Status -
    -     		-
    - PTX Status -
    -     		-
    - Details -
    -
    - - - - - - -
    -
    {{ b[0] }}
    -
    -     		- {{ b[1]|truncate(20, True) }} - - {{ b[2]|truncate(20, True) }} - - {{ b[6] }} - {{ b[3] }}{{ b[4] }}{{ b[5] }} - Details - - Accept -
    - - -
    -
    - -
    -
    -
    - {% if filters.page_no > 1 %} +
    +
    + {% include 'inc_messages.html' %} +
    +
    +
    +
    + +
    +
    +
    +
    - +
    + {{ input_arrow_down_svg | safe }} + +
    +
    +
    +
    + {{ input_arrow_down_svg | safe }} + +
    - {% endif %}
    -
    -

    Page: {{ filters.page_no }}

    -
    +
    +

    State:

    +
    - {% if bids_count > 10 %}
    - +
    + {{ input_arrow_down_svg | safe }} + +
    - {% endif %} +
    +
    +

    Include Expired:

    +
    +
    +
    +
    + {{ input_arrow_down_svg | safe }} +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + {% for b in bids %} + + + + + + + + + {% if page_type_received or page_type_sent %} + {% elif page_type_available %} + + {% endif %} + + + {% endfor %} +
    +
    Date/Time at +
    +     		+
    Bid ID +
    +     		+
    Offer ID +
    +     		+
    Bid From +
    +     		+
    Bid Status +
    +     		+
    ITX Status +
    +     		+
    PTX Status +
    +     		+
    Details +
    +
    + + + + + +
    +
    {{ b[0] }}
    +
    +     		{{ b[1]|truncate(20, True) }} {{ b[2]|truncate(20, True) }} {{ b[6] }} {{ b[3] }}{{ b[4] }}{{ b[5] }} Details + Accept +
    +
    +
    +
    +
    +
    + {% if filters.page_no > 1 %}
    + +
    + {% endif %} +
    +
    +

    Page: {{ filters.page_no }}

    +
    +
    + {% if bids_count > 20 %} +
    +
    + {% endif %} +
    +
    +
    +
    - - +
    -
    -
    -
    +
    {% include 'footer.html' %} - + \ No newline at end of file diff --git a/basicswap/templates/changepassword.html b/basicswap/templates/changepassword.html index d90f00a..e5be07e 100644 --- a/basicswap/templates/changepassword.html +++ b/basicswap/templates/changepassword.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg %}
    @@ -9,21 +10,13 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}

  • Home
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Change Password
    • @@ -151,13 +144,7 @@
    - +
    diff --git a/basicswap/templates/debug.html b/basicswap/templates/debug.html index 261b022..fb3b9f8 100644 --- a/basicswap/templates/debug.html +++ b/basicswap/templates/debug.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, start_process_svg %}
    @@ -9,19 +10,11 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Debug
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -35,7 +28,7 @@

    Debug

    -

    Debug options & Easter eggs.

    +

    Expert debug options

    @@ -70,24 +63,15 @@ Remove expired offers and bids - + Reinitialise XMR wallet - + diff --git a/basicswap/templates/explorers.html b/basicswap/templates/explorers.html index e70222e..9a23acc 100644 --- a/basicswap/templates/explorers.html +++ b/basicswap/templates/explorers.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, input_arrow_down_svg %}
    @@ -9,19 +10,11 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Explorers
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -62,7 +55,7 @@
    - Action + Action
    @@ -70,9 +63,7 @@
    - - - + {{ input_arrow_down_svg| safe }} {% for a in actions %} {% endfor %} +
    @@ -115,13 +109,7 @@
    - +
    @@ -133,13 +121,13 @@
    {% if result %} -
    +
    -
    +
    @@ -154,21 +142,37 @@
    - +
    -
    - {% endif %} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endif %}
    {% include 'footer.html' %} - - \ No newline at end of file + \ No newline at end of file diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index 42b8d07..6318ff1 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -1,3 +1,4 @@ +{% from 'style.html' import love_svg, github_svg %}
    @@ -23,27 +24,17 @@

    © 2024~ (BSX) BasicSwap

    BSX: v{{ version }}

    -

    GUI: v2.0.4

    +

    GUI: v3.0.0

    Made with

    - - - - - by TV and CRZ
    + {{ love_svg | safe }} + by TV and CRZ
    - - - - -
    -
    - - + {{ github_svg | safe }}
    @@ -51,7 +42,6 @@
    - - - - + \ No newline at end of file diff --git a/basicswap/templates/header.html b/basicswap/templates/header.html index aea01e0..81e9861 100644 --- a/basicswap/templates/header.html +++ b/basicswap/templates/header.html @@ -1,4 +1,5 @@ -{% from 'style.html' import notifications_network_offer_svg, notifications_bid_accepted_svg, notifications_unknow_event_svg, notifications_new_bid_on_offer_svg, notifications_close_svg, swap_in_progress_mobile_svg, wallet_svg, page_back_svg, order_book_svg, new_offer_svg, settings_svg, asettings_svg, cog_svg, rpc_svg, debug_svg, explorer_svg, tor_svg, smsg_svg, outputs_svg, automation_svg, shutdown_svg, notifications_svg, debug_nerd_svg, wallet_locked_svg, mobile_menu_svg, wallet_unlocked_svg, tor_purple_svg, sun_svg, moon_svg, swap_in_progress_svg, available_bids_svg, your_offers_svg, bids_received_svg, bids_sent_svg, header_arrow_down_svg %} +{% from 'style.html' import notifications_network_offer_svg, notifications_bid_accepted_svg, notifications_unknow_event_svg, notifications_new_bid_on_offer_svg, notifications_close_svg, swap_in_progress_mobile_svg, wallet_svg, page_back_svg, order_book_svg, new_offer_svg, settings_svg, asettings_svg, cog_svg, rpc_svg, debug_svg, explorer_svg, tor_svg, smsg_svg, outputs_svg, automation_svg, shutdown_svg, notifications_svg, debug_nerd_svg, wallet_locked_svg, mobile_menu_svg, wallet_unlocked_svg, tor_purple_svg, sun_svg, moon_svg, swap_in_progress_svg, swap_in_progress_green_svg, available_bids_svg, your_offers_svg, bids_received_svg, bids_sent_svg, header_arrow_down_svg, love_svg %} + @@ -338,7 +339,11 @@
  • + {% if summary.num_swapping != 0 %} + {{ swap_in_progress_green_svg | safe }} + {% else %} {{ swap_in_progress_svg | safe }} + {% endif %}
    Swaps in Progress {{ summary.num_swapping }} diff --git a/basicswap/templates/identity.html b/basicswap/templates/identity.html index d777887..cf55198 100644 --- a/basicswap/templates/identity.html +++ b/basicswap/templates/identity.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, red_cross_close_svg %}
    @@ -9,21 +10,13 @@

    Home
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Identity
    • +
  • {{ breadcrumb_line_svg | safe }}
  • - - - -
    • -
  • - ADDRESS: {{ data.identity_address }} + Address: {{ data.identity_address }}
    • @@ -38,7 +31,7 @@

    Identity

    -

    Address: {{ data.identity_address }}

    +

    Address: {{ data.identity_address }}

    @@ -153,34 +146,14 @@
    {% if data.show_edit_form %}
    - +
    - +
    {% else %}
    - +
    {% endif %}
    diff --git a/basicswap/templates/inc_messages.html b/basicswap/templates/inc_messages.html index 47880f7..581506a 100644 --- a/basicswap/templates/inc_messages.html +++ b/basicswap/templates/inc_messages.html @@ -1,24 +1,22 @@ {% for m in messages %} +{% from 'style.html' import confirm_green_svg, green_cross_close_svg, red_cross_close_svg %} + {% endif %} - diff --git a/basicswap/templates/index.html b/basicswap/templates/index.html index 5557e05..abcb6b0 100644 --- a/basicswap/templates/index.html +++ b/basicswap/templates/index.html @@ -1,23 +1,17 @@ {% include 'header.html' %} +{% from 'style.html' import index_wallet_svg, index_trading_svg, index_support_svg %}
    - (BSX) BasicSwap v{{ version }} + (BSX) BasicSwap v{{ version }} - (GUI) v.3.0.0

    Welcome to BasicSwap DEX

    Swap cryptocurrencies in total privacy with no middlemen, fees,
    or restrictions.

    - - - - - - - - + {{ index_wallet_svg | safe }}
    @@ -32,16 +26,7 @@
    - - - - - - - - - - + {{ index_trading_svg | safe }}
    @@ -56,13 +41,7 @@
    - - - - - - - + {{ index_support_svg | safe }}
    diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html index 8d99aba..3c064c1 100644 --- a/basicswap/templates/offer.html +++ b/basicswap/templates/offer.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, input_arrow_down_svg, circular_arrows_svg, confirm_green_svg, green_cross_close_svg %}
    @@ -10,17 +11,13 @@
  • - - - + {{ breadcrumb_line_svg | safe }}
  • Offer
  • - - - + {{ breadcrumb_line_svg | safe }}
  • OFFER ID: {{ offer_id }} @@ -38,28 +35,16 @@

    Offer (normal)

    -

    Offer ID: {{ offer_id }}

    +

    Offer ID: {{ offer_id }}

    {% if refresh %} - - - - - - - - Refresh {{ refresh }} seconds + + {{ circular_arrows_svg | safe }}Refresh {{ refresh }} seconds {% else %} - - - - - - - - Refresh + + {{ circular_arrows_svg | safe }}Refresh {% endif %}
    @@ -69,37 +54,30 @@
    • {% include 'inc_messages.html' %} {% if sent_bid_id %} -
    + - {% endif %} -
    +
    +{% endif %} +
    @@ -255,7 +233,7 @@ Chain A local fee rate - {{ data.a_fee_rate_verify }} (Fee source: {{ data.a_fee_rate_verify_src }}{% if data.a_fee_warn == true %} WARNING{% endif %}) + {{ data.a_fee_rate_verify }} (Fee source: {{ data.a_fee_rate_verify_src }}{% if data.a_fee_warn == true %} WARNING {% endif %}) {% endif %} @@ -360,9 +338,7 @@ Auto Accept Strategy:
    - - - + {{ input_arrow_down_svg | safe }} {% for a in addrs %} @@ -471,9 +447,7 @@
    - - - + {{ input_arrow_down_svg | safe }}
    @@ -85,9 +78,7 @@ Active
    - - - + {{ input_arrow_down_svg| safe }} +
    +
    + {{ input_arrow_down_svg| safe }} +
    @@ -381,12 +336,15 @@ Type +
    + {{ input_arrow_down_svg| safe }} +
    @@ -407,50 +365,22 @@
    - +
    + {{ filter_apply_svg | safe }} + Apply Filters
    + {{ circle_plus_svg | safe }} + New Address
    + {{ circle_plus_svg | safe }} + Add Sending Address
    @@ -550,10 +480,8 @@
    @@ -563,10 +491,8 @@
    diff --git a/basicswap/templates/style.html b/basicswap/templates/style.html index 204fc8c..7160e64 100644 --- a/basicswap/templates/style.html +++ b/basicswap/templates/style.html @@ -338,6 +338,17 @@ ' %} +{% set swap_in_progress_green_svg = ' + + + + + + + + + +' %} {% set swap_in_progress_mobile_svg = ' @@ -441,4 +452,100 @@ ' %} +{% set confirm_green_svg = ' + + + +' %} +{% set green_cross_close_svg = ' + +' %} +{% set red_cross_close_svg = ' + + + +' %} +{% set white_automation_svg = ' + + + + + + + + + + + + + + +' %} +{% set start_process_svg = ' + + + + + + + + + + +' %} +{% set love_svg = ' + + + + + +' %} +{% set github_svg = ' + + + +' %} +{% set index_wallet_svg = ' + + + + + + + + +' %} +{% set index_trading_svg = ' + + + + + + + + + + +' %} +{% set index_support_svg = ' + + + + + + + +' %} +{% set circle_plus_svg = ' + + + + + + + +' %} + {% set select_box_class = 'hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-white text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0' %} diff --git a/basicswap/templates/tor.html b/basicswap/templates/tor.html index aa68de0..d9c1fc6 100644 --- a/basicswap/templates/tor.html +++ b/basicswap/templates/tor.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg %}
    @@ -9,19 +10,11 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Tor
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -39,23 +32,13 @@
    {% if refresh %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh {{ refresh }} seconds {% else %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh {% endif %} diff --git a/basicswap/templates/wallet.html b/basicswap/templates/wallet.html index 1a20978..11718a2 100644 --- a/basicswap/templates/wallet.html +++ b/basicswap/templates/wallet.html @@ -1,678 +1,961 @@ {% include 'header.html' %} -{% from 'style.html' import select_box_arrow_svg, select_box_class, circular_arrows_svg, circular_error_svg, circular_info_svg, cross_close_svg, breadcrumb_line_svg, withdraw_svg, utxo_groups_svg, create_utxo_svg %} - +{% from 'style.html' import select_box_arrow_svg, select_box_class, circular_arrows_svg, circular_error_svg, circular_info_svg, cross_close_svg, breadcrumb_line_svg, withdraw_svg, utxo_groups_svg, create_utxo_svg, red_cross_close_svg %} +
    - -
    -
    -
    - +
    +
    +
    + +
    -
    -
    - -
    -
    -
    - dots-red - wave -
    -
    -

    - {{ w.name }}{{ w.name }} Wallet - -

    -

    Manage your {{ w.ticker }} wallet. {% if refresh %} (Page Refresh: {{ refresh }} seconds) {% endif %}

    -
    -
    - {% if w.cid == '6' %} {# XMR #} - - {% endif %} {# / XMR #} - - {{ circular_arrows_svg | safe }}Refresh - +
    +
    +
    +
    dots-red wave +
    +
    +

    {{ w.name }}({{ w.ticker }}) {{ w.name }} Wallet

    +
    +
    {{ circular_arrows_svg | safe }}Refresh
    -
    -
    +
    + {% include 'inc_messages.html' %} -{% include 'inc_messages.html' %} - -{% if w.updating %} - -{% endif %} - -{% if w.havedata %} - -{% if w.error %} - + {% endif %} + {% if w.havedata %} + {% if w.error %} +
    -
    -
    - -{% else %} - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - + + + + + {% if w.bootstrapping %} + + + + + {% endif %} + {# / bootstrapping #} + {% if w.encrypted %} + + + + + {% endif %} + {# / encrypted #} + + + {% if block_unknown_seeds and w.expected_seed != true %} {# Only show addresses if wallet seed is correct #} + +
    -
    - Wallet -
    -     		-
    - Details -
    -
    Last updated:{{ w.lastupdated }}
    {{ w.name }} Version:{{ w.version }}
    - - {{ w.name }} - Balance: + + {% else %} + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + {% if w.cid == '1' %} {# PART #} + + + + + + + + + + {% endif %} + {# / PART #} + {% if w.cid == '3' %} {# LTC #} + + + + + {% endif %} + {# / LTC #} + {% if w.locked_utxos %} + + + + + {% endif %} + {# / locked_utxos #} + + + + + + + + + + + - - - {% if w.cid == '1' %} {# PART #} - - - - - - - - - - {% endif %} {# / PART #} - {% if w.cid == '3' %} {# LTC #} - - - - - {% endif %} {# / LTC #} - {% if w.locked_utxos %} - - - - - {% endif %} {# / locked_utxos #} - - - - - - - - {% if w.bootstrapping %} - - - {% endif %} {# / bootstrapping #} - {% if w.encrypted %} - - - - - {% endif %} {# / encrypted #} - - - {% if block_unknown_seeds and w.expected_seed != true %} {# Only show addresses if wallet seed is correct #} - -
    +
    Wallet
    +     		+
    Details
    +
    {{ w.name }} Balance: {{ w.balance }} {{ w.ticker }} () + {% if w.pending %} + Pending: +{{ w.pending }} {{ w.ticker }} + {% endif %} +
    {{ w.name }} Blind Blind Balance: {{ w.blind_balance }} {{ w.ticker }} () + {% if w.blind_unconfirmed %} + Unconfirmed: +{{ w.blind_unconfirmed }} {{ w.ticker }} + {% endif %} +
    {{ w.name }} Anon Anon Balance: {{ w.anon_balance }} {{ w.ticker }} () + {% if w.anon_pending %} + Pending: +{{ w.anon_pending }} {{ w.ticker }} + {% endif %} +
    {{ w.name }} MWEB MWEB Balance: {{ w.mweb_balance }} {{ w.ticker }} () + {% if w.mweb_pending %} + Pending: +{{ w.mweb_pending }} {{ w.ticker }} + {% endif %} +
    Locked Outputs:{{ w.locked_utxos }}
    Last updated:{{ w.lastupdated }}
    {{ w.name }} Version:{{ w.version }}
    Blocks:{{ w.blocks }} + {% if w.known_block_count %} / {{ w.known_block_count }} + {% endif %} {{ w.balance }} {{ w.ticker }} (){% if w.pending %} Pending: +{{ w.pending }} {{ w.ticker }}{% endif %}
    - - {{ w.name }} Blind - Blind Balance: - {{ w.blind_balance }} {{ w.ticker }} () {% if w.blind_unconfirmed %} Unconfirmed: +{{ w.blind_unconfirmed }} {{ w.ticker }}{% endif %}
    - - {{ w.name }} Anon - Anon Balance: - {{ w.anon_balance }} {{ w.ticker }} () {% if w.anon_pending %} Pending: +{{ w.anon_pending }} {{ w.ticker }}{% endif %}
    - - {{ w.name }} MWEB - MWEB Balance: - {{ w.mweb_balance }} {{ w.ticker }} () {% if w.mweb_pending %} Pending: +{{ w.mweb_pending }} {{ w.ticker }}{% endif %}
    Locked Outputs:{{ w.locked_utxos }}
    Blocks:{{ w.blocks }} {% if w.known_block_count %} / {{ w.known_block_count }} {% endif %}
    Synced:{{ w.synced }}
    Bootstrapping:{{ w.bootstrapping }}
    Locked:{{ w.locked }}
    Expected Seed:{{ w.expected_seed }}
    +
    Synced:{{ w.synced }}
    Bootstrapping:{{ w.bootstrapping }}
    Locked:{{ w.locked }}
    Expected Seed:{{ w.expected_seed }}
    +
    +
    -
    - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    - - -
    - -{% else %} - -{% if w.cid == '1' %} {# PART #} - - Stealth Address - {{ w.stealth_address }} - -{% endif %} {# / PART #} - -{% if w.cid == '3' %} {# LTC #} - - - - - {{ w.mweb_address }} - -{% endif %} {# / LTC #} - -{% if w.cid == '6' %} {# XMR #} - - Main Address - {{ w.main_address }} - - - - - - {{ w.deposit_address }} - - -{% else %} - - - - - {{ w.deposit_address }} - -{% endif %} - - - - - - - - + + {% else %} + + + + + + + -
    -

    Withdraw

    +

    Deposit

    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - {% if w.cid == '6' %} {# XMR #} - - - {% else %} - - + + {% endif %} - - - {% if w.cid == '1' %} {# PART #} - - - - - - {% endif %} {# / PART #} - {% if w.cid == '3' %} {# LTC #} - - - - - {% endif %} {# / LTC #} - - - - - -
    -
    - Options + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + {% if w.cid == '1' %} {# PART #} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ w.name }} Stealth Address:
    +
    +
    {{ w.stealth_address }}
    +
    + +
    -
    		-
    - -
    -     		-
    - -
    -
    - - - - - -
    Sweep All: - - Subtract Fee: - -
    Type From -> To: -
    -
    - {{ select_box_arrow_svg | safe }} - + {# / PART #} + {% if w.cid == '6' %} + {# XMR #} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ w.name }} Main Address:
    +
    +
    {{ w.main_address }}
    +
    + +
    -
    		-
    -
    - {{ select_box_arrow_svg }} - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ w.name }} Sub Address:
    +
    +
    {{ w.deposit_address }}
    +
    +
    +
    +
    + +
    -
    Type From: -
    -
    - {{ select_box_arrow_svg }} - +
    + {% else %} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ w.name }} Deposit Address:
    +
    +
    {{ w.deposit_address }}
    +
    +
    +
    +
    + +
    -
    Fee Rate:{{ w.fee_rate }} - Est Fee: {{ w.est_fee }} - {% if w.cid == '6' %} {# XMR #} - - {% endif %} {# / XMR #} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -{% if w.cid != '6' %} {# !XMR #} -{% if w.show_utxo_groups %} - -
    -
    -

    UTXO Groups

    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - -
    -
    - Options +
    + {% endif %} + {% if w.cid == '3' %} + {# LTC #} +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ w.name }} MWEB Address:
    +
    +
    {{ w.mweb_address }}
    +
    + +
    -
    		-
    - -
    -
    UTXO Groups: - -
    - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - +
    +
    + {% endif %} + {# / LTC #} +
    -
    - - - -
    - -{% else %} - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - + + {% if w.cid == '1' %} + {# PART #} + + {% endif %} + {% if w.cid == '3' %} + {# LTC #} + + {% endif %} + {% if w.cid == '6' %} + {# XMR #} + + + {% else %} + {% endif %} -{% endif %} -{% endif %} -{% endif %} -{% endif %} - - - - - - - - +
    +
    +

    Withdraw

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + {% if w.cid == '3' %} + {# LTC #} + + + + {% endif %} + {% if w.cid == '1' %} + {# PART #} + + + + + + {% endif %} + + + + + + + + + {% if w.cid == '6' %} {# XMR #} + + {% else %} + + {% endif %} + + + {% if w.cid == '1' %} + {# PART #} + + + + + + + + + {% endif %} + {# / PART #} + {% if w.cid == '3' %} {# LTC #} + + + + + {% endif %} + {# / LTC #} + + + + + + + + +
    +
    Options
    +     		+
    Input
    +
    {{ w.name }} {{ w.name }} Balance: {{ w.balance }} {{ w.ticker }}
    {{ w.name }} {{ w.name }} MWEB Balance: {{ w.mweb_balance }} {{ w.ticker }}
    {{ w.name }} {{ w.name }} Blind Balance: {{ w.blind_balance }} {{ w.ticker }}
    {{ w.name }} {{ w.name }} Anon Balance: {{ w.anon_balance }} {{ w.ticker }}
    {{ w.name }} Address:
    {{ w.name }} Amount: + +
    +
    + {% if w.cid == '1' %} + {# PART #} + + + {# / PART #} + {% elif w.cid == '3' %} + {# LTC #} + + + {# / LTC #} + {% else %} + + + {% endif %} +
    +
    Sweep All: Subtract Fee: +
    Type From: +
    +
    {{ select_box_arrow_svg | safe }}
    +
    +
    Type To: +
    +
    {{ select_box_arrow_svg }}
    +
    +
    Type From: +
    +
    {{ select_box_arrow_svg }}
    +
    +
    Fee Rate:{{ w.fee_rate }}
    Estimate Fee: {{ w.est_fee }}
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + {% if w.cid != '6' %} + {# !XMR #} + {% if w.show_utxo_groups %} + {% else %} +
    + {% endif %} {% endif %} + {% if w.cid == '6' %} + {# XMR #} +
    + {% endif %} + {# / XMR #}
    +
    +
    +
    +
    +
    +
    +
    +
    + {% if w.cid != '6' %} + {# !XMR #} + {% if w.show_utxo_groups %} +
    +
    +

    UTXO Groups

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + +
    +
    Options
    +     		+
    +
    UTXO Groups:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + {% else %} + {% endif %} + {% endif %} + {% endif %} + {% endif %} + {% endif %} + + + - {% include 'footer.html' %} - - - + \ No newline at end of file diff --git a/basicswap/templates/wallets.html b/basicswap/templates/wallets.html index a79c265..f15a3eb 100644 --- a/basicswap/templates/wallets.html +++ b/basicswap/templates/wallets.html @@ -53,7 +53,7 @@ {% if w.error %}

    Error: {{ w.error }}

    {% else %}
    -
    +
    {{ w.name }} @@ -68,14 +68,14 @@ {% endif %}
    -
    -

    Balance:

    -
    {{ w.balance }} {{ w.ticker }}
    -
    -
    -

    {{ w.ticker }} USD value:

    -
    -
    +
    +

    Balance:

    +
    {{ w.balance }} {{ w.ticker }}
    +
    +
    +

    {{ w.ticker }} USD value:

    +
    +
    {% if w.pending %}

    Pending:

    @@ -116,7 +116,7 @@ {% if w.anon_pending %}

    Anon Pending:

    - + +{{ w.anon_pending }} {{ w.ticker }}
    @@ -178,8 +178,21 @@ Blockchain {{ w.synced }}%
    -
    -
    +
    +
    +
    +
    + + + +
    @@ -203,7 +216,10 @@ const coinNameToSymbol = { 'Litecoin': 'LTC', 'Firo': 'FIRO', 'Dash': 'DASH', - 'PIVX': 'PIVX' + 'PIVX': 'PIVX', + 'Wownero': 'WOW', + 'Decred': 'DCR', + 'Zano': 'ZANO', }; const getUsdValue = (cryptoValue, coinSymbol) => { @@ -255,28 +271,47 @@ const updateValues = async () => { calculateTotalBtcValue(); }; -const toggleUsdAmount = (usdCell, isVisible) => { - const usdText = document.getElementById('usd-text'); - if (usdText) { - usdText.style.display = isVisible ? 'inline' : 'none'; - } +const toggleUsdAmount = async (usdCell, isVisible) => { - if (isVisible) { - const coinFullName = usdCell.previousElementSibling.getAttribute('data-coinname'); - const cryptoValue = parseFloat(usdCell.previousElementSibling.textContent); - const coinSymbol = coinNameToSymbol[coinFullName]; - if (coinSymbol) { - updateValues(); + const usdText = document.getElementById('usd-text'); + + + if (usdText) { + usdText.style.display = isVisible ? 'inline' : 'none'; + } + + if (isVisible) { + const coinNameValueElement = usdCell.parentElement.querySelector('.coinname-value'); + + + if (coinNameValueElement) { + const coinFullName = coinNameValueElement.getAttribute('data-coinname'); + console.log("coinFullName:", coinFullName); + + if (coinFullName) { + const cryptoValue = parseFloat(coinNameValueElement.textContent); + console.log("cryptoValue:", cryptoValue); + + const coinSymbol = coinNameToSymbol[coinFullName.trim()]; + console.log("coinSymbol:", coinSymbol); + + if (coinSymbol) { + await updateValues(); + } else { + console.error(`Coin symbol not found for full name: ${coinFullName}`); + } + } else { + console.error(`Data attribute 'data-coinname' not found.`); + } + } else { + } } else { - console.error(`Coin symbol not found for full name: ${coinFullName}`); + usdCell.textContent = "******"; + const btcValueElement = usdCell.nextElementSibling; + if (btcValueElement) { + btcValueElement.textContent = "****"; + } } - } else { - usdCell.textContent = "******"; - const btcValueElement = usdCell.nextElementSibling; - if (btcValueElement) { - btcValueElement.textContent = "****"; - } - } }; const toggleUsdIcon = (isVisible) => { diff --git a/basicswap/templates/watched.html b/basicswap/templates/watched.html index ff7553b..0dbd6c6 100644 --- a/basicswap/templates/watched.html +++ b/basicswap/templates/watched.html @@ -1,4 +1,5 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg %}
    @@ -9,19 +10,11 @@

    Home

    -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
  • Watched Outputs
    • -
  • - - - -
    • +
  • {{ breadcrumb_line_svg | safe }}
    • @@ -39,23 +32,13 @@
    {% if refresh %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh {{ refresh }} seconds {% else %} - - - - - - - + + {{ circular_arrows_svg | safe }} Refresh {% endif %}