From c1a9c437e13feadf345fd36fcb270a6894b70295 Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Wed, 27 Jan 2021 09:58:15 -0800 Subject: [PATCH] user feedback improvements --- creator/index.php | 4 +-- img/frames/margins/blackCorners.png | Bin 0 -> 21224 bytes img/frames/margins/blackCornersThumb.png | Bin 0 -> 2897 bytes js/{creator-6.js => creator-7.js} | 25 +++++++++++-------- js/frames/{groupMisc.js => groupMisc-1.js} | 2 +- js/frames/{packMargin.js => packMargin-1.js} | 1 + js/main-1.js | 5 +++- 7 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 img/frames/margins/blackCorners.png create mode 100644 img/frames/margins/blackCornersThumb.png rename js/{creator-6.js => creator-7.js} (98%) rename js/frames/{groupMisc.js => groupMisc-1.js} (84%) rename js/frames/{packMargin.js => packMargin-1.js} (95%) diff --git a/creator/index.php b/creator/index.php index 97a86595..bf1a6ea3 100644 --- a/creator/index.php +++ b/creator/index.php @@ -95,7 +95,7 @@ include('../globalHTML/header-1.php'); - + @@ -411,5 +411,5 @@ include('../globalHTML/header-1.php'); - + \ No newline at end of file diff --git a/img/frames/margins/blackCorners.png b/img/frames/margins/blackCorners.png new file mode 100644 index 0000000000000000000000000000000000000000..3fe92b8405143f3bab3e8d905428be325e7dd978 GIT binary patch literal 21224 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 aaKqy9)(3UPDJ#eE(a;??tu3%;#Qh3t4NL$4 literal 0 HcmV?d00001 diff --git a/img/frames/margins/blackCornersThumb.png b/img/frames/margins/blackCornersThumb.png new file mode 100644 index 0000000000000000000000000000000000000000..377f8b470dde507ca4766d39d5b5199819d638bb GIT binary patch literal 2897 zcmeH}Su`7p7KVdkE={SSIOZZniLn}0LJdJ{3Sw3fVs3?+5*2Ew8e%Fn*Vv*_tx_?x zqV$x+bZ}y5QIhm{M3W=bk;GG`o7$?ar zW>$Tcdb@CCbG^HB)A0InA8`XIaRStcoc{S;q>t8B=32_4RJ8GlTXrq;wX)JpotT$8Wen~tI_Y1io#H^ zdV2HPKDR>C$s|5$rWX-cf6RZvK~1iR9f=Fx5y3t5neyo^aJj=%A68qpc*#wT8(1pV z8an@**PN(!zA%#Gvmk+u*WQ`=2r(%qQ=eTU9GAAq--`C2Rv^URY>gK_)>AMan!a%D zfz%`Lm#>w3iE||?_$8M=)JT}m31}t~((-!#%Y0{t9cC%rTNYsp{g~|%k`pIG&zJa1@MW<5$5^O2f!-^@QNpL6sM;dQhtwy zzkIU&(9UX`ipo=RHq(1h36e7heYI;sW@uFBc)cmQORdsJbFwyZ9SCXIJ?l(-u4!NQ zY{^Na`WCmPbHKPwe*Vw-J zX@iYe&yC`@v8c3L<4FGI16sDGMjxw8v5`H7e>=NbGJx$DWtu77mU9Q2q_#owD{jolFC8y#aF0jPR>yWdb{T>KRozV5_}2zA$u z{5W5VCga-kJj4w?8U2Kwhk z9g$y|egt;b~wWfw+_PH6RMiqOG*0GbmwoSYVHwS-OK%u!BM`;%fN;0o&Q$kWpa1FT|tF*5D2XTLvc#6*~&`L6+ znFHqBbe&yGIvWJOUJ#suWFCEy2xJfboEEh84Ya~LyYkB2A)=yC7h=1?(>|;NR-qfW z4D{BNt+fx=xpyt61#PdN$FKzNm?{WGRundUv>k%auFMeUwvDwTcY&A!?E^cG%iqI& zTuDjV2cyKf@8Mpqp?h1#Dy&D$!8^}l+=>48wv62wKSXC0W*sMj=F?^c-MW_2-11x} z)+WPdSNywhRMDA5nsZ$HJJAm1_N(`_HBn@7i1CD>=Y}iZeQv6!;F6JN;Zt=Fk)~jL z+SxY>(CmuwOzgnu5DA`LnJ6j?6R+4uh-$6dz={dx5>-N`*@S4&)u_w4&Zvi@)5!JN zQ85|%{omGP4(l&?P#qu7cM^FV*xSYGC*meN*@rsoU4?h70BPl(hRs-B@#w~lurHTI zdB!`uQnh5gL_)MI*B}cY``8)+nhCh-z3Ap0^^Uo^s?yb;ZpuF`{@n9hy*iNO)W%CM z&wD|RsjXU5mH4-(1Cx$Vlai|23~UvJPKWKZUw@&*za3jZyLMQOOU5rPix_yLF?EpnZVOGcwU6YH8u^!W^K^e>BG!I5!nvR%S z8^090>0X!W|AtFIvzz=J?VZr~Kz>54x*yW5?58Foq{qMcauMHs?}d0jy{`X&x&-Lh zU(FWq-p0N?Lfgwa|Y!Jqr{g$-+705t`joa~N`vmY_O{V=G-g%|Bz z-U=cQ<}JkhszV(F+v&acZp-hw%MmZ}G+3aS%HlhHpI-M=aOy#-rEj!Gg}sJ6{9!ca z*V&upp5jk}%fi8Pue$Z*&jJyTiEW7;*p)nbnt9i%tgn>fgn8P3prJtcKaKw(jqUfP zMW>G#+ii0bBf!Z&s;r|X`;^Z^Gb01Lh{=r^a5`RJIB`C9ptsO55@`uKC2t0O8yxI7o+#dgpnUYKh@Wx4YN%e>rCaH25!v)W2GL uIHV7B?L(>=dpU=?Sz+M}Iy*(Wg~3*~(?XQb+JT;O0+`*nY4if>f&UAq&swqo literal 0 HcmV?d00001 diff --git a/js/creator-6.js b/js/creator-7.js similarity index 98% rename from js/creator-6.js rename to js/creator-7.js index 614a2f48..ac4857d2 100644 --- a/js/creator-6.js +++ b/js/creator-7.js @@ -23,7 +23,12 @@ art.onerror = function() {if (!this.src.includes('/img/blank.png')) {this.src = art.onload = artEdited; //set symbol setSymbol = new Image(); setSymbol.crossOrigin = 'anonymous'; setSymbol.src = blank.src; -setSymbol.onerror = function() {if (!this.src.includes('/img/blank.png')) {this.src = fixUri('/img/blank.png');}} +setSymbol.onerror = function() { + if (this.src.includes('gatherer.wizards.com')) { + notify('Loading the set symbol from Gatherer failed. Please check this link to see if it exists. If it does, it may be necessary to manually download and upload the image.', 30); + } + if (!this.src.includes('/img/blank.png')) {this.src = fixUri('/img/blank.png');} +} setSymbol.onload = setSymbolEdited; //watermark watermark = new Image(); watermark.crossOrigin = 'anonymous'; watermark.src = blank.src; @@ -1079,7 +1084,7 @@ function drawCard() { //DOWNLOADING async function downloadCard() { if (card.infoArtist.replace(/ /g, '') == '' && !card.artSource.includes('/img/blank.png') && !card.artZoom == 0) { - notify('You must credit an artist before downloading!'); + notify('You must credit an artist before downloading!', 10); } else { var download = document.createElement('a'); var imageName = card.text.title.text; @@ -1247,16 +1252,16 @@ async function loadCard(selectedCardKey) { artistEdited(card.infoArtist); document.querySelector('#text-editor').value = card.text[Object.keys(card.text)[selectedTextIndex]].text; loadTextOptions(card.text); - document.querySelector('#art-x').value = scaleX(card.artX); - document.querySelector('#art-y').value = scaleY(card.artY); + document.querySelector('#art-x').value = scaleX(card.artX) - scaleWidth(card.marginX); + document.querySelector('#art-y').value = scaleY(card.artY) - scaleHeight(card.marginY); document.querySelector('#art-zoom').value = card.artZoom * 100; uploadArt(card.artSource); - document.querySelector('#setSymbol-x').value = scaleX(card.setSymbolX); - document.querySelector('#setSymbol-y').value = scaleY(card.setSymbolY); + document.querySelector('#setSymbol-x').value = scaleX(card.setSymbolX) - scaleWidth(card.marginX); + document.querySelector('#setSymbol-y').value = scaleY(card.setSymbolY) - scaleHeight(card.marginY); document.querySelector('#setSymbol-zoom').value = card.setSymbolZoom * 100; uploadSetSymbol(card.setSymbolSource); - document.querySelector('#watermark-x').value = scaleX(card.watermarkX); - document.querySelector('#watermark-y').value = scaleY(card.watermarkY); + document.querySelector('#watermark-x').value = scaleX(card.watermarkX) - scaleWidth(card.marginX); + document.querySelector('#watermark-y').value = scaleY(card.watermarkY) - scaleHeight(card.marginY); document.querySelector('#watermark-zoom').value = card.watermarkZoom * 100; document.querySelector('#watermark-left').value = card.watermarkLeft; document.querySelector('#watermark-right').value = card.watermarkRight; @@ -1289,7 +1294,7 @@ async function loadCard(selectedCardKey) { watermarkEdited(); } } else { - notify(selectedCardKey + ' failed to load.') + notify(selectedCardKey + ' failed to load.', 10) } } function deleteCard() { @@ -1374,7 +1379,7 @@ function fetchScryfallData(cardName, callback = console.log) { callback(JSON.parse(this.responseText)); // JSON.parse(this.responseText); } else if (this.readyState == 4 && this.status == 404) { - notify('No cards found for "' + cardName + '"'); + notify('No cards found for "' + cardName + '"', 10); } } xhttp.open('GET', 'https://api.scryfall.com/cards/search?order=released&unique=art&q=name%3D' + cardName.replace(/ /g, '_'), true); diff --git a/js/frames/groupMisc.js b/js/frames/groupMisc-1.js similarity index 84% rename from js/frames/groupMisc.js rename to js/frames/groupMisc-1.js index ec375056..413a75a8 100644 --- a/js/frames/groupMisc.js +++ b/js/frames/groupMisc-1.js @@ -4,5 +4,5 @@ loadFramePacks([ {name:'Legends Multicolored', value:'Legends'}, {name:'Misc', value:'disabled'}, {name:'Planechase', value:'Planechase'}, - {name:'1/8 Inch Margin', value:'Margin'} + {name:'1/8 Inch Margin', value:'Margin-1'} ]) \ No newline at end of file diff --git a/js/frames/packMargin.js b/js/frames/packMargin-1.js similarity index 95% rename from js/frames/packMargin.js rename to js/frames/packMargin-1.js index 2784ac5f..37e6c31a 100644 --- a/js/frames/packMargin.js +++ b/js/frames/packMargin-1.js @@ -5,6 +5,7 @@ availableFrames = [ {name:'Black Border Extension', src:'/img/frames/margins/blackBorderExtension.png', bounds:bounds}, {name:'Borderless Border Extension', src:'/img/frames/margins/borderlessBorderExtension.png', bounds:bounds}, {name:'Box Topper Border Extension', src:'/img/frames/margins/boxTopperBorderExtension.png', bounds:bounds}, + {name:'Black Corners', src:'/img/frames/margins/blackCorners.png', bounds:bounds}, ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; diff --git a/js/main-1.js b/js/main-1.js index 93d5276a..908c9cb3 100644 --- a/js/main-1.js +++ b/js/main-1.js @@ -8,7 +8,7 @@ function toggleMenu() { document.querySelector('.menu').classList.add('menu-visible'); } } -function notify(message = '') { +function notify(message = '', seconds) { var notification = document.createElement('div'); notification.classList = 'notification padding'; var notificationMessage = document.createElement('h4'); @@ -19,6 +19,9 @@ function notify(message = '') { close.onclick = closeNotification; notification.appendChild(close); document.querySelector('.notification-container').appendChild(notification); + if (seconds) { + setTimeout(function(){close.click();}, seconds * 1000) + } } function closeNotification(event) { var target = event.target.closest('.notification');