Merge branch 'faris/cypress-pipeline' of https://github.com/acmucsd/m…

…embership-portal-ui-v2 into faris/cypress-pipeline

.env.example

@@ -1 +1,3 @@
-NEXT_PUBLIC_ACM_API_URL="https://api.acmucsd.com/api/v2"
+NEXT_PUBLIC_ACM_API_URL="https://api.acmucsd.com/api/v2"
+NEXT_PUBLIC_KLEFKI_API_URL=""
+NEXT_PUBLIC_TOTP_KEY=""

.eslintrc.json

@@ -1,22 +1,10 @@
 {
   "parser": "@typescript-eslint/parser",
-  "extends": [
-    "airbnb",
-    "prettier",
-    "next",
-    "next/core-web-vitals",
-    "plugin:cypress/recommended"
-  ],
-  "plugins": [
-    "prettier",
-    "node",
-    "@typescript-eslint",
-    "import",
-    "jsdoc"
-  ],
+  "extends": ["airbnb", "prettier", "next", "next/core-web-vitals", "plugin:cypress/recommended"],
+  "plugins": ["prettier", "node", "@typescript-eslint", "import", "jsdoc"],
   "rules": {
     "prettier/prettier": "error",
-    "no-unused-vars": "warn",
+    "@typescript-eslint/no-unused-vars": ["warn", { "varsIgnorePattern": "^_$" }],
     "no-console": "error",
     "func-names": "off",
     "no-process-exit": "off",
@@ -27,38 +15,28 @@
     "import/extensions": "off",
     "no-shadow": "off",
     "react/require-default-props": "off",
+    "jsx-a11y/control-has-associated-label": "off",
+    "jsx-a11y/label-has-associated-control": [2, { "assert": "either" }],
     "jsx-a11y/anchor-is-valid": [
       "error",
       {
-        "components": [
-          "Link"
-        ],
-        "specialLink": [
-          "to"
-        ]
+        "components": ["Link"],
+        "specialLink": ["to"]
       }
     ],
     "react/jsx-filename-extension": [
       2,
       {
-        "extensions": [
-          ".js",
-          ".jsx",
-          ".ts",
-          ".tsx"
-        ]
+        "extensions": [".js", ".jsx", ".ts", ".tsx"]
       }
     ],
     "react/function-component-definition": [
       2,
       {
-        "namedComponents": [
-          "arrow-function",
-          "function-declaration"
-        ],
+        "namedComponents": ["arrow-function", "function-declaration"],
         "unnamedComponents": "arrow-function"
       }
     ]
   },
   "ignorePatterns": "src/**/*.d.ts"
-}
+}

.github/CODEOWNERS

@@ -1 +1 @@
-- @farisashai
+* @farisashai @raymosun @trevorkw7 @sheeptester @alexzhang1618

next.config.js

@@ -1,10 +1,27 @@
+const env = process.env.NODE_ENV;
+const isDevelopment = env !== 'production';
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   eslint: {
     dirs: ['.'],
   },
+  i18n: {
+    locales: ['en'],
+    defaultLocale: 'en',
+  },
   images: {
-    domains: ['acmucsd.s3.us-west-1.amazonaws.com'],
+    domains: [
+      'acmucsd.s3-us-west-1.amazonaws.com',
+      'acmucsd.s3.us-west-1.amazonaws.com',
+      // This one's for Sumeet Bansal
+      'acmucsd.s3-us-west-1.amazonaws.com',
+      'acmucsd-membership-portal.s3.us-west-1.amazonaws.com',
+      // The dev backend test data uses image URLs outside the allowlist
+      ...(isDevelopment
+        ? ['i.imgur.com', 'i.pinimg.com', 'i.etsystatic.com', 'www.google.com']
+        : []),
+    ],
   },
   poweredByHeader: false,
   trailingSlash: false,

package.json

@@ -14,12 +14,12 @@
     "lint:css": "stylelint \"**/*.scss\"",
     "lint": "yarn lint:js && yarn lint:css",
     "lint:fix": "yarn prettier && eslint --fix \"src/**/*.+(js|jsx|ts|tsx)\" && stylelint --fix \"**/*.scss\"",
-    "type-css": "yarn typed-scss-modules src/ --exportType default",
+    "type-css": "yarn typed-scss-modules src/ --exportType default --logLevel silent --watch",
     "dev": "next dev",
     "run": "yarn type-css & yarn lint && next dev",
     "build": "next build",
     "start": "next start",
-    "prod": "yarn type-css && yarn lint && next build && next start",
+    "prod": "next build && next start",
     "test": "yarn cypress run",
     "test:ui": "yarn cypress open"
   },
@@ -29,11 +29,12 @@
     "@mui/material": "^5.11.6",
     "@next/env": "^13.2.4",
     "@svgr/webpack": "^6.5.1",
-    "axios": "^1.1.3",
+    "axios": "^1.6.0",
     "axios-middleware": "^0.3.1",
     "cookies-next": "^2.1.1",
-    "cypress": "^12.9.0",
-    "lodash": "^4.17.21",
+    "cypress": "^13.2.0",
+    "ics": "^3.7.2",
+    "luxon": "^3.3.0",
     "next": "^13.2.5-canary.30",
     "next-themes": "^0.2.1",
     "react": "18.2.0",
@@ -42,12 +43,15 @@
     "react-icons": "^4.4.0",
     "react-toastify": "^9.0.8",
     "sass": "^1.55.0",
-    "sharp": "^0.31.3",
+    "sharp": "^0.32.6",
+    "totp-generator": "^0.0.14",
     "typescript": "^4.8.4",
     "validator": "^13.9.0"
   },
   "devDependencies": {
+    "@types/totp-generator": "^0.0.5",
     "@types/lodash": "^4.14.191",
+    "@types/luxon": "^3.3.0",
     "@types/node": "18.8.1",
     "@types/react": "18.0.21",
     "@types/validator": "^13.7.14",
@@ -63,9 +67,10 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
+    "postcss": "^8.4.31",
     "prettier": "^2.7.1",
-    "stylelint": "^14.13.0",
-    "stylelint-config-sass-guidelines": "^9.0.1",
+    "stylelint": "^15.10.1",
+    "stylelint-config-sass-guidelines": "^10.0.0",
     "stylelint-order": "^5.0.0",
     "typed-scss-modules": "^7.0.2"
   }