Merge remote-tracking branch 'origin/master' into van/somnia/deploy

nguyentvan7 · Aug 3, 2024 · 5332486 · 5332486
2 parents 8481770 + 00e5eb2
commit 5332486
Show file tree

Hide file tree

Showing 210 changed files with 2,044 additions and 187 deletions.
diff --git a/.github/workflows/build-go-next-pr.yml b/.github/workflows/build-go-next-pr.yml
@@ -7,8 +7,13 @@ permissions:
 on:
   pull_request:
     paths-ignore:
+      - 'apps/frontend/**'
+      - 'apps/frontend-e2e/**'
+      - 'apps/somnia/**'
+      - 'apps/somnia-e2e/**'
       - 'apps/sr-frontend/**'
       - 'apps/sr-frontend-e2e/**'
+      - 'libs/gi/i18n-node/**'
       - 'libs/sr/**'
     types: [opened, reopened, synchronize, labeled]
 

diff --git a/.github/workflows/build-go-wr-pr.yml b/.github/workflows/build-go-wr-pr.yml
@@ -7,10 +7,13 @@ permissions:
 on:
   pull_request:
     paths-ignore:
+      - 'apps/somnia/**'
+      - 'apps/somnia-e2e/**'
       - 'apps/sr-frontend/**'
       - 'apps/sr-frontend-e2e/**'
       - 'libs/gi/formula/**'
       - 'libs/gi/formula-ui/**'
+      - 'libs/gi/i18n-node/**'
       - 'libs/pando/**'
       - 'libs/sr/**'
     types: [opened, reopened, synchronize, labeled]

diff --git a/.github/workflows/build-sro-pr.yml b/.github/workflows/build-sro-pr.yml
@@ -9,6 +9,8 @@ on:
     paths-ignore:
       - 'apps/frontend/**'
       - 'apps/frontend-e2e/**'
+      - 'apps/somnia/**'
+      - 'apps/somnia-e2e/**'
       - 'libs/gi/**'
     types: [opened, reopened, synchronize, labeled]
 

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ The dependencies to the apps are in [/libs](/libs/)
 
 [`gi-frontend`](/apps/gi-frontend/) - WIP GO frontend - website built using NextJS, MUI, supabase, using the Pando calculation engine.
 
-`somnia-bot` - WIP discord bot - built using discord.js, using the Pando Calculation engine.
+[`somnia-bot`](/apps/somnia/) - WIP discord bot - built using discord.js, using the Pando Calculation engine.
 
 ### Notable Libs
 

diff --git a/apps/frontend-e2e/.eslintrc.json b/apps/frontend-e2e/.eslintrc.json
@@ -1,6 +1,9 @@
 {
   "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": "tsconfig.eslint.json"
+  },
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

diff --git a/apps/frontend-e2e/tsconfig.eslint.json b/apps/frontend-e2e/tsconfig.eslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"]
+}
diff --git a/apps/frontend/.eslintrc.json b/apps/frontend/.eslintrc.json
@@ -1,6 +1,9 @@
 {
   "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": "tsconfig.eslint.json"
+  },
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

diff --git a/apps/frontend/tsconfig.eslint.json b/apps/frontend/tsconfig.eslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"]
+}
diff --git a/apps/gi-frontend-e2e/.eslintrc.json b/apps/gi-frontend-e2e/.eslintrc.json
@@ -1,6 +1,9 @@
 {
   "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
+  "parserOptions": {
+    "project": "tsconfig.eslint.json"
+  },
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

diff --git a/apps/gi-frontend-e2e/tsconfig.eslint.json b/apps/gi-frontend-e2e/tsconfig.eslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"]
+}
diff --git a/apps/gi-frontend/.eslintrc.json b/apps/gi-frontend/.eslintrc.json
@@ -6,6 +6,9 @@
     "../../.eslintrc.json"
   ],
   "ignorePatterns": ["!**/*", ".next/**/*"],
+  "parserOptions": {
+    "project": "tsconfig.eslint.json"
+  },
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

diff --git a/apps/gi-frontend/src/app/teams/[teamId]/CalcWrapper.tsx b/apps/gi-frontend/src/app/teams/[teamId]/CalcWrapper.tsx
@@ -3,16 +3,18 @@ import type { TagMapNodeEntries } from '@genshin-optimizer/gi/formula'
 import {
   artifactsData,
   charData,
+  enemyDebuff,
   genshinCalculatorWithEntries,
+  self,
   teamData,
   weaponData,
   withMember,
 } from '@genshin-optimizer/gi/formula'
 import type { IWeapon } from '@genshin-optimizer/gi/good'
 import { getMainStatValue } from '@genshin-optimizer/gi/util'
+import { CalcContext } from '@genshin-optimizer/pando/ui-sheet'
 import type { ReactNode } from 'react'
 import { useContext, useMemo } from 'react'
-import { CalcContext } from './CalcContext'
 import { TeamContext } from './TeamContext'
 import { TeamLoadoutCharacterToICharacter } from './teamUtil'
 
@@ -66,6 +68,11 @@ export function CalcWrapper({ children }: { children: ReactNode }) {
         .filter(notEmpty),
       // TODO: conditonals
       // TODO: enemyDebuff
+      enemyDebuff.reaction.cata.add('spread'),
+      enemyDebuff.reaction.amp.add(''),
+      enemyDebuff.common.lvl.add(12),
+      enemyDebuff.common.preRes.add(0.1),
+      self.common.critMode.add('avg'),
     ]
     const calc = genshinCalculatorWithEntries(data)
     return calc