From 3bb030894918fa6d54a3d7f60a5922dd94b00b34 Mon Sep 17 00:00:00 2001 From: Dylan Pizzo Date: Sun, 5 Jan 2025 22:17:30 -0500 Subject: [PATCH] Move some files so that deno task dev works --- .gitignore | 1 + deno.json | 4 ++-- src/draw.ts | 2 +- src/server/index.ts | 4 ++-- {src/static => static}/assets/BaseCardBrown.png | Bin {src/static => static}/assets/BaseCardColorOne.png | Bin {src/static => static}/assets/BaseCardGray.png | Bin {src/static => static}/assets/BaseCardIcon.png | Bin {src/static => static}/assets/CardBrown.png | Bin {src/static => static}/assets/CardColorOne.png | Bin {src/static => static}/assets/CardColorThree.png | Bin {src/static => static}/assets/CardColorTwo.png | Bin {src/static => static}/assets/CardColorTwoBig.png | Bin {src/static => static}/assets/CardColorTwoNight.png | Bin {src/static => static}/assets/CardColorTwoSmall.png | Bin {src/static => static}/assets/CardGray.png | Bin {src/static => static}/assets/CardPortraitIcon.png | Bin {src/static => static}/assets/Coin.png | Bin {src/static => static}/assets/Debt.png | Bin {src/static => static}/assets/DescriptionFocus.png | Bin {src/static => static}/assets/DoubleColorOne.png | Bin .../assets/DoubleUncoloredDetails.png | Bin {src/static => static}/assets/EventBrown.png | Bin {src/static => static}/assets/EventBrown2.png | Bin {src/static => static}/assets/EventColorOne.png | Bin {src/static => static}/assets/EventColorTwo.png | Bin {src/static => static}/assets/EventHeirloom.png | Bin {src/static => static}/assets/Heirloom.png | Bin {src/static => static}/assets/MatBannerBottom.png | Bin {src/static => static}/assets/MatBannerTop.png | Bin {src/static => static}/assets/MatIcon.png | Bin .../static => static}/assets/PileMarkerColorOne.png | Bin {src/static => static}/assets/PileMarkerGrey.png | Bin {src/static => static}/assets/PileMarkerIcon.png | Bin {src/static => static}/assets/Potion.png | Bin {src/static => static}/assets/Sun.png | Bin {src/static => static}/assets/TraitBrown.png | Bin {src/static => static}/assets/TraitBrownSide.png | Bin {src/static => static}/assets/TraitColorOne.png | Bin {src/static => static}/assets/TraitColorOneSide.png | Bin {src/static => static}/assets/Traveller.png | Bin {src/static => static}/assets/VP-Token.png | Bin {src/static => static}/assets/VP.png | Bin {src/static => static}/fonts.css | 0 {src/static => static}/index.html | 0 tools/build.ts | 2 +- 46 files changed, 7 insertions(+), 6 deletions(-) rename {src/static => static}/assets/BaseCardBrown.png (100%) rename {src/static => static}/assets/BaseCardColorOne.png (100%) rename {src/static => static}/assets/BaseCardGray.png (100%) rename {src/static => static}/assets/BaseCardIcon.png (100%) rename {src/static => static}/assets/CardBrown.png (100%) rename {src/static => static}/assets/CardColorOne.png (100%) rename {src/static => static}/assets/CardColorThree.png (100%) rename {src/static => static}/assets/CardColorTwo.png (100%) rename {src/static => static}/assets/CardColorTwoBig.png (100%) rename {src/static => static}/assets/CardColorTwoNight.png (100%) rename {src/static => static}/assets/CardColorTwoSmall.png (100%) rename {src/static => static}/assets/CardGray.png (100%) rename {src/static => static}/assets/CardPortraitIcon.png (100%) rename {src/static => static}/assets/Coin.png (100%) rename {src/static => static}/assets/Debt.png (100%) rename {src/static => static}/assets/DescriptionFocus.png (100%) rename {src/static => static}/assets/DoubleColorOne.png (100%) rename {src/static => static}/assets/DoubleUncoloredDetails.png (100%) rename {src/static => static}/assets/EventBrown.png (100%) rename {src/static => static}/assets/EventBrown2.png (100%) rename {src/static => static}/assets/EventColorOne.png (100%) rename {src/static => static}/assets/EventColorTwo.png (100%) rename {src/static => static}/assets/EventHeirloom.png (100%) rename {src/static => static}/assets/Heirloom.png (100%) rename {src/static => static}/assets/MatBannerBottom.png (100%) rename {src/static => static}/assets/MatBannerTop.png (100%) rename {src/static => static}/assets/MatIcon.png (100%) rename {src/static => static}/assets/PileMarkerColorOne.png (100%) rename {src/static => static}/assets/PileMarkerGrey.png (100%) rename {src/static => static}/assets/PileMarkerIcon.png (100%) rename {src/static => static}/assets/Potion.png (100%) rename {src/static => static}/assets/Sun.png (100%) rename {src/static => static}/assets/TraitBrown.png (100%) rename {src/static => static}/assets/TraitBrownSide.png (100%) rename {src/static => static}/assets/TraitColorOne.png (100%) rename {src/static => static}/assets/TraitColorOneSide.png (100%) rename {src/static => static}/assets/Traveller.png (100%) rename {src/static => static}/assets/VP-Token.png (100%) rename {src/static => static}/assets/VP.png (100%) rename {src/static => static}/fonts.css (100%) rename {src/static => static}/index.html (100%) diff --git a/.gitignore b/.gitignore index b433c70..61d9132 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ node_modules .env **/dist/**/* +static/dist diff --git a/deno.json b/deno.json index f8db202..40f11ab 100644 --- a/deno.json +++ b/deno.json @@ -3,9 +3,9 @@ "tasks": { "dev": "deno run -A tools/dev.ts", "build": "deno run -A tools/build.ts", - "build:watch": "deno run --watch=src/client,src/server -A tools/build.ts", + "build:watch": "deno run --watch=src -A tools/build.ts", "serve": "deno run -A src/server/index.ts", - "serve:watch": "deno run --watch=src/client,src/server -A src/server/index.ts" + "serve:watch": "deno run --watch=src -A src/server/index.ts" }, "lint": { "rules": { diff --git a/src/draw.ts b/src/draw.ts index 618c45b..84fa6fb 100644 --- a/src/draw.ts +++ b/src/draw.ts @@ -121,7 +121,7 @@ const drawStandardCard = async ( context.drawImage(colorImage(getImage("card-brown"), "#ff9911"), 0, 0); context.drawImage(getImage("card-description-focus"), 44, 1094); // Draw the name - drawText(context, card.title, 300, 300); + drawText(context, card.title, 400, 500); // Draw the description // Draw the types // Draw the cost diff --git a/src/server/index.ts b/src/server/index.ts index f318209..f9334e0 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -5,10 +5,10 @@ Deno.serve((req: Request) => { if (pathname.startsWith("/static")) { return serveDir(req, { - fsRoot: "src/static", + fsRoot: "static", urlRoot: "static", }); } else { - return serveFile(req, "src/static/index.html"); + return serveFile(req, "static/index.html"); } }); diff --git a/src/static/assets/BaseCardBrown.png b/static/assets/BaseCardBrown.png similarity index 100% rename from src/static/assets/BaseCardBrown.png rename to static/assets/BaseCardBrown.png diff --git a/src/static/assets/BaseCardColorOne.png b/static/assets/BaseCardColorOne.png similarity index 100% rename from src/static/assets/BaseCardColorOne.png rename to static/assets/BaseCardColorOne.png diff --git a/src/static/assets/BaseCardGray.png b/static/assets/BaseCardGray.png similarity index 100% rename from src/static/assets/BaseCardGray.png rename to static/assets/BaseCardGray.png diff --git a/src/static/assets/BaseCardIcon.png b/static/assets/BaseCardIcon.png similarity index 100% rename from src/static/assets/BaseCardIcon.png rename to static/assets/BaseCardIcon.png diff --git a/src/static/assets/CardBrown.png b/static/assets/CardBrown.png similarity index 100% rename from src/static/assets/CardBrown.png rename to static/assets/CardBrown.png diff --git a/src/static/assets/CardColorOne.png b/static/assets/CardColorOne.png similarity index 100% rename from src/static/assets/CardColorOne.png rename to static/assets/CardColorOne.png diff --git a/src/static/assets/CardColorThree.png b/static/assets/CardColorThree.png similarity index 100% rename from src/static/assets/CardColorThree.png rename to static/assets/CardColorThree.png diff --git a/src/static/assets/CardColorTwo.png b/static/assets/CardColorTwo.png similarity index 100% rename from src/static/assets/CardColorTwo.png rename to static/assets/CardColorTwo.png diff --git a/src/static/assets/CardColorTwoBig.png b/static/assets/CardColorTwoBig.png similarity index 100% rename from src/static/assets/CardColorTwoBig.png rename to static/assets/CardColorTwoBig.png diff --git a/src/static/assets/CardColorTwoNight.png b/static/assets/CardColorTwoNight.png similarity index 100% rename from src/static/assets/CardColorTwoNight.png rename to static/assets/CardColorTwoNight.png diff --git a/src/static/assets/CardColorTwoSmall.png b/static/assets/CardColorTwoSmall.png similarity index 100% rename from src/static/assets/CardColorTwoSmall.png rename to static/assets/CardColorTwoSmall.png diff --git a/src/static/assets/CardGray.png b/static/assets/CardGray.png similarity index 100% rename from src/static/assets/CardGray.png rename to static/assets/CardGray.png diff --git a/src/static/assets/CardPortraitIcon.png b/static/assets/CardPortraitIcon.png similarity index 100% rename from src/static/assets/CardPortraitIcon.png rename to static/assets/CardPortraitIcon.png diff --git a/src/static/assets/Coin.png b/static/assets/Coin.png similarity index 100% rename from src/static/assets/Coin.png rename to static/assets/Coin.png diff --git a/src/static/assets/Debt.png b/static/assets/Debt.png similarity index 100% rename from src/static/assets/Debt.png rename to static/assets/Debt.png diff --git a/src/static/assets/DescriptionFocus.png b/static/assets/DescriptionFocus.png similarity index 100% rename from src/static/assets/DescriptionFocus.png rename to static/assets/DescriptionFocus.png diff --git a/src/static/assets/DoubleColorOne.png b/static/assets/DoubleColorOne.png similarity index 100% rename from src/static/assets/DoubleColorOne.png rename to static/assets/DoubleColorOne.png diff --git a/src/static/assets/DoubleUncoloredDetails.png b/static/assets/DoubleUncoloredDetails.png similarity index 100% rename from src/static/assets/DoubleUncoloredDetails.png rename to static/assets/DoubleUncoloredDetails.png diff --git a/src/static/assets/EventBrown.png b/static/assets/EventBrown.png similarity index 100% rename from src/static/assets/EventBrown.png rename to static/assets/EventBrown.png diff --git a/src/static/assets/EventBrown2.png b/static/assets/EventBrown2.png similarity index 100% rename from src/static/assets/EventBrown2.png rename to static/assets/EventBrown2.png diff --git a/src/static/assets/EventColorOne.png b/static/assets/EventColorOne.png similarity index 100% rename from src/static/assets/EventColorOne.png rename to static/assets/EventColorOne.png diff --git a/src/static/assets/EventColorTwo.png b/static/assets/EventColorTwo.png similarity index 100% rename from src/static/assets/EventColorTwo.png rename to static/assets/EventColorTwo.png diff --git a/src/static/assets/EventHeirloom.png b/static/assets/EventHeirloom.png similarity index 100% rename from src/static/assets/EventHeirloom.png rename to static/assets/EventHeirloom.png diff --git a/src/static/assets/Heirloom.png b/static/assets/Heirloom.png similarity index 100% rename from src/static/assets/Heirloom.png rename to static/assets/Heirloom.png diff --git a/src/static/assets/MatBannerBottom.png b/static/assets/MatBannerBottom.png similarity index 100% rename from src/static/assets/MatBannerBottom.png rename to static/assets/MatBannerBottom.png diff --git a/src/static/assets/MatBannerTop.png b/static/assets/MatBannerTop.png similarity index 100% rename from src/static/assets/MatBannerTop.png rename to static/assets/MatBannerTop.png diff --git a/src/static/assets/MatIcon.png b/static/assets/MatIcon.png similarity index 100% rename from src/static/assets/MatIcon.png rename to static/assets/MatIcon.png diff --git a/src/static/assets/PileMarkerColorOne.png b/static/assets/PileMarkerColorOne.png similarity index 100% rename from src/static/assets/PileMarkerColorOne.png rename to static/assets/PileMarkerColorOne.png diff --git a/src/static/assets/PileMarkerGrey.png b/static/assets/PileMarkerGrey.png similarity index 100% rename from src/static/assets/PileMarkerGrey.png rename to static/assets/PileMarkerGrey.png diff --git a/src/static/assets/PileMarkerIcon.png b/static/assets/PileMarkerIcon.png similarity index 100% rename from src/static/assets/PileMarkerIcon.png rename to static/assets/PileMarkerIcon.png diff --git a/src/static/assets/Potion.png b/static/assets/Potion.png similarity index 100% rename from src/static/assets/Potion.png rename to static/assets/Potion.png diff --git a/src/static/assets/Sun.png b/static/assets/Sun.png similarity index 100% rename from src/static/assets/Sun.png rename to static/assets/Sun.png diff --git a/src/static/assets/TraitBrown.png b/static/assets/TraitBrown.png similarity index 100% rename from src/static/assets/TraitBrown.png rename to static/assets/TraitBrown.png diff --git a/src/static/assets/TraitBrownSide.png b/static/assets/TraitBrownSide.png similarity index 100% rename from src/static/assets/TraitBrownSide.png rename to static/assets/TraitBrownSide.png diff --git a/src/static/assets/TraitColorOne.png b/static/assets/TraitColorOne.png similarity index 100% rename from src/static/assets/TraitColorOne.png rename to static/assets/TraitColorOne.png diff --git a/src/static/assets/TraitColorOneSide.png b/static/assets/TraitColorOneSide.png similarity index 100% rename from src/static/assets/TraitColorOneSide.png rename to static/assets/TraitColorOneSide.png diff --git a/src/static/assets/Traveller.png b/static/assets/Traveller.png similarity index 100% rename from src/static/assets/Traveller.png rename to static/assets/Traveller.png diff --git a/src/static/assets/VP-Token.png b/static/assets/VP-Token.png similarity index 100% rename from src/static/assets/VP-Token.png rename to static/assets/VP-Token.png diff --git a/src/static/assets/VP.png b/static/assets/VP.png similarity index 100% rename from src/static/assets/VP.png rename to static/assets/VP.png diff --git a/src/static/fonts.css b/static/fonts.css similarity index 100% rename from src/static/fonts.css rename to static/fonts.css diff --git a/src/static/index.html b/static/index.html similarity index 100% rename from src/static/index.html rename to static/index.html diff --git a/tools/build.ts b/tools/build.ts index 3cb7e7c..3f29d7c 100644 --- a/tools/build.ts +++ b/tools/build.ts @@ -17,7 +17,7 @@ await esbuild.build({ plugins: [...denoPlugins()], absWorkingDir: projectRootDir, entryPoints: ["src/client/index.tsx"], - outfile: "src/static/dist/bundle.js", + outfile: "static/dist/bundle.js", bundle: true, format: "esm", target,