Added more tests and husky

Author: coder13

.husky/pre-commit

@@ -0,0 +1,2 @@
+prettier $(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g') --write --ignore-unknown
+git update-index --again

.husky/pre-push

@@ -0,0 +1 @@
+yarn lint && yarn check:type && yarn test

package.json

@@ -8,40 +8,28 @@
     "test": "jest",
     "lint": "eslint ./src/",
     "check:type": "tsc --noEmit",
-    "serve": "vite preview"
+    "serve": "vite preview",
+    "prepare": "husky"
   },
   "dependencies": {
     "@apollo/client": "^3.8.7",
     "@cubing/icons": "^1.0.6",
-    "@eslint/js": "^9.26.0",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@tanstack/query-sync-storage-persister": "^5.48.0",
     "@tanstack/react-query": "^5.48.0",
     "@tanstack/react-query-persist-client": "^5.48.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^14.4.3",
     "@total-typescript/ts-reset": "^0.3.7",
-    "@types/jest": "^29.1.2",
-    "@types/node": "^18.8.3",
-    "@types/react": "^18.0.21",
-    "@types/react-dom": "^18.0.6",
-    "@types/styled-components": "^5.1.26",
     "@uidotdev/usehooks": "^2.4.1",
-    "@vitejs/plugin-react": "^4.0.3",
     "@wca/helpers": "^1.1.5",
     "classnames": "^2.3.2",
     "country-flag-icons": "^1.5.4",
     "date-fns": "^2.30.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.0",
     "graphql": "^16.8.1",
     "graphql-ws": "^5.14.2",
     "history": "^5.3.0",
     "i18n-js": "^4.5.1",
     "i18next": "^25.1.2",
-    "jest": "^29.7.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.flatten": "^4.4.0",
     "react": "^18.2.0",
@@ -59,9 +47,7 @@
     "react-tiny-popover": "^8.0.4",
     "styled-components": "^5.3.5",
     "tailwindcss": "^3.3.5",
-    "temporal-polyfill": "^0.3.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
     "vite": "^4.4.3",
     "vite-plugin-pwa": "^0.16.4",
     "vite-plugin-svgr": "^4.1.0",
@@ -71,22 +57,37 @@
   "devDependencies": {
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
+    "@eslint/js": "^9.26.0",
     "@modyfi/vite-plugin-yaml": "^1.1.1",
     "@tanstack/eslint-plugin-query": "^5.47.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^14.4.3",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
+    "@types/jest": "^29.1.2",
+    "@types/node": "^18.8.3",
+    "@types/react": "^18.0.21",
+    "@types/react-dom": "^18.0.6",
+    "@types/styled-components": "^5.1.26",
+    "@vitejs/plugin-react": "^4.0.3",
     "autoprefixer": "^10.4.7",
     "babel-jest": "^29.7.0",
     "eslint": "^9.26.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-prettier": "^5.4.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
+    "husky": "^9.1.7",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "postcss": "^8.4.14",
     "prettier": "^3.5.3",
     "prettier-plugin-organize-imports": "^4.1.0",
     "react-test-renderer": "^19.1.0",
     "surge": "^0.23.1",
     "ts-jest": "^29.3.4",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "typescript-eslint": "^8.32.1"
   },
   "browserslist": {
     "production": [

src/App.tsx

@@ -2,7 +2,7 @@ import { ApolloProvider } from '@apollo/client';
 import { useEffect } from 'react';
 import { BrowserRouter, Routes, Route, Navigate, useParams, useNavigate } from 'react-router-dom';
 import client from './apolloClient';
-import usePageTracking from './hooks/usePageTracking';
+import { usePageTracking } from './hooks/usePageTracking';
 import { CompetitionLayout } from './layouts/CompetitionLayout';
 import { RootLayout } from './layouts/RootLayout';
 import About from './pages/About';

src/components/AssignmentLabel/__snapshots__/AssignmentLabel.test.tsx.snap

@@ -12,18 +12,6 @@ exports[`components/AssignmentLabel should render correctly when assignmentCode
 </body>
 `;
 
-exports[`components/AssignmentLabel should render correctly when assignmentCode is "non-standard" 1`] = `
-<body>
-  <div>
-    <span
-      class="bg-cyan-200 px-[6px] py-[4px] rounded-md bg-blue-100"
-    >
-      dataentry
-    </span>
-  </div>
-</body>
-`;
-
 exports[`components/AssignmentLabel should render correctly when assignmentCode is "staff-announcer" 1`] = `
 <body>
   <div>
@@ -119,15 +107,3 @@ exports[`components/AssignmentLabel should render correctly when assignmentCode
   </div>
 </body>
 `;
-
-exports[`components/AssignmentLabel should render correctly when assignmentCode is non-standard 1`] = `
-<body>
-  <div>
-    <span
-      class="bg-cyan-200 px-[6px] py-[4px] rounded-md bg-blue-100"
-    >
-      dataentry
-    </span>
-  </div>
-</body>
-`;

src/containers/LiveActivities/LiveActivities.tsx

@@ -2,7 +2,7 @@ import { formatDuration, intervalToDuration } from 'date-fns';
 import { Fragment } from 'react';
 import { Link } from 'react-router-dom';
 import { AssignmentCodeCell } from '@/components/AssignmentCodeCell';
-import { useNow } from '@/hooks/useNow';
+import { useNow } from '@/hooks/useNow/useNow';
 import { useOngoingActivities } from '@/hooks/useOngoingActivities';
 import { getAllChildActivities, getAllRoundActivities, getRooms } from '@/lib/activities';
 import { formatTime } from '@/lib/time';

src/containers/PersonalSchedule/Assignments.tsx

@@ -2,7 +2,7 @@ import { Competition, Person } from '@wca/helpers';
 import { Fragment, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollapse } from '@/hooks/UseCollapse';
-import { useNow } from '@/hooks/useNow';
+import { useNow } from '@/hooks/useNow/useNow';
 import { parseActivityCodeFlexible } from '@/lib/activityCodes';
 import { isActivityWithRoomOrParent } from '@/lib/typeguards';
 import { byDate, roundTime } from '@/lib/utils';

src/hooks/useNow/index.ts

@@ -0,0 +1 @@
+export * from './useNow';

src/hooks/useNow.ts src/hooks/useNow/useNow.tssrc/hooks/useNow.ts renamed to src/hooks/useNow/useNow.ts

@@ -0,0 +1 @@
+export * from './useOngoingActivities';