From d2602c12e42ea7dbe194428f335cc3745e74dfdd Mon Sep 17 00:00:00 2001
From: Kyle <41976328+ImKyle4815@users.noreply.github.com>
Date: Sun, 20 Dec 2020 10:14:19 -0800
Subject: [PATCH] GCS
---
.htaccess | 3 +++
js/creator.js | 75 +++++++++++++++++++++++++--------------------------
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/.htaccess b/.htaccess
index 494493d3..152b6a8a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,4 +13,7 @@ ErrorDocument 404 /404.php
Header set Cache-Control "max-age=604800, public"
+
+ Header set Cache-Control "max-age=0, public"
+
\ No newline at end of file
diff --git a/js/creator.js b/js/creator.js
index e052e80b..84c8b207 100644
--- a/js/creator.js
+++ b/js/creator.js
@@ -2,42 +2,15 @@
var params = new URLSearchParams(window.location.search);
//To save the server from being overloaded? Maybe?
function fixUri(input) {
- var prefix = 'https://raw.githubusercontent.com/ImKyle4815/cardconjurer/remake';
- if (input.includes(prefix) || input.includes('http') || params.get('testing')) {
+ var prefix = 'https://storage.googleapis.com/card-conjurer';//'https://raw.githubusercontent.com/ImKyle4815/cardconjurer/remake';
+ if (input.includes(prefix) || input.includes('http') || input.includes('data:image') || params.get('testing')) {
return input;
} else {
return prefix + input; //input.replace('/img/frames', prefix + '/img/frames');
}
}
//card object
-var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:'/img/blank.png', artX:0, artY:0, artZoom:1, setSymbolSource:'/img/blank.png', setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:'/img/blank.png', watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]};
-//art
-art = new Image();
-art.crossOrigin = 'anonymous';
-art.src = fixUri('/img/blank.png');
-art.onerror = function() {this.src = fixUri('/img/blank.png');}
-art.onload = artEdited;
-//set symbol
-setSymbol = new Image();
-setSymbol.crossOrigin = 'anonymous';
-setSymbol.src = fixUri('/img/blank.png');
-setSymbol.onerror = function() {this.src = fixUri('/img/blank.png');}
-setSymbol.onload = setSymbolEdited;
-//watermark
-watermark = new Image();
-watermark.crossOrigin = 'anonymous';
-watermark.src = fixUri('/img/blank.png');
-watermark.onerror = function() {this.src = fixUri('/img/blank.png');}
-watermark.onload = watermarkEdited;
-//preview canvas
-var previewCanvas = document.querySelector('#previewCanvas');
-var previewContext = previewCanvas.getContext('2d');
-var canvasList = [];
-//frame/mask picker stuff
-var availableFrames = [];
-var selectedFrameIndex = 0;
-var selectedMaskIndex = 0;
-var selectedTextIndex = 0;
+var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:fixUri('/img/blank.png'), artX:0, artY:0, artZoom:1, setSymbolSource:fixUri('/img/blank.png'), setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:fixUri('/img/blank.png'), watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]};
//core images/masks
const black = new Image(); black.src = fixUri('/img/black.png');
black.crossOrigin = 'anonymous';
@@ -49,6 +22,33 @@ const middle = new Image(); middle.src = fixUri('/img/frames/maskMiddleThird.png
middle.crossOrigin = 'anonymous';
const corner = new Image(); corner.src = fixUri('/img/frames/cornerCutout.png');
corner.crossOrigin = 'anonymous';
+//art
+art = new Image();
+art.crossOrigin = 'anonymous';
+art.src = blank.src;
+// art.onerror = function() {this.src = fixUri('/img/blank.png');}
+art.onload = artEdited;
+//set symbol
+setSymbol = new Image();
+setSymbol.crossOrigin = 'anonymous';
+setSymbol.src = blank.src;
+// setSymbol.onerror = function() {this.src = fixUri('/img/blank.png');}
+setSymbol.onload = setSymbolEdited;
+//watermark
+watermark = new Image();
+watermark.crossOrigin = 'anonymous';
+watermark.src = blank.src;
+// watermark.onerror = function() {this.src = fixUri('/img/blank.png');}
+watermark.onload = watermarkEdited;
+//preview canvas
+var previewCanvas = document.querySelector('#previewCanvas');
+var previewContext = previewCanvas.getContext('2d');
+var canvasList = [];
+//frame/mask picker stuff
+var availableFrames = [];
+var selectedFrameIndex = 0;
+var selectedMaskIndex = 0;
+var selectedTextIndex = 0;
//for imports
var scryfallArt;
var scryfallCard;
@@ -295,7 +295,7 @@ function frameOptionClicked(event) {
}
clickedFrameOption.classList.add('selected');
selectedFrameIndex = getElementIndex(clickedFrameOption);
- document.querySelector('#mask-picker').innerHTML = ' + ')
No Mask
No Mask