From c85c182c0d65dae75fe1ef1c0e370f86bfbaaeea Mon Sep 17 00:00:00 2001 From: I-Have-An-Issue <34550332+I-Have-An-Issue@users.noreply.github.com> Date: Sat, 15 Oct 2022 23:19:05 -0400 Subject: [PATCH] InsertAsset --- package-lock.json | 13 +++++++- package.json | 3 +- src/app.css | 9 +++++ src/hooks.server.js | 15 +++++---- src/lib/BrickColorsPalette.json | 4 +++ src/lib/components/BrickColor.svelte | 15 +++++++++ .../components/modals/BrickColorModal.svelte | 33 +++++++++++++++++++ src/routes/(api)/Asset/+server.js | 9 ----- .../Game/Tools/InsertAsset.ashx/+server.js | 9 +++++ src/routes/(api)/asset/+server.js | 9 ----- src/routes/(app)/+layout.svelte | 6 ++++ src/routes/(app)/my/avatar/+page.svelte | 15 +++++++-- 12 files changed, 111 insertions(+), 29 deletions(-) create mode 100644 src/lib/BrickColorsPalette.json create mode 100644 src/lib/components/BrickColor.svelte create mode 100644 src/lib/components/modals/BrickColorModal.svelte delete mode 100644 src/routes/(api)/Asset/+server.js create mode 100644 src/routes/(api)/Game/Tools/InsertAsset.ashx/+server.js delete mode 100644 src/routes/(api)/asset/+server.js diff --git a/package-lock.json b/package-lock.json index 9d610a0..4023bf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,8 @@ "@sveltejs/adapter-node": "^1.0.0-next.96", "bcrypt": "^5.1.0", "cookie": "^0.5.0", - "mongodb": "^4.10.0" + "mongodb": "^4.10.0", + "svelte-modals": "^1.2.0" }, "devDependencies": { "@sveltejs/adapter-auto": "next", @@ -2775,6 +2776,11 @@ "svelte": ">=3.19.0" } }, + "node_modules/svelte-modals": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/svelte-modals/-/svelte-modals-1.2.0.tgz", + "integrity": "sha512-t2aRTu42olRtXsiIvL/RXImy0BiaSWqKCGXIkN9RL7shzvkPXC4rxfbvi1Y3qS/4XeJ6Av1lLxQty/pxNGXg4A==" + }, "node_modules/svelte-preprocess": { "version": "4.10.7", "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.7.tgz", @@ -4947,6 +4953,11 @@ "dev": true, "requires": {} }, + "svelte-modals": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/svelte-modals/-/svelte-modals-1.2.0.tgz", + "integrity": "sha512-t2aRTu42olRtXsiIvL/RXImy0BiaSWqKCGXIkN9RL7shzvkPXC4rxfbvi1Y3qS/4XeJ6Av1lLxQty/pxNGXg4A==" + }, "svelte-preprocess": { "version": "4.10.7", "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.7.tgz", diff --git a/package.json b/package.json index 24b4f7e..42f7c00 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@sveltejs/adapter-node": "^1.0.0-next.96", "bcrypt": "^5.1.0", "cookie": "^0.5.0", - "mongodb": "^4.10.0" + "mongodb": "^4.10.0", + "svelte-modals": "^1.2.0" } } diff --git a/src/app.css b/src/app.css index 3c4fe15..b071efb 100644 --- a/src/app.css +++ b/src/app.css @@ -38,6 +38,15 @@ body { -webkit-box-orient: vertical; } +.backdrop { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: 0; + background: rgba(0, 0, 0, 0.5); +} + @keyframes scrollbg { 0% { background-position: 0 0; diff --git a/src/hooks.server.js b/src/hooks.server.js index d7917aa..a9d9c33 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -1,5 +1,6 @@ import { COOKIE_NAME } from "$lib/constants"; import { getUserFromSession } from "$lib/database"; +import BrickColorsPalette from "$lib/BrickColorsPalette.json"; /** @type {import('@sveltejs/kit').Handle} */ export async function handle({ event, resolve }) { @@ -24,15 +25,15 @@ export async function handle({ event, resolve }) { currency: user.currency, thumbnails: { headshot: "/img/headshot.png", - bodyshot: "/img/bodyshot.png" + bodyshot: "/img/derpecated.png" }, bodyColors: { - HeadColor: 125, - TorsoColor: 125, - LeftArmColor: 125, - RightArmColor: 125, - LeftLegColor: 125, - RightLegColor: 125 + HeadColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)], + TorsoColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)], + LeftArmColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)], + RightArmColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)], + LeftLegColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)], + RightLegColor: BrickColorsPalette[Math.floor(Math.random() * BrickColorsPalette.length)] } }; diff --git a/src/lib/BrickColorsPalette.json b/src/lib/BrickColorsPalette.json new file mode 100644 index 0000000..7370b72 --- /dev/null +++ b/src/lib/BrickColorsPalette.json @@ -0,0 +1,4 @@ +[ + 119, 24, 106, 21, 104, 23, 107, 37, 1001, 1, 208, 1002, 194, 199, 26, 1003, 1022, 105, 125, 153, 1023, 135, 102, 151, 5, 226, 133, 101, 9, 11, 1018, 29, 1030, 1029, 1025, 1016, 1026, 1024, 1027, 1028, 1008, 1009, 1005, 1004, 1032, 1010, + 1019, 1020, 217, 18, 38, 1031, 1006, 1013, 45, 1021, 192, 1014, 1007, 1015, 1012, 1011, 28, 141 +] diff --git a/src/lib/components/BrickColor.svelte b/src/lib/components/BrickColor.svelte new file mode 100644 index 0000000..99922e5 --- /dev/null +++ b/src/lib/components/BrickColor.svelte @@ -0,0 +1,15 @@ + + +
diff --git a/src/lib/components/modals/BrickColorModal.svelte b/src/lib/components/modals/BrickColorModal.svelte new file mode 100644 index 0000000..cc40bb2 --- /dev/null +++ b/src/lib/components/modals/BrickColorModal.svelte @@ -0,0 +1,33 @@ + + +{#if isOpen} + +{/if} diff --git a/src/routes/(api)/Asset/+server.js b/src/routes/(api)/Asset/+server.js deleted file mode 100644 index 8de0d77..0000000 --- a/src/routes/(api)/Asset/+server.js +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('./$types').RequestHandler} */ -export function GET({ url }) { - return new Response("", { - status: 302, - headers: { - Location: `/asset?id=${url.searchParams.get("id")}` - } - }); -} diff --git a/src/routes/(api)/Game/Tools/InsertAsset.ashx/+server.js b/src/routes/(api)/Game/Tools/InsertAsset.ashx/+server.js new file mode 100644 index 0000000..629c5c6 --- /dev/null +++ b/src/routes/(api)/Game/Tools/InsertAsset.ashx/+server.js @@ -0,0 +1,9 @@ +import joinscript from "$lib/joinscript.js"; + +/** @type {import('./$types').RequestHandler} */ +export function GET({ url }) { + return new Response("", { + status: 302, + headers: { location: `https://assetdelivery.roblox.com/v1/asset?id=${url.query.get("id")}` } + }); +} diff --git a/src/routes/(api)/asset/+server.js b/src/routes/(api)/asset/+server.js deleted file mode 100644 index 6e25022..0000000 --- a/src/routes/(api)/asset/+server.js +++ /dev/null @@ -1,9 +0,0 @@ -/** @type {import('./$types').RequestHandler} */ -export function GET({ url }) { - return new Response("", { - status: 302, - headers: { - Location: `https://assetdelivery.roblox.com/v1/asset?id=${url.searchParams.get("id")}` - } - }); -} diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 7c0e874..00145f2 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -1,6 +1,8 @@