From 8a1ce5ad03516e44d9518a37ad8684fe593125b5 Mon Sep 17 00:00:00 2001 From: zino Date: Sun, 23 May 2021 12:42:35 +0200 Subject: [PATCH] reworked config to dynamically adjust to staging or master config value (2nd version aftert 1st lost) --- client/dist/inject.js | 62 +++++++++++++++++++++++----------- client/dist/seatmap.js | 65 ++++++++++++++++++++++++------------ client/src/inject.ts | 3 +- client/src/modules/child.ts | 10 ++++++ client/src/modules/config.ts | 31 ++++++++++------- client/src/modules/parent.ts | 7 ++++ client/src/modules/ui.ts | 3 +- client/src/modules/utils.ts | 7 ++++ client/src/seatmap.ts | 5 +-- client/src/types/types.d.ts | 31 +++++++++-------- 10 files changed, 151 insertions(+), 73 deletions(-) diff --git a/client/dist/inject.js b/client/dist/inject.js index 2e546e7..a7595a6 100644 --- a/client/dist/inject.js +++ b/client/dist/inject.js @@ -26861,7 +26861,6 @@ var utils_1 = __importDefault(require("./modules/utils")); var Communication = __importStar(require("./modules/communication")); var Parser = __importStar(require("./modules/parser")); var UI = __importStar(require("./modules/ui")); -var config_1 = require("./modules/config"); var BookingBtn = __importStar(require("./modules/bookingButton")); var Parent = __importStar(require("./modules/parent")); var inputsWithValue; @@ -26874,7 +26873,7 @@ window.addEventListener('load', function () { utils_1.default.consoleLog("posturl available: " + posturlAvail); if (inputsWithValue["trxstate"] !== "20" || posturlAvail === false) return; - utils_1.default.inject(config_1.config.urlCSSParentStaging, "css", "body"); + Parent.injectResources(); Communication.listenToMessages(messageHandler); inputsWithValue = __assign(__assign({}, inputsWithValue), Parser.getAdditionalInputs(content)); inputsWithValue = __assign(__assign({}, inputsWithValue), Parser.getVenueImage()); @@ -26933,7 +26932,7 @@ function messageHandler(e) { } } -},{"./modules/bookingButton":99,"./modules/communication":102,"./modules/config":103,"./modules/parent":109,"./modules/parser":110,"./modules/ui":112,"./modules/utils":113,"jquery":57,"jquery-ui":56}],99:[function(require,module,exports){ +},{"./modules/bookingButton":99,"./modules/communication":102,"./modules/parent":109,"./modules/parser":110,"./modules/ui":112,"./modules/utils":113,"jquery":57,"jquery-ui":56}],99:[function(require,module,exports){ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -27292,22 +27291,29 @@ function getXMLPromise(inUrl) { Object.defineProperty(exports, "__esModule", { value: true }); exports.config = void 0; exports.config = { + childHasVenueXML: false, debug: true, branch: "staging", version: "0.0.1", - urlSeatmapStaging: "https://staging.tickets.zinomedia.de", - urlSeatmapMaster: "https://tickets.zinomedia.de", - urlCSSChildMaster: "https://tickets.zinomedia.de/dist/styleChild.css", - urlCSSChildStaging: "https://staging.tickets.zinomedia.de/dist/styleChild.css", - urlCSSParentMaster: "https://tickets.zinomedia.de/dist/styleParent.css", - urlCSSParentStaging: "https://staging.tickets.zinomedia.de/dist/styleParent.css", - urlJSCStaging: "https://staging.tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.min.js", - urlJSCMaster: "https://tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.min.js", - urlCSSJSCStaging: "https://staging.tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.css", - urlCSSJSCMaster: "https://tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.css", - urlCSSjQueryUI: "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css", - childHasVenueXML: false, maxSelectedSeats: 10, + resources: { + master: { + seatmap: "https://tickets.zinomedia.de", + JSC: "https://tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.min.js", + CSSChild: "https://tickets.zinomedia.de/dist/styleChild.css", + CSSJSC: "https://tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.css", + CSSParent: "https://tickets.zinomedia.de/dist/styleParent.css", + CSSjQueryUI: "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" + }, + staging: { + seatmap: "https://staging.tickets.zinomedia.de", + JSC: "https://staging.tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.min.js", + CSSChild: "https://staging.tickets.zinomedia.de/dist/styleChild.css", + CSSJSC: "https://staging.tickets.zinomedia.de/libs/jQuery-Seat-Charts/jquery.seat-charts.css", + CSSParent: "https://staging.tickets.zinomedia.de/dist/styleParent.css", + CSSjQueryUI: "https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" + } + }, state: { priceOverall: "", cartChanged: false, @@ -27856,7 +27862,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.clickCheckout = exports.needSeatmapXML = exports.initNeedVenueXML = exports.initNeedInputsWithValue = exports.needCheckoutResponse = void 0; +exports.injectResources = exports.clickCheckout = exports.needSeatmapXML = exports.initNeedVenueXML = exports.initNeedInputsWithValue = exports.needCheckoutResponse = void 0; var config_1 = require("./config"); var axios_1 = __importDefault(require("axios")); var Communication = __importStar(require("./communication")); @@ -27923,6 +27929,12 @@ function clickCheckout(inE) { window.location.href = inUrl; } exports.clickCheckout = clickCheckout; +function injectResources() { + var branch = config_1.config.branch; + var resources = config_1.config.resources[branch]; + utils_1.default.inject(resources.CSSParent, "css", "body"); +} +exports.injectResources = injectResources; },{"./communication":102,"./config":103,"./utils":113,"axios":28}],110:[function(require,module,exports){ "use strict"; @@ -28151,6 +28163,9 @@ var __importStar = (this && this.__importStar) || function (mod) { __setModuleDefault(result, mod); return result; }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.appendVersion = exports.adjustUIToLoading = exports.generatePricescaleCSS = exports.fadeInCartModal = exports.changeVenueImage = exports.controlLoftloader = exports.destroyCurrentSeatmap = exports.createDialog = exports.setEventInfo = exports.setOptionSelect = void 0; var Communication = __importStar(require("./communication")); @@ -28158,6 +28173,7 @@ var config_1 = require("./config"); var Events = __importStar(require("./events")); var Panzoom = __importStar(require("./panzoom")); var CartButtons = __importStar(require("./cartButtons")); +var utils_1 = __importDefault(require("./utils")); function setOptionSelect(inSeatmapListing, inId) { var seatmapDropdown = document.getElementById(inId); if (seatmapDropdown) { @@ -28181,7 +28197,7 @@ function setEventInfo(inEventInfo) { exports.setEventInfo = setEventInfo; function createDialog() { var iframeHTML = "