From 5f4dd5b8d438b89d836a69481734a76d68e3e955 Mon Sep 17 00:00:00 2001 From: Samuel Therrien Date: Wed, 18 Dec 2024 13:47:24 -0500 Subject: [PATCH] Rerun updated dprint (excluding scss) --- .github/dependabot.yml | 8 ++++---- .github/workflows/canopeum_deploy.yml | 10 +++++----- .vscode/settings.json | 2 +- .../components/analytics/OptionQuantitySelector.tsx | 6 +++--- .../src/components/inputs/TextExpansion.tsx | 4 +--- docker-compose.yml | 4 ++-- dprint.json | 4 +++- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f33a02cd1..9d8f2d043 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,7 +6,7 @@ version: 2 updates: - - package-ecosystem: "devcontainers" - directory: "/" - schedule: - interval: weekly + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly diff --git a/.github/workflows/canopeum_deploy.yml b/.github/workflows/canopeum_deploy.yml index 17b7da7f6..fca14f1be 100644 --- a/.github/workflows/canopeum_deploy.yml +++ b/.github/workflows/canopeum_deploy.yml @@ -4,12 +4,12 @@ on: workflow_dispatch: # Allows manual triggers inputs: deploy_frontend: - description: 'Deploy the frontend' + description: "Deploy the frontend" required: true type: boolean default: true deploy_backend: - description: 'Deploy the backend' + description: "Deploy the backend" required: true type: boolean default: true @@ -30,7 +30,7 @@ on: jobs: GetDateTime: runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' || (inputs.deploy_frontend && inputs.deploy_backend) }} + if: ${{ github.event_name == 'push' || (inputs.deploy_frontend && inputs.deploy_backend) }} outputs: DATETIME: ${{ steps.datetime.outputs.DATETIME }} steps: @@ -41,7 +41,7 @@ jobs: BuildFrontend: name: Build & Deploy Frontend runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' || inputs.deploy_frontend }} + if: ${{ github.event_name == 'push' || inputs.deploy_frontend }} needs: [GetDateTime] defaults: run: @@ -70,7 +70,7 @@ jobs: BuildBackend: name: Build & Deploy Backend runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' || inputs.deploy_backend }} + if: ${{ github.event_name == 'push' || inputs.deploy_backend }} needs: [GetDateTime] defaults: run: diff --git a/.vscode/settings.json b/.vscode/settings.json index 48b4fbc09..7cac488c2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -112,7 +112,7 @@ } ], "eslint.codeActionsOnSave.rules": [ - // Clearing imports and unused vars because of commented code while testing is annoying + // Clearing imports, unused vars and comments because of commented code while testing is annoying "!unused-imports/no-unused-imports", "!autofix/no-debugger", "!autofix/no-unused-vars", diff --git a/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx b/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx index 1d08f01eb..c7ed11e83 100644 --- a/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx +++ b/canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx @@ -89,18 +89,18 @@ const OptionQuantitySelector = ( clearOnBlur freeSolo getOptionKey={option => ( - typeof (option) === 'string' + typeof option === 'string' ? option : option.value )} getOptionLabel={option => ( - typeof (option) === 'string' + typeof option === 'string' ? option : option.displayText )} id={id} onChange={(_event, option) => { - if (option === null || typeof (option) === 'string') return + if (option === null || typeof option === 'string') return onSelect(option) }} diff --git a/canopeum_frontend/src/components/inputs/TextExpansion.tsx b/canopeum_frontend/src/components/inputs/TextExpansion.tsx index 991dc19cb..9105a49db 100644 --- a/canopeum_frontend/src/components/inputs/TextExpansion.tsx +++ b/canopeum_frontend/src/components/inputs/TextExpansion.tsx @@ -29,9 +29,7 @@ const TextExpansion = ({ text, maxLength }: TextExpansionProps) => { ) - : ( - text - )} + : text} ) } diff --git a/docker-compose.yml b/docker-compose.yml index a3fa750dc..7a61dcef9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: "3.7" services: mysql: hostname: mysql @@ -33,7 +33,7 @@ services: MYSQL_PASSWORD_CANOPEUM: /run/secrets/MYSQL_PASSWORD_CANOPEUM SECRET_KEY_DJANGO_CANOPEUM: /run/secrets/SECRET_KEY_DJANGO_CANOPEUM GOOGLE_API_KEY_CANOPEUM: /run/secrets/GOOGLE_API_KEY_CANOPEUM - DEBUG: 'False' + DEBUG: "False" VIRTUAL_HOST: api.canopeum.releaftrees.life LETSENCRYPT_HOST: api.canopeum.releaftrees.life volumes: diff --git a/dprint.json b/dprint.json index d9b85dd78..0ef17b205 100644 --- a/dprint.json +++ b/dprint.json @@ -13,6 +13,8 @@ "**/obj", // capacitor folders "**/*/android/app", - "**/*/ios/App" + "**/*/ios/App", + // TODO: Test and update configs for scss (Malva) + "**/*.scss" ] }