diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..53c37a1 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +dist \ No newline at end of file diff --git a/cardSvgs.js b/cardSvgs.js deleted file mode 100644 index d56c514..0000000 --- a/cardSvgs.js +++ /dev/null @@ -1,128 +0,0 @@ -// backs & joker -import card1B from "./cards/1B.svg?raw"; -import card2B from "./cards/2B.svg?raw"; -import card1J from "./cards/1J.svg?raw"; - -// suit: clubs -import cardAC from "./cards/AC.svg?raw"; -import card2C from "./cards/2C.svg?raw"; -import card3C from "./cards/3C.svg?raw"; -import card4C from "./cards/4C.svg?raw"; -import card5C from "./cards/5C.svg?raw"; -import card6C from "./cards/6C.svg?raw"; -import card7C from "./cards/7C.svg?raw"; -import card8C from "./cards/8C.svg?raw"; -import card9C from "./cards/9C.svg?raw"; -import cardTC from "./cards/TC.svg?raw"; -import cardJC from "./cards/JC.svg?raw"; -import cardQC from "./cards/QC.svg?raw"; -import cardKC from "./cards/KC.svg?raw"; - -// suit: diamonds -import cardAD from "./cards/AD.svg?raw"; -import card2D from "./cards/2D.svg?raw"; -import card3D from "./cards/3D.svg?raw"; -import card4D from "./cards/4D.svg?raw"; -import card5D from "./cards/5D.svg?raw"; -import card6D from "./cards/6D.svg?raw"; -import card7D from "./cards/7D.svg?raw"; -import card8D from "./cards/8D.svg?raw"; -import card9D from "./cards/9D.svg?raw"; -import cardTD from "./cards/TD.svg?raw"; -import cardJD from "./cards/JD.svg?raw"; -import cardQD from "./cards/QD.svg?raw"; -import cardKD from "./cards/KD.svg?raw"; - -// suit: hearts -import cardAH from "./cards/AH.svg?raw"; -import card2H from "./cards/2H.svg?raw"; -import card3H from "./cards/3H.svg?raw"; -import card4H from "./cards/4H.svg?raw"; -import card5H from "./cards/5H.svg?raw"; -import card6H from "./cards/6H.svg?raw"; -import card7H from "./cards/7H.svg?raw"; -import card8H from "./cards/8H.svg?raw"; -import card9H from "./cards/9H.svg?raw"; -import cardTH from "./cards/TH.svg?raw"; -import cardJH from "./cards/JH.svg?raw"; -import cardQH from "./cards/QH.svg?raw"; -import cardKH from "./cards/KH.svg?raw"; - -// suit: spades -import cardAS from "./cards/AS.svg?raw"; -import card2S from "./cards/2S.svg?raw"; -import card3S from "./cards/3S.svg?raw"; -import card4S from "./cards/4S.svg?raw"; -import card5S from "./cards/5S.svg?raw"; -import card6S from "./cards/6S.svg?raw"; -import card7S from "./cards/7S.svg?raw"; -import card8S from "./cards/8S.svg?raw"; -import card9S from "./cards/9S.svg?raw"; -import cardTS from "./cards/TS.svg?raw"; -import cardJS from "./cards/JS.svg?raw"; -import cardQS from "./cards/QS.svg?raw"; -import cardKS from "./cards/KS.svg?raw"; - -let cardSvgs = { - "1B": card1B, - "2B": card2B, - "1J": card1J, - - AC: cardAC, - "2C": card2C, - "3C": card3C, - "4C": card4C, - "5C": card5C, - "6C": card6C, - "7C": card7C, - "8C": card8C, - "9C": card9C, - TC: cardTC, - JC: cardJC, - QC: cardQC, - KC: cardKC, - - AD: cardAD, - "2D": card2D, - "3D": card3D, - "4D": card4D, - "5D": card5D, - "6D": card6D, - "7D": card7D, - "8D": card8D, - "9D": card9D, - TD: cardTD, - JD: cardJD, - QD: cardQD, - KD: cardKD, - - AH: cardAH, - "2H": card2H, - "3H": card3H, - "4H": card4H, - "5H": card5H, - "6H": card6H, - "7H": card7H, - "8H": card8H, - "9H": card9H, - TH: cardTH, - JH: cardJH, - QH: cardQH, - KH: cardKH, - - AS: cardAS, - "2S": card2S, - "3S": card3S, - "4S": card4S, - "5S": card5S, - "6S": card6S, - "7S": card7S, - "8S": card8S, - "9S": card9S, - TS: cardTS, - JS: cardJS, - QS: cardQS, - KS: cardKS, -}; - -export default cardSvgs; diff --git a/package.json b/package.json index f586da9..dd4e3ab 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,11 @@ "type": "module", "scripts": { "dev": "vite", - "build": "NODE_ENV=production vite build && html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --case-sensitive -o ./dist/index.html ./dist/index.html", + "build": "rm -rf dist && NODE_ENV=production vite build && html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --case-sensitive -o ./dist/index.html ./dist/index.html", "preview": "vite preview", "test": "mocha", "lint": "eslint --ext .js,.html --ignore-path .gitignore --fix .", - "format": "prettier . --write" + "format": "prettier . --write" }, "repository": { "type": "git", diff --git a/cards/1B.svg b/src/cards/1B.svg similarity index 100% rename from cards/1B.svg rename to src/cards/1B.svg diff --git a/cards/1J.svg b/src/cards/1J.svg similarity index 100% rename from cards/1J.svg rename to src/cards/1J.svg diff --git a/cards/2B.svg b/src/cards/2B.svg similarity index 100% rename from cards/2B.svg rename to src/cards/2B.svg diff --git a/cards/2C.svg b/src/cards/2C.svg similarity index 100% rename from cards/2C.svg rename to src/cards/2C.svg diff --git a/cards/2D.svg b/src/cards/2D.svg similarity index 100% rename from cards/2D.svg rename to src/cards/2D.svg diff --git a/cards/2H.svg b/src/cards/2H.svg similarity index 100% rename from cards/2H.svg rename to src/cards/2H.svg diff --git a/cards/2J.svg b/src/cards/2J.svg similarity index 100% rename from cards/2J.svg rename to src/cards/2J.svg diff --git a/cards/2S.svg b/src/cards/2S.svg similarity index 100% rename from cards/2S.svg rename to src/cards/2S.svg diff --git a/cards/3C.svg b/src/cards/3C.svg similarity index 100% rename from cards/3C.svg rename to src/cards/3C.svg diff --git a/cards/3D.svg b/src/cards/3D.svg similarity index 100% rename from cards/3D.svg rename to src/cards/3D.svg diff --git a/cards/3H.svg b/src/cards/3H.svg similarity index 100% rename from cards/3H.svg rename to src/cards/3H.svg diff --git a/cards/3S.svg b/src/cards/3S.svg similarity index 100% rename from cards/3S.svg rename to src/cards/3S.svg diff --git a/cards/4C.svg b/src/cards/4C.svg similarity index 100% rename from cards/4C.svg rename to src/cards/4C.svg diff --git a/cards/4D.svg b/src/cards/4D.svg similarity index 100% rename from cards/4D.svg rename to src/cards/4D.svg diff --git a/cards/4H.svg b/src/cards/4H.svg similarity index 100% rename from cards/4H.svg rename to src/cards/4H.svg diff --git a/cards/4S.svg b/src/cards/4S.svg similarity index 100% rename from cards/4S.svg rename to src/cards/4S.svg diff --git a/cards/5C.svg b/src/cards/5C.svg similarity index 100% rename from cards/5C.svg rename to src/cards/5C.svg diff --git a/cards/5D.svg b/src/cards/5D.svg similarity index 100% rename from cards/5D.svg rename to src/cards/5D.svg diff --git a/cards/5H.svg b/src/cards/5H.svg similarity index 100% rename from cards/5H.svg rename to src/cards/5H.svg diff --git a/cards/5S.svg b/src/cards/5S.svg similarity index 100% rename from cards/5S.svg rename to src/cards/5S.svg diff --git a/cards/6C.svg b/src/cards/6C.svg similarity index 100% rename from cards/6C.svg rename to src/cards/6C.svg diff --git a/cards/6D.svg b/src/cards/6D.svg similarity index 100% rename from cards/6D.svg rename to src/cards/6D.svg diff --git a/cards/6H.svg b/src/cards/6H.svg similarity index 100% rename from cards/6H.svg rename to src/cards/6H.svg diff --git a/cards/6S.svg b/src/cards/6S.svg similarity index 100% rename from cards/6S.svg rename to src/cards/6S.svg diff --git a/cards/7C.svg b/src/cards/7C.svg similarity index 100% rename from cards/7C.svg rename to src/cards/7C.svg diff --git a/cards/7D.svg b/src/cards/7D.svg similarity index 100% rename from cards/7D.svg rename to src/cards/7D.svg diff --git a/cards/7H.svg b/src/cards/7H.svg similarity index 100% rename from cards/7H.svg rename to src/cards/7H.svg diff --git a/cards/7S.svg b/src/cards/7S.svg similarity index 100% rename from cards/7S.svg rename to src/cards/7S.svg diff --git a/cards/8C.svg b/src/cards/8C.svg similarity index 100% rename from cards/8C.svg rename to src/cards/8C.svg diff --git a/cards/8D.svg b/src/cards/8D.svg similarity index 100% rename from cards/8D.svg rename to src/cards/8D.svg diff --git a/cards/8H.svg b/src/cards/8H.svg similarity index 100% rename from cards/8H.svg rename to src/cards/8H.svg diff --git a/cards/8S.svg b/src/cards/8S.svg similarity index 100% rename from cards/8S.svg rename to src/cards/8S.svg diff --git a/cards/9C.svg b/src/cards/9C.svg similarity index 100% rename from cards/9C.svg rename to src/cards/9C.svg diff --git a/cards/9D.svg b/src/cards/9D.svg similarity index 100% rename from cards/9D.svg rename to src/cards/9D.svg diff --git a/cards/9H.svg b/src/cards/9H.svg similarity index 100% rename from cards/9H.svg rename to src/cards/9H.svg diff --git a/cards/9S.svg b/src/cards/9S.svg similarity index 100% rename from cards/9S.svg rename to src/cards/9S.svg diff --git a/cards/AC.svg b/src/cards/AC.svg similarity index 100% rename from cards/AC.svg rename to src/cards/AC.svg diff --git a/cards/AD.svg b/src/cards/AD.svg similarity index 100% rename from cards/AD.svg rename to src/cards/AD.svg diff --git a/cards/AH.svg b/src/cards/AH.svg similarity index 100% rename from cards/AH.svg rename to src/cards/AH.svg diff --git a/cards/AS.svg b/src/cards/AS.svg similarity index 100% rename from cards/AS.svg rename to src/cards/AS.svg diff --git a/cards/JC.svg b/src/cards/JC.svg similarity index 100% rename from cards/JC.svg rename to src/cards/JC.svg diff --git a/cards/JD.svg b/src/cards/JD.svg similarity index 100% rename from cards/JD.svg rename to src/cards/JD.svg diff --git a/cards/JH.svg b/src/cards/JH.svg similarity index 100% rename from cards/JH.svg rename to src/cards/JH.svg diff --git a/cards/JS.svg b/src/cards/JS.svg similarity index 100% rename from cards/JS.svg rename to src/cards/JS.svg diff --git a/cards/KC.svg b/src/cards/KC.svg similarity index 100% rename from cards/KC.svg rename to src/cards/KC.svg diff --git a/cards/KD.svg b/src/cards/KD.svg similarity index 100% rename from cards/KD.svg rename to src/cards/KD.svg diff --git a/cards/KH.svg b/src/cards/KH.svg similarity index 100% rename from cards/KH.svg rename to src/cards/KH.svg diff --git a/cards/KS.svg b/src/cards/KS.svg similarity index 100% rename from cards/KS.svg rename to src/cards/KS.svg diff --git a/cards/QC.svg b/src/cards/QC.svg similarity index 100% rename from cards/QC.svg rename to src/cards/QC.svg diff --git a/cards/QD.svg b/src/cards/QD.svg similarity index 100% rename from cards/QD.svg rename to src/cards/QD.svg diff --git a/cards/QH.svg b/src/cards/QH.svg similarity index 100% rename from cards/QH.svg rename to src/cards/QH.svg diff --git a/cards/QS.svg b/src/cards/QS.svg similarity index 100% rename from cards/QS.svg rename to src/cards/QS.svg diff --git a/cards/TC.svg b/src/cards/TC.svg similarity index 100% rename from cards/TC.svg rename to src/cards/TC.svg diff --git a/cards/TD.svg b/src/cards/TD.svg similarity index 100% rename from cards/TD.svg rename to src/cards/TD.svg diff --git a/cards/TH.svg b/src/cards/TH.svg similarity index 100% rename from cards/TH.svg rename to src/cards/TH.svg diff --git a/cards/TS.svg b/src/cards/TS.svg similarity index 100% rename from cards/TS.svg rename to src/cards/TS.svg diff --git a/index.html b/src/index.html similarity index 99% rename from index.html rename to src/index.html index 45d3e18..50e6070 100644 --- a/index.html +++ b/src/index.html @@ -294,6 +294,6 @@

