improved page layout, added vite config for './' base path

This commit is contained in:
Adam Piontek 2022-09-13 21:17:10 -04:00
parent 1ae0c4237c
commit 2959f7945d
3 changed files with 196 additions and 157 deletions

View file

@ -11,175 +11,207 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col pt-3 pt-lg-5"> <div class="col pt-3 pt-lg-5">
<h1>Tripeaks Solver</h1> <h1 class="mb-3">Tripeaks Solver</h1>
<p> <div x-data="{show: false}" class="accordion mb-3" id="readMeAccordion">
Enter cards representing a Tripeaks game below. Enter each card as 2 <div class="accordion-item">
characters representing the rank (A, 2, 3, 4, 5, 6, 7, 8, 9, T, J, <h2 id="readMeHeader" class="accordion-header" >
Q, K) and suit (C, D, H, S). For example, "TH" is the Ten of Hearts. <button
</p> class="accordion-button"
:class="{'collapsed': !show}"
type="button"
:aria-expanded="show ? 'true' : 'false'"
aria-controls="collapseOne"
@click="show = !show">
Read Me / How To
</button>
</h2>
<div id="collapseOne" class="accordion-collapse collapse" :class="{'show': show}" aria-labelledby="headingOne">
<div class="accordion-body">
<p> <p>
Use a single zero ("0") for unknown cards. However, the last 34 Enter cards representing a Tripeaks game below. Enter each card as 2
cards (bottom row & stock) must be known, and you don't need to characters representing the rank (A, 2, 3, 4, 5, 6, 7, 8, 9, T, J,
enter unknown cards before the first card you know. Q, K) and suit (C, D, H, S). For example, "TH" is the Ten of Hearts.
</p> </p>
<p> <p>
Entry is case-insensitive, and you can separate cards with any Use a single zero ("0") for unknown cards. However, the last 34
character (space, comma, etc), or use no separator. Valid examples: cards (bottom row & stock) must be known, and you don't need to
</p> enter unknown cards before the first card you know.
</p>
<ul> <p>
<li> Entry is case-insensitive, and you can separate cards with any
7S 5D 7C 2D 0 0 3S 2H 3H 9H KC QC TD 8D 9C 7H 9D JS QS 4H 5C 5S 4C character (space, comma, etc), or use no separator. Valid examples:
2C QD 8C KD 3D KS JD 2S 7D KH AH 5H 9S 4S QH 6S 6D 3C JC TC 8H 6C </p>
TH AS AD 6H
</li>
<li>
jc, ts, 6d, 7h, qh, 3s, 5h, jh, 6h, 2d, ac, 7s, 7c, 3d, kd, 9s,
3c, th, 6c, ah, 8h, tc, 4s, 8c, ad, 3h, ks, 6s, js, 7d, jd, td,
2c, kh
</li>
<li>
7c03s0qsjc00JSasTSadtcqd9s4s2h9h8sjh6c3dks5s5c6h9C2Cac8C6d5DTH8dkckd9d4c5h8hqh6s
</li>
</ul>
<!-- User input of game cards --> <ul>
<form <li>
id="cardsInputForm" 7S 5D 7C 2D 0 0 3S 2H 3H 9H KC QC TD 8D 9C 7H 9D JS QS 4H 5C 5S 4C
x-data="cardsInputForm" 2C QD 8C KD 3D KS JD 2S 7D KH AH 5H 9S 4S QH 6S 6D 3C JC TC 8H 6C
@submit.prevent="$dispatch('solve-game')" TH AS AD 6H
class="needs-validation" </li>
:class="{'was-validated': isFormValid && inputValue.length > 2 }" <li>
novalidate jc, ts, 6d, 7h, qh, 3s, 5h, jh, 6h, 2d, ac, 7s, 7c, 3d, kd, 9s,
> 3c, th, 6c, ah, 8h, tc, 4s, 8c, ad, 3h, ks, 6s, js, 7d, jd, td,
<h3 id="cardsInputLabel" for="cardsInput" class="form-label"> 2c, kh
Enter Your Cards </li>
</h3> <li>
<div class="input-group"> 7c03s0qsjc00JSasTSadtcqd9s4s2h9h8sjh6c3dks5s5c6h9C2Cac8C6d5DTH8dkckd9d4c5h8hqh6s
<input </li>
id="cardsInput" </ul>
aria-describedby="cardsInputLabel"
type="text" </div>
x-model="inputValue" </div>
class="form-control" </div>
:class="{ 'is-valid': isFormValid && inputValue.length > 2, 'is-invalid': !isFormValid && inputValue.length > 2 }"
maxlength="206" </div>
@keyup.debounce="validateCardsInput()"
placeholder="e.g., 2S TC 4S QD KH 5S 9S ..." <div class="row">
:disabled="$store.global.solvingInProgress"
/> <div class="col-12 col-lg-9 col-xl-8">
<button <!-- User input of game cards -->
id="cardsInputButton" <form
type="submit" id="cardsInputForm"
class="btn btn-outline-primary" x-data="cardsInputForm"
:disabled="!isFormValid || $store.global.solvingInProgress" @submit.prevent="$dispatch('solve-game')"
class="needs-validation"
:class="{'was-validated': isFormValid && inputValue.length > 2 }"
novalidate
> >
Solve <h3 id="cardsInputLabel" for="cardsInput" class="form-label">
</button> Enter Your Cards
</div> </h3>
<div class="mb-3"> <div class="input-group">
<template x-for="msg in validMessages"> <input
<div id="cardsInput"
class="valid-feedback" aria-describedby="cardsInputLabel"
:class="{ 'd-block': validCards.length > 0 }" type="text"
x-text="msg" x-model="inputValue"
></div> class="form-control"
</template> :class="{ 'is-valid': isFormValid && inputValue.length > 2, 'is-invalid': !isFormValid && inputValue.length > 2 }"
<template x-for="msg in invalidMessages"> maxlength="206"
<div @keyup.debounce="validateCardsInput()"
class="invalid-feedback" placeholder="e.g., 2S TC 4S QD KH 5S 9S ..."
:class="{ 'd-block': invalidMessages.length > 0 && inputValue.length > 2 }" :disabled="$store.global.solvingInProgress"
x-text="msg" />
></div> <button
</template> id="cardsInputButton"
</div> type="submit"
</form> class="btn btn-outline-primary"
:disabled="!isFormValid || $store.global.solvingInProgress"
>
Solve
</button>
</div>
<div class="mb-3">
<template x-for="msg in validMessages">
<div
class="valid-feedback"
:class="{ 'd-block': validCards.length > 0 }"
x-text="msg"
></div>
</template>
<template x-for="msg in invalidMessages">
<div
class="invalid-feedback"
:class="{ 'd-block': invalidMessages.length > 0 && inputValue.length > 2 }"
x-text="msg"
></div>
</template>
</div>
</form>
<!-- Friendly display of game cards --> <!-- Friendly display of game cards -->
<div
id="playingCardsPreview"
x-data="playingCardsPreview"
class="mb-4"
>
<div
id="gamePyramid"
class="game-pyramid-container p-2 p-md-3 p-lg-4"
>
<!-- first/top row (index 0, row 1) -->
<span class="visually-hidden">Game Row 1, Top of Peaks</span>
<template x-for="(card, index) in cardsBySlice(0, 3)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-0-${index}`"
></div>
</template>
<!-- second row (index 1, row 2) -->
<span class="visually-hidden">Game Row 2, Second Row</span>
<template x-for="(card, index) in cardsBySlice(3, 9)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-1-${index}`"
></div>
</template>
<!-- third row (index 2, row 3) -->
<span class="visually-hidden">Game Row 3, Third Row</span>
<template x-for="(card, index) in cardsBySlice(9, 18)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-2-${index}`"
></div>
</template>
<!-- last/bottom row (index 3, row 4) -->
<span class="visually-hidden">Game Row 4, Base of Peaks</span>
<template x-for="(card, index) in cardsBySlice(18, 28)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-3-${index}`"
></div>
</template>
<!-- stock cards -->
<span class="visually-hidden">Game Stock, the Draw Cards</span>
<template x-for="(card, index) in cardsBySlice(28, 52)">
<div
x-html="card === 0 || card === '0' ? cardSvgs['2B'] : cardSvgs[card]"
:class="`game-pyramid-card game-pyramid-card-4-${index}`"
></div>
</template>
</div>
</div>
<!-- Display of solvingprogress or solution -->
<div id="gameSolving" x-data="gameSolving" x-init="onInit()">
<div class="d-flex justify-content-start">
<div <div
class="spinner-border me-2" id="playingCardsPreview"
role="status" x-data="playingCardsPreview"
x-show="$store.global.solvingInProgress" class="mb-4"
></div> >
<h3 @solve-game.window="startSolver()" x-text="headerText"></h3> <div
id="gamePyramid"
class="game-pyramid-container p-2 p-md-3 p-lg-4"
>
<!-- first/top row (index 0, row 1) -->
<span class="visually-hidden">Game Row 1, Top of Peaks</span>
<template x-for="(card, index) in cardsBySlice(0, 3)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-0-${index}`"
></div>
</template>
<!-- second row (index 1, row 2) -->
<span class="visually-hidden">Game Row 2, Second Row</span>
<template x-for="(card, index) in cardsBySlice(3, 9)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-1-${index}`"
></div>
</template>
<!-- third row (index 2, row 3) -->
<span class="visually-hidden">Game Row 3, Third Row</span>
<template x-for="(card, index) in cardsBySlice(9, 18)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-2-${index}`"
></div>
</template>
<!-- last/bottom row (index 3, row 4) -->
<span class="visually-hidden">Game Row 4, Base of Peaks</span>
<template x-for="(card, index) in cardsBySlice(18, 28)">
<div
x-html="cardSvg(card)"
:class="`game-pyramid-card game-pyramid-card-3-${index}`"
></div>
</template>
<!-- stock cards -->
<span class="visually-hidden">Game Stock, the Draw Cards</span>
<template x-for="(card, index) in cardsBySlice(28, 52)">
<div
x-html="card === 0 || card === '0' ? cardSvgs['2B'] : cardSvgs[card]"
:class="`game-pyramid-card game-pyramid-card-4-${index}`"
></div>
</template>
</div>
</div>
</div> </div>
<ul x-show="$store.global.solvingInProgress">
<template x-for="msg in statusMessages">
<li x-text="msg"></li>
</template>
</ul>
<!-- <p x-show="" x-text="statusMessage"></p> --> <div class="col-12 col-lg-3 col-xl-4">
<!-- Display of solvingprogress or solution -->
<div id="gameSolving" x-data="gameSolving" x-init="onInit()">
<div class="d-flex justify-content-start">
<div
class="spinner-border me-2"
role="status"
x-show="$store.global.solvingInProgress"
></div>
<h3 @solve-game.window="startSolver()" x-text="headerText"></h3>
</div>
<ul x-show="$store.global.solvingInProgress">
<template x-for="msg in statusMessages">
<li x-text="msg"></li>
</template>
</ul>
<!-- <p x-show="" x-text="statusMessage"></p> -->
<ol x-show="solutionMoves.length > 0">
<template x-for="move in solutionMoves">
<li x-text="move"></li>
</template>
</ol>
</div>
</div>
<ol x-show="solutionMoves.length > 0">
<template x-for="move in solutionMoves">
<li x-text="move"></li>
</template>
</ol>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

View file

@ -1,5 +1,6 @@
import "./style.scss"; import "./style.scss";
//import 'bootstrap'; //import 'bootstrap';
import './node_modules/bootstrap/js/src/collapse';
import Alpine from "alpinejs"; import Alpine from "alpinejs";
import cardSvgs from "./cardSvgs"; import cardSvgs from "./cardSvgs";
import SolverWorker from "./solverWorker?worker"; import SolverWorker from "./solverWorker?worker";
@ -225,7 +226,7 @@ const encouragements = [
Alpine.data("gameSolving", () => ({ Alpine.data("gameSolving", () => ({
encouragements, encouragements,
solverWorker: null, solverWorker: null,
headerText: "", headerText: "Solution will go here:",
moveCount: 23, moveCount: 23,
statusMessages: [], statusMessages: [],
solutionMoves: [], solutionMoves: [],

6
vite.config.js Normal file
View file

@ -0,0 +1,6 @@
import { defineConfig } from 'vite'
export default defineConfig({
// ...
base: './'
})