diff --git a/package-lock.json b/package-lock.json index f5e295a..4320e51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gate-prep", - "version": "0.10.6", + "version": "0.10.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "gate-prep", - "version": "0.10.6", + "version": "0.10.7", "dependencies": { "@base-ui/react": "^1.2.0", "@nivo/calendar": "^0.99.0", @@ -69,7 +69,7 @@ "postcss": "^8.5.6", "prettier": "^3.6.2", "prettier-plugin-tailwindcss": "^0.6.14", - "supabase": "^2.40.7", + "supabase": "^2.95.6", "tailwindcss": "^4.1.12", "tw-animate-css": "^1.4.0", "typescript": "^5.9.2", @@ -191,6 +191,7 @@ "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", @@ -1856,6 +1857,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -1899,6 +1901,7 @@ } ], "license": "MIT", + "peer": true, "engines": { "node": ">=18" } @@ -5044,6 +5047,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -5139,6 +5143,7 @@ "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.86.2.tgz", "integrity": "sha512-KXoiqFf7zZhL/+lj7oBFFUvVDQ6gy03v9wQ5E++f7xiJUuqmI4DuBhrv8uFo6B2EGTQTA3vkXjbxmYIug/zfWw==", "license": "MIT", + "peer": true, "dependencies": { "@supabase/auth-js": "2.86.2", "@supabase/functions-js": "2.86.2", @@ -5466,6 +5471,7 @@ "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -5761,6 +5767,7 @@ "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz", "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==", "license": "MIT", + "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -5771,6 +5778,7 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "devOptional": true, "license": "MIT", + "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -5866,6 +5874,7 @@ "integrity": "sha512-jCNyAuXx8dr5KJMkecGmZ8KI61KBUhkCob+SD+C+I5+Y1FWI2Y3QmY4/cxMCC5WAsZqoEtEETVhUiUMIGCf6Bw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.40.0", "@typescript-eslint/types": "8.40.0", @@ -6284,6 +6293,7 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "devOptional": true, "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -6660,6 +6670,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001726", "electron-to-chromium": "^1.5.173", @@ -7853,6 +7864,7 @@ "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", @@ -11463,6 +11475,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -11509,6 +11522,7 @@ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -11678,6 +11692,7 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -11897,6 +11912,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz", "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -11906,6 +11922,7 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz", "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==", "license": "MIT", + "peer": true, "dependencies": { "scheduler": "^0.26.0" }, @@ -11917,7 +11934,8 @@ "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/react-katex": { "version": "3.1.0", @@ -11970,6 +11988,7 @@ "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz", "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==", "license": "MIT", + "peer": true, "dependencies": { "@types/use-sync-external-store": "^0.0.6", "use-sync-external-store": "^1.4.0" @@ -12173,7 +12192,8 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz", "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/redux-thunk": { "version": "3.1.0", @@ -12428,6 +12448,7 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.43.0.tgz", "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==", "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.7" }, @@ -13114,17 +13135,17 @@ } }, "node_modules/supabase": { - "version": "2.76.15", - "resolved": "https://registry.npmjs.org/supabase/-/supabase-2.76.15.tgz", - "integrity": "sha512-m69o1XPAzZaIWfQiEeT+KY/Ci3OSA663RyoH9xECbXSxhr7dsipLCpCqT1E4MCob0mMhHh/7A+Eltx4y1qSwiQ==", + "version": "2.95.6", + "resolved": "https://registry.npmjs.org/supabase/-/supabase-2.95.6.tgz", + "integrity": "sha512-gjAT6wYBvmKoS34IjpTp9VDve1sfwcM/s+Q5rJA3OBw8d6nVTdA8edYVz/rfPEMt1V/EY40g63IL6qMBLPvrFw==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { "bin-links": "^6.0.0", - "https-proxy-agent": "^7.0.2", + "https-proxy-agent": "^9.0.0", "node-fetch": "^3.3.2", - "tar": "7.5.9" + "tar": "7.5.13" }, "bin": { "supabase": "bin/supabase" @@ -13133,6 +13154,30 @@ "npm": ">=8" } }, + "node_modules/supabase/node_modules/agent-base": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-9.0.0.tgz", + "integrity": "sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20" + } + }, + "node_modules/supabase/node_modules/https-proxy-agent": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-9.0.0.tgz", + "integrity": "sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "9.0.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 20" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13187,7 +13232,8 @@ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.12.tgz", "integrity": "sha512-DzFtxOi+7NsFf7DBtI3BJsynR+0Yp6etH+nRPTbpWnS2pZBaSksv/JGctNwSWzbFjp0vxSqknaUylseZqMDGrA==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/tapable": { "version": "2.2.2", @@ -13199,9 +13245,9 @@ } }, "node_modules/tar": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", - "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", + "version": "7.5.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz", + "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -13549,6 +13595,7 @@ "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -13932,6 +13979,7 @@ "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", @@ -14463,6 +14511,7 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -14530,6 +14579,7 @@ "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "dev": true, "license": "MIT", + "peer": true, "bin": { "rollup": "dist/bin/rollup" }, diff --git a/package.json b/package.json index 7119cea..a2f7025 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "postcss": "^8.5.6", "prettier": "^3.6.2", "prettier-plugin-tailwindcss": "^0.6.14", - "supabase": "^2.40.7", + "supabase": "^2.95.6", "tailwindcss": "^4.1.12", "tw-animate-css": "^1.4.0", "typescript": "^5.9.2", diff --git a/src/features/landing/pages/LandingPage.tsx b/src/features/landing/pages/LandingPage.tsx index 3dfd7f4..8bb933c 100644 --- a/src/features/landing/pages/LandingPage.tsx +++ b/src/features/landing/pages/LandingPage.tsx @@ -144,19 +144,17 @@ const AppMockup = () => {
{option === '256' && (
diff --git a/src/features/practice/components/PracticeCard.tsx b/src/features/practice/components/PracticeCard.tsx index 1dfc337..08350cf 100644 --- a/src/features/practice/components/PracticeCard.tsx +++ b/src/features/practice/components/PracticeCard.tsx @@ -129,14 +129,26 @@ const PracticeCard = () => { }; // Keyboard Shortcuts + const hasSelection = selectedOptionIndices.length > 0 || numericalAnswer !== null; + useKeyboardShortcuts( { onPrev: handlePrevious, onNext: handleNext, onShowAnswer: handleShowAnswer, + onSubmit: handleSubmit, onExplain: () => onExplanationClick(), + hasSelection, }, - [safeQuestion], + [ + safeQuestion, + hasSelection, + handleShowAnswer, + handleSubmit, + handleNext, + handlePrevious, + onExplanationClick, + ], ); // 7. Side Effects: Audio Handling diff --git a/src/features/questions/components/QuestionCard/ActionButtons.tsx b/src/features/questions/components/QuestionCard/ActionButtons.tsx index bc20a53..b5db5a4 100644 --- a/src/features/questions/components/QuestionCard/ActionButtons.tsx +++ b/src/features/questions/components/QuestionCard/ActionButtons.tsx @@ -11,6 +11,7 @@ type ActionButtonsProps = { handleSubmit?: (() => void) | undefined; handleExplainationClick: () => void; isCompatible: boolean | undefined; + hasSelection?: boolean; }; const ActionButtons = ({ @@ -23,6 +24,7 @@ const ActionButtons = ({ handleSubmit, handleExplainationClick, isCompatible, + hasSelection, }: ActionButtonsProps) => { return (
@@ -56,7 +58,7 @@ const ActionButtons = ({ > - Submit [⎵/↵] + Submit {hasSelection && [⎵/↵]} diff --git a/src/features/questions/components/QuestionCard/QuestionCard.tsx b/src/features/questions/components/QuestionCard/QuestionCard.tsx index 6121d22..fa52429 100644 --- a/src/features/questions/components/QuestionCard/QuestionCard.tsx +++ b/src/features/questions/components/QuestionCard/QuestionCard.tsx @@ -202,7 +202,11 @@ const QuestionCard = ({ onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); - onShowAnswer(); + if (handleSubmit) { + handleSubmit(); + } else if (onShowAnswer) { + onShowAnswer(); + } } }} placeholder="Enter your answer" @@ -251,6 +255,7 @@ const QuestionCard = ({ handleSubmit={handleSubmit} handleExplainationClick={onExplanationClick} isCompatible={isCompatible} + hasSelection={selectedOptionIndices.length > 0 || numericalAnswer !== null} />
diff --git a/src/features/smart-revision/components/SmartRevisionQuestionCard.tsx b/src/features/smart-revision/components/SmartRevisionQuestionCard.tsx index 0294463..ffd67d6 100644 --- a/src/features/smart-revision/components/SmartRevisionQuestionCard.tsx +++ b/src/features/smart-revision/components/SmartRevisionQuestionCard.tsx @@ -118,14 +118,26 @@ const SmartRevisionQuestionCard = () => { }; // Keyboard Shortcuts + const hasSelection = selectedOptionIndices.length > 0 || numericalAnswer !== null; + useKeyboardShortcuts( { onPrev: handlePrevious, onNext: handleNext, onShowAnswer: handleShowAnswer, + onSubmit: handleSubmit, onExplain: () => onExplanationClick(), + hasSelection, }, - [safeQuestion], + [ + safeQuestion, + hasSelection, + handleShowAnswer, + handleSubmit, + handleNext, + handlePrevious, + onExplanationClick, + ], ); // 7. Side Effects: Audio Handling diff --git a/src/shared/hooks/useKeyboardShortcuts.ts b/src/shared/hooks/useKeyboardShortcuts.ts index f9a81ff..3f0b5a1 100644 --- a/src/shared/hooks/useKeyboardShortcuts.ts +++ b/src/shared/hooks/useKeyboardShortcuts.ts @@ -16,10 +16,12 @@ type useKeyboardShortcutsProps = { onPrev: () => void; onNext: () => void; onShowAnswer: () => void; + onSubmit?: () => void; onExplain?: () => void; + hasSelection?: boolean; }; export default function useKeyboardShortcuts( - { onPrev, onNext, onShowAnswer, onExplain }: useKeyboardShortcutsProps, + { onPrev, onNext, onShowAnswer, onSubmit, onExplain, hasSelection }: useKeyboardShortcutsProps, deps: DependencyList = [], // Dependencies for the useEffect hook, passed from the calling component. ) { const getOptionCodeFromKey = (code: string) => { @@ -78,7 +80,11 @@ export default function useKeyboardShortcuts( case 'Enter': // 'Enter' to submit/show answer case 'Space': e.preventDefault(); - onShowAnswer?.(); + if (hasSelection && onSubmit) { + onSubmit(); + } else { + onShowAnswer?.(); + } break; case 'Slash': // 'E' for explanation e.preventDefault();