Merge branch 'main' into 46-jobs-page

# Conflicts: # src/theme/theme.ts
WomenInSoftwareEngineeringJP · Sep 1, 2024 · 58aef4c · 58aef4c
2 parents b8aa681 + 6710a86
commit 58aef4c
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 332 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -15,7 +15,7 @@ module.exports = {
     },
     plugins: [
         'react-refresh',
-        '@stylistic/ts'
+        '@stylistic'
     ],
     rules: {
         'react-refresh/only-export-components': [
@@ -26,8 +26,12 @@ module.exports = {
         'quotes': ['error', 'single'],
         '@typescript-eslint/prefer-nullish-coalescing': 'off',
         '@typescript-eslint/no-unsafe-call': ['off'],
-        '@stylistic/ts/indent': ['error', 4],
-        '@stylistic/ts/semi': ['error', 'never'],
+        '@stylistic/indent': ['error', 4],
+        '@stylistic/semi': ['error', 'never'],
+        '@stylistic/no-multi-spaces': 'error',
+        '@stylistic/no-trailing-spaces': 'error',
+        '@stylistic/no-mixed-spaces-and-tabs': 'error',
+        '@typescript-eslint/no-explicit-any': 'error',
     },
     settings: {
         react: {

diff --git a/e2e/team.spec.ts b/e2e/team.spec.ts
@@ -1,7 +1,7 @@
 import { test, expect, Locator } from '@playwright/test'
 
 /** Verifies visibility of the name, title, and photo
- * 
+ *
  * @param card The Locator for the TeamMember Card
  * @param name The name to find
  * @param title The title to find, if defined