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.

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

2024-11-17 deployment #288

Merged
merged 31 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a7656ec
Batch Actions (#230)
bes-alielzein Sep 26, 2024
e535b4a
Changed referencing models from string to model classes (#246)
NicolasDontigny Sep 26, 2024
4b54c4c
Simplified Batch properties serializers (#248)
NicolasDontigny Sep 26, 2024
94c5218
Feature/253 create shared batch form (#254)
NicolasDontigny Sep 26, 2024
21c6a0d
Feature/222 batch sponsor to be an image and url (#233)
NicolasDontigny Sep 27, 2024
6d87a0a
Added tabs to navigate between site pages (#237)
NicolasDontigny Oct 1, 2024
be57ef0
Check for missing migration (#256)
Samuel-Therrien-Beslogic Oct 3, 2024
be6064c
Create PR template (#258)
Samuel-Therrien-Beslogic Oct 3, 2024
efb6f54
Re-use bg-color for image upload (#263)
Samuel-Therrien-Beslogic Oct 3, 2024
a6884b4
Fix extra site name in edit modal (#260)
Samuel-Therrien-Beslogic Oct 3, 2024
cbd3b82
Validate consistent shape of translation files (#259)
Samuel-Therrien-Beslogic Oct 3, 2024
586ffe4
Feature/243 calculate sponsored percentage (#255)
NicolasDontigny Oct 3, 2024
269571a
fix broken translation due to missing automatic plural handling (#264)
Samuel-Therrien-Beslogic Oct 4, 2024
e2aba36
Update docker-compose.yml
andy2great Oct 10, 2024
ea6f2fe
Remove unecessary secrets
Andrew-Beslogic Oct 10, 2024
e58075e
[pre-commit.ci] pre-commit autoupdate (#265)
pre-commit-ci[bot] Oct 10, 2024
16bbff2
Simplify translatable models to use a shared Mixin (#257)
Samuel-Therrien-Beslogic Oct 22, 2024
85f4e28
Fix DB initialization to use different site types examples (#270)
Samuel-Therrien-Beslogic Oct 24, 2024
973a211
Improve caroussel button definition (#283)
Samuel-Therrien-Beslogic Nov 12, 2024
f9a85bb
Improve map cards responsiveness (#282)
Samuel-Therrien-Beslogic Nov 12, 2024
5bb779d
Stop using `@import` in scss (#284)
Samuel-Therrien-Beslogic Nov 12, 2024
de6c484
Fix upload button not actually reusing background color (#278)
Samuel-Therrien-Beslogic Nov 12, 2024
5ed7e6d
Render icon per site type (#271)
Samuel-Therrien-Beslogic Nov 12, 2024
320440b
Bump the npm_and_yarn group across 1 directory with 7 updates (#285)
dependabot[bot] Nov 14, 2024
85ab12c
Automatically calculate total number of plants and seeds (#274)
Samuel-Therrien-Beslogic Nov 14, 2024
8921051
Refactor "Site Manager" to "Forest Steward" to match business design …
Samuel-Therrien-Beslogic Nov 14, 2024
61bd1a2
Bump eslint-config-beslogic to 3.0 and drop-pre-commit (#268)
Samuel-Therrien-Beslogic Nov 15, 2024
5711a78
Update eslint-config-beslogic to 3.1.1 (#286)
Samuel-Therrien-Beslogic Nov 15, 2024
153692d
Nitpicks to reduce changes from #279
Samuel-Therrien-Beslogic Nov 15, 2024
1047098
Proper use of theme colors + Improved navbar (#279)
Samuel-Therrien-Beslogic Nov 18, 2024
20b4767
Merge branch 'production' of https://github.com/BesLogic/releaf-canopeum
Samuel-Therrien-Beslogic Nov 18, 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
32 changes: 32 additions & 0 deletions .github/workflows/canopeum_backend_pr_validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,35 @@ jobs:
version: PATH
python-version: "3.12"
working-directory: canopeum_backend

Ruff-Autofixes:
runs-on: unbuntu-latest
defaults:
run:
working-directory: canopeum_backend
# Only run autofixes on PRs
if: ${{ github.event_name == 'pull_request' }}
steps:
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
# Token with Contents permissions to allow retriggering workflow
token: ${{ secrets.PR_AUTOFIX_PAT }}
- run: echo "${{github.event.head_commit.author.name}}"
- uses: astral-sh/ruff-action@v1
with:
args: check --fix
- uses: astral-sh/ruff-action@v1
# Format even on lint failure
if: ${{ !cancelled() }}
with:
args: format
- name: Commit autofixes
uses: EndBug/add-and-commit@v9
# TODO: Prevent infinite loops, github.event.head_commit.author.name is not accessible in this context
# if: ${{ github.event.head_commit.author.name != 'github-actions' }}
# Push autofixes even on failure
if: ${{ !cancelled() }}
with:
default_author: github_actions
20 changes: 18 additions & 2 deletions .github/workflows/canopeum_frontend_pr_validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,32 @@ on:
- ".github/workflows/canopeum_frontend_pr_validation.yml"

jobs:
Lint:
Lint-Autofixes:
runs-on: ubuntu-latest
defaults:
run:
working-directory: canopeum_frontend
# Only run autofixes on PRs
if: ${{ github.event_name == 'pull_request' }}
steps:
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
# Token with Contents permissions to allow retriggering workflow
token: ${{ secrets.PR_AUTOFIX_PAT }}
- uses: actions/setup-node@v4
- run: npm ci
- run: npm run lint
- run: npm run lint:fix
- name: Commit autofixes
uses: EndBug/add-and-commit@v9
# TODO: Prevent infinite loops, github.event.head_commit.author.name is not accessible in this context
# if: ${{ github.event.head_commit.author.name != 'github-actions' }}
# Push autofixes even on failure
if: ${{ !cancelled() }}
with:
default_author: github_actions

Build:
runs-on: ubuntu-latest
defaults:
Expand Down
77 changes: 0 additions & 77 deletions .pre-commit-config.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"dbaeumer.vscode-eslint",
"dprint.dprint",
"meganrogge.template-string-converter",
"mrmlnc.vscode-scss",
"sibiraj-s.vscode-scss-formatter", // This can likely eventually be replaced by dprint's malva plugin
// Python/TOML
"charliermarsh.ruff",
"ms-python.mypy-type-checker",
Expand Down
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"editor.defaultFormatter": "vscode.css-language-features"
},
"[scss]": {
"editor.defaultFormatter": "vscode.css-language-features"
"editor.defaultFormatter": "sibiraj-s.vscode-scss-formatter"
},
"[postcss]": {
"editor.defaultFormatter": "vscode.css-language-features"
Expand All @@ -154,6 +154,9 @@
"less.format.spaceAroundSelectorSeparator": true,
"css.format.spaceAroundSelectorSeparator": true,
"scss.format.spaceAroundSelectorSeparator": true,
"scssFormatter.printWidth": 100,
"scssFormatter.singleQuote": true,
"scssFormatter.trailingComma": "all",

/*
* Python
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ For backend
uv run ./scripts/checkers.py
```

For both: (autofixers)

```shell
pre-commit run --all
```

### Quickly running the application locally

We've made a `start-local-env.ps1` helper script to ease starting up the application. Feel free to use and improve it.
Expand Down
Loading
Loading