Skip to content

Commit

Permalink
Rerun updated dprint (excluding scss)
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel-Therrien-Beslogic committed Dec 18, 2024
1 parent fab14cc commit 5f4dd5b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

version: 2
updates:
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: weekly
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: weekly
10 changes: 5 additions & 5 deletions .github/workflows/canopeum_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ const OptionQuantitySelector = <TValue extends OptionQuantityValueType>(
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)
}}
Expand Down
4 changes: 1 addition & 3 deletions canopeum_frontend/src/components/inputs/TextExpansion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ const TextExpansion = ({ text, maxLength }: TextExpansionProps) => {
</button>
</>
)
: (
text
)}
: text}
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.7'
version: "3.7"
services:
mysql:
hostname: mysql
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion dprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"**/obj",
// capacitor folders
"**/*/android/app",
"**/*/ios/App"
"**/*/ios/App",
// TODO: Test and update configs for scss (Malva)
"**/*.scss"
]
}

0 comments on commit 5f4dd5b

Please sign in to comment.