- + diff --git a/src/js/cardSvgs.js b/src/js/cardSvgs.js new file mode 100644 index 0000000..43cfaec --- /dev/null +++ b/src/js/cardSvgs.js @@ -0,0 +1,128 @@ +// backs & joker +import card1B from "../cards/1B.svg?raw"; +import card2B from "../cards/2B.svg?raw"; +import card1J from "../cards/1J.svg?raw"; + +// suit: clubs +import cardAC from "../cards/AC.svg?raw"; +import card2C from "../cards/2C.svg?raw"; +import card3C from "../cards/3C.svg?raw"; +import card4C from "../cards/4C.svg?raw"; +import card5C from "../cards/5C.svg?raw"; +import card6C from "../cards/6C.svg?raw"; +import card7C from "../cards/7C.svg?raw"; +import card8C from "../cards/8C.svg?raw"; +import card9C from "../cards/9C.svg?raw"; +import cardTC from "../cards/TC.svg?raw"; +import cardJC from "../cards/JC.svg?raw"; +import cardQC from "../cards/QC.svg?raw"; +import cardKC from "../cards/KC.svg?raw"; + +// suit: diamonds +import cardAD from "../cards/AD.svg?raw"; +import card2D from "../cards/2D.svg?raw"; +import card3D from "../cards/3D.svg?raw"; +import card4D from "../cards/4D.svg?raw"; +import card5D from "../cards/5D.svg?raw"; +import card6D from "../cards/6D.svg?raw"; +import card7D from "../cards/7D.svg?raw"; +import card8D from "../cards/8D.svg?raw"; +import card9D from "../cards/9D.svg?raw"; +import cardTD from "../cards/TD.svg?raw"; +import cardJD from "../cards/JD.svg?raw"; +import cardQD from "../cards/QD.svg?raw"; +import cardKD from "../cards/KD.svg?raw"; + +// suit: hearts +import cardAH from "../cards/AH.svg?raw"; +import card2H from "../cards/2H.svg?raw"; +import card3H from "../cards/3H.svg?raw"; +import card4H from "../cards/4H.svg?raw"; +import card5H from "../cards/5H.svg?raw"; +import card6H from "../cards/6H.svg?raw"; +import card7H from "../cards/7H.svg?raw"; +import card8H from "../cards/8H.svg?raw"; +import card9H from "../cards/9H.svg?raw"; +import cardTH from "../cards/TH.svg?raw"; +import cardJH from "../cards/JH.svg?raw"; +import cardQH from "../cards/QH.svg?raw"; +import cardKH from "../cards/KH.svg?raw"; + +// suit: spades +import cardAS from "../cards/AS.svg?raw"; +import card2S from "../cards/2S.svg?raw"; +import card3S from "../cards/3S.svg?raw"; +import card4S from "../cards/4S.svg?raw"; +import card5S from "../cards/5S.svg?raw"; +import card6S from "../cards/6S.svg?raw"; +import card7S from "../cards/7S.svg?raw"; +import card8S from "../cards/8S.svg?raw"; +import card9S from "../cards/9S.svg?raw"; +import cardTS from "../cards/TS.svg?raw"; +import cardJS from "../cards/JS.svg?raw"; +import cardQS from "../cards/QS.svg?raw"; +import cardKS from "../cards/KS.svg?raw"; + +let cardSvgs = { + "1B": card1B, + "2B": card2B, + "1J": card1J, + + AC: cardAC, + "2C": card2C, + "3C": card3C, + "4C": card4C, + "5C": card5C, + "6C": card6C, + "7C": card7C, + "8C": card8C, + "9C": card9C, + TC: cardTC, + JC: cardJC, + QC: cardQC, + KC: cardKC, + + AD: cardAD, + "2D": card2D, + "3D": card3D, + "4D": card4D, + "5D": card5D, + "6D": card6D, + "7D": card7D, + "8D": card8D, + "9D": card9D, + TD: cardTD, + JD: cardJD, + QD: cardQD, + KD: cardKD, + + AH: cardAH, + "2H": card2H, + "3H": card3H, + "4H": card4H, + "5H": card5H, + "6H": card6H, + "7H": card7H, + "8H": card8H, + "9H": card9H, + TH: cardTH, + JH: cardJH, + QH: cardQH, + KH: cardKH, + + AS: cardAS, + "2S": card2S, + "3S": card3S, + "4S": card4S, + "5S": card5S, + "6S": card6S, + "7S": card7S, + "8S": card8S, + "9S": card9S, + TS: cardTS, + JS: cardJS, + QS: cardQS, + KS: cardKS, +}; + +export default cardSvgs; diff --git a/main.js b/src/js/main.js similarity index 99% rename from main.js rename to src/js/main.js index 05b9645..143155e 100644 --- a/main.js +++ b/src/js/main.js @@ -1,4 +1,4 @@ -import "./style.scss"; +import "../scss/style.scss"; import Alpine from "alpinejs"; import cardSvgs from "./cardSvgs"; import SolverWorker from "./solverWorker?worker"; diff --git a/solverWorker.js b/src/js/solverWorker.js similarity index 88% rename from solverWorker.js rename to src/js/solverWorker.js index 3249c3a..103f307 100644 --- a/solverWorker.js +++ b/src/js/solverWorker.js @@ -1,4 +1,4 @@ -import { solve } from "./solver"; +import { solve } from "../../solver"; const runSolve = async (game) => { let result = await solve(game.slice(0, 28), game.slice(28, 52), self); diff --git a/style.scss b/src/scss/style.scss similarity index 96% rename from style.scss rename to src/scss/style.scss index 2d2a4fe..532b09f 100644 --- a/style.scss +++ b/src/scss/style.scss @@ -1,6 +1,6 @@ @use "sass:math"; -@import "./node_modules/bootstrap/scss/bootstrap"; +@import "../../node_modules/bootstrap/scss/bootstrap"; #gamePyramid { display: grid; diff --git a/vite.config.js b/vite.config.js index 4d91bef..505d18a 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,6 +1,7 @@ import { defineConfig } from "vite"; +import path from 'path'; export default defineConfig({ - // ... + root: path.resolve(__dirname, "src"), base: "./", });