lingdocs
/
pashto-grammar
mirror of https://github.com/lingdocs/pashto-grammar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

u

This commit is contained in:
lingdocs 2022-05-30 14:16:48 -05:00
parent 7490220d47
commit 6c77675975
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -6,7 +6,7 @@
"@formkit/auto-animate": "^1.0.0-beta.1", "@formkit/auto-animate": "^1.0.0-beta.1",
"@fortawesome/fontawesome-free": "^5.15.4", "@fortawesome/fontawesome-free": "^5.15.4",
"@lingdocs/lingdocs-main": "^0.3.1", "@lingdocs/lingdocs-main": "^0.3.1",
"@lingdocs/pashto-inflector": "^2.6.6", "@lingdocs/pashto-inflector": "^2.6.7",
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",

13
src/games/GameCore.tsx
View File

@ -22,6 +22,8 @@ import ReactGA from "react-ga";
import { isProd } from "../lib/isProd"; import { isProd } from "../lib/isProd";
const errorVibration = 200; const errorVibration = 200;
const maxStrikes = 2;
function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, id }:{ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, id }:{
id: string, id: string,
studyLink: string, studyLink: string,
@ -34,6 +36,8 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
const rewardRef = useRef<RewardElement | null>(null); const rewardRef = useRef<RewardElement | null>(null);
const { user, pullUser, setUser } = useUser(); const { user, pullUser, setUser } = useUser();
const [finish, setFinish] = useState<undefined | "pass" | { msg: "fail", answer: JSX.Element } | "time out">(undefined); const [finish, setFinish] = useState<undefined | "pass" | { msg: "fail", answer: JSX.Element } | "time out">(undefined);
const [strikes, setStrikes] = useState<number>(0);
const [justStruck, setJustStruck] = useState<boolean>(false);
const [current, setCurrent] = useState<Current<T> | undefined>(undefined); const [current, setCurrent] = useState<Current<T> | undefined>(undefined);
const [questionBox, setQuestionBox] = useState<QuestionGenerator<T>>(questions()); const [questionBox, setQuestionBox] = useState<QuestionGenerator<T>>(questions());
const [timerKey, setTimerKey] = useState<number>(1); const [timerKey, setTimerKey] = useState<number>(1);
@ -50,13 +54,18 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
function handleCallback(correct: true | JSX.Element) { function handleCallback(correct: true | JSX.Element) {
if (correct === true) handleAdvance(); if (correct === true) handleAdvance();
else { else if (strikes < maxStrikes) {
navigator.vibrate(errorVibration);
setStrikes(s => s + 1);
setJustStruck(false);
} else {
logGameEvent("fail on game"); logGameEvent("fail on game");
setFinish({ msg: "fail", answer: correct }); setFinish({ msg: "fail", answer: correct });
navigator.vibrate(errorVibration); navigator.vibrate(errorVibration);
} }
} }
function handleAdvance() { function handleAdvance() {
setJustStruck(false);
const next = questionBox.next(); const next = questionBox.next();
if (next.done) handleFinish(); if (next.done) handleFinish();
else setCurrent(next.value); else setCurrent(next.value);
@ -130,6 +139,7 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
<div className="progress" style={{ height: "5px" }}> <div className="progress" style={{ height: "5px" }}>
<div className={`progress-bar bg-${progressColor}`} role="progressbar" style={{ width: getProgressWidth() }} /> <div className={`progress-bar bg-${progressColor}`} role="progressbar" style={{ width: getProgressWidth() }} />
</div> </div>
<div>Strikes: {strikes}</div>
{current && <div className="d-flex flex-row-reverse mt-2"> {current && <div className="d-flex flex-row-reverse mt-2">
<CountdownCircleTimer <CountdownCircleTimer
key={timerKey} key={timerKey}
@ -144,6 +154,7 @@ function GameCore<T>({ questions, Display, timeLimit, Instructions, studyLink, i
/> />
<button onClick={handleQuit} className="btn btn-outline-secondary btn-sm mr-2">Quit</button> <button onClick={handleQuit} className="btn btn-outline-secondary btn-sm mr-2">Quit</button>
</div>} </div>}
<div>OOPS, NOT QUITE - TRY AGAIN</div>
<Reward ref={rewardRef} config={{ lifetime: 130, spread: 90, elementCount: 150, zIndex: 999999999 }} type="confetti"> <Reward ref={rewardRef} config={{ lifetime: 130, spread: 90, elementCount: 150, zIndex: 999999999 }} type="confetti">
<div> <div>
{finish === undefined && {finish === undefined &&