From 5ab264a6ad4e521986b8923cd700852d5da55409 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Mon, 10 Oct 2022 09:31:34 -0700 Subject: [PATCH] Get assets from R2 --- packages/skin-museum-client/src/constants.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/skin-museum-client/src/constants.js b/packages/skin-museum-client/src/constants.js index 68d607d5..d043373c 100644 --- a/packages/skin-museum-client/src/constants.js +++ b/packages/skin-museum-client/src/constants.js @@ -1,6 +1,3 @@ -const urlSearchParams = new URLSearchParams(window.location.search); -const params = Object.fromEntries(urlSearchParams.entries()); - export const SCREENSHOT_WIDTH = 275; export const SCREENSHOT_HEIGHT = 348; export const SKIN_RATIO = SCREENSHOT_HEIGHT / SCREENSHOT_WIDTH; @@ -25,14 +22,12 @@ export const REVIEW_PAGE = "REVIEW_PAGE"; * */ +const R2_CDN = "https://r2.webampskins.org"; // export const CDN = "https://s3.amazonaws.com/webamp-uploaded-skins"; // export const CDN = "https://s3.amazonaws.com/cdn.webampskins.org"; -export const S3_SCREENSHOT_CDN = "https://s3.amazonaws.com/cdn.webampskins.org"; -export const SCREENSHOT_CDN = "https://cdn.webampskins.org"; -// mirror. is having some issue with CORs headers that I need to resolve. -export const SKIN_CDN = params.vps - ? "https://mirror.webampskins.org" - : "https://cdn.webampskins.org"; +// export const S3_SCREENSHOT_CDN = "https://s3.amazonaws.com/cdn.webampskins.org"; +export const SCREENSHOT_CDN = R2_CDN; +export const SKIN_CDN = R2_CDN; // Uncomment these if something goes wrong // export const SCREENSHOT_CDN = "https://cdn.webampskins.org"; // export const SKIN_CDN = "https://cdn.webampskins.org";