Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rerun updated dprint (excluding scss) #334

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Rerun updated dprint (excluding scss) #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f4dd5b
Rerun updated dprint (excluding scss)
Samuel-Therrien-Beslogic Dec 18, 2024
fb397b9
Rerun dprint after fixed markup_fmt config
Samuel-Therrien-Beslogic Dec 19, 2024
08a0d8e
Commit from GitHub Actions (Frontend PR validation)
github-actions[bot] Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
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
View file
Open in desktop
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
5 changes: 4 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
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 All @@ -135,6 +135,9 @@
"editor.defaultFormatter": "vscode.html-language-features"
},
"html.format.wrapAttributes": "force-expand-multiline",
// To match markup_fmt with dprint
"html.format.indentInnerHtml": true,
"html.format.extraLiners": "",

/*
* CSS
Expand Down
86 changes: 42 additions & 44 deletions canopeum_frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,45 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link
rel="icon"
type="image/svg+xml"
href="/favicon.ico"
/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Releaf</title>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
/>
<link
href="https://unpkg.com/[email protected]/dist/maplibre-gl.css"
rel="stylesheet"
/>
<link
rel="preconnect"
href="https://fonts.googleapis.com"
/>
<link
rel="preconnect"
href="https://fonts.gstatic.com"
crossorigin
/>
<link
href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
rel="stylesheet"
/>
</head>

<head>
<meta charset="UTF-8" />
<link
rel="icon"
type="image/svg+xml"
href="/favicon.ico"
/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Releaf</title>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"
/>
<link
href='https://unpkg.com/[email protected]/dist/maplibre-gl.css'
rel='stylesheet'
/>
<link
rel="preconnect"
href="https://fonts.googleapis.com"
>
<link
rel="preconnect"
href="https://fonts.gstatic.com"
crossorigin
>
<link
href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
rel="stylesheet"
>
</head>

<body>
<div id="root"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>

<body>
<div id="root"></div>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
6 changes: 3 additions & 3 deletions canopeum_frontend/src/components/analytics/OptionQuantitySelector.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
]
}
Loading