diff --git a/.github/workflows/main.yaml b/.github/workflows/on-push.yaml similarity index 80% rename from .github/workflows/main.yaml rename to .github/workflows/on-push.yaml index c010ea9..91dd2b5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/on-push.yaml @@ -14,6 +14,14 @@ jobs: - name: "API UnitTests" run: docker run --rm -e TABEL_KEY="${{ secrets.TABEL_KEY }}" api-development pytest src/tests + test-web: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: "Build web" + run: docker build --tag web-development ./web + pre-commit: runs-on: ubuntu-latest steps: diff --git a/docker-compose.yaml b/docker-compose.yaml index 9645e11..66c39be 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -25,8 +25,8 @@ services: web: build: context: ./web -# target: prod - target: development + target: prod +# target: development restart: unless-stopped stdin_open: true volumes: diff --git a/web/src/Components/Bridging/BridgeContainer.jsx b/web/src/Components/Bridging/BridgeContainer.jsx index b40e9b0..bf6f5f8 100644 --- a/web/src/Components/Bridging/BridgeContainer.jsx +++ b/web/src/Components/Bridging/BridgeContainer.jsx @@ -7,6 +7,7 @@ import { AuthContext } from 'react-oauth2-code-pkce' import BridgeGraph from "./BridgeGraph" import {Tooltip} from "../Common/Tooltip"; import {findDValue, findGraphData} from "../../Utils"; +import { ErrorToast } from '../Common/Toast' const InputWrapper = styled.div` display: flex; diff --git a/web/src/Components/Combinations/CombinationTable.tsx b/web/src/Components/Combinations/CombinationTable.tsx index 1dad940..ce29ef2 100644 --- a/web/src/Components/Combinations/CombinationTable.tsx +++ b/web/src/Components/Combinations/CombinationTable.tsx @@ -86,6 +86,7 @@ export const CombinationTable = ({ type='number' onChange={(event: any) => handleValueChange(id, event.target.value)} style={{ + // @ts-ignore '--eds-input-background': 'rgba(133,186,191,0.15)', }} />