Skip to content
Open

1.5.x #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
67cd189
chore: dynamic docker project name, fix db port custom
20cents Oct 21, 2024
0dc687a
fix: home map padding to ensure markers visibility
20cents Oct 21, 2024
cce8d30
fix: route /api/me
20cents Oct 21, 2024
2228b8a
style: add workflows for lint backend
andriacap Oct 25, 2024
e60c2ce
style: apply black
andriacap Oct 25, 2024
17e134d
Merge pull request #31 from naturalsolutions/style/backend-linter
andriacap Oct 25, 2024
ea9e856
feat: wip add translation table
Oct 23, 2024
4d87188
feat: add is_published and is_default unique to lang table
Oct 23, 2024
206c8a3
feat: add languages route
Oct 23, 2024
408eebe
chore: remove unused marshmallow schema
Oct 23, 2024
bd5b175
feat: wip observatories api endpoints with translations
Oct 23, 2024
f840d8c
chore: minor change
Oct 23, 2024
863e84c
fix: drop column on upgrade translations migration
jules-jean-louis1 Oct 23, 2024
122e0de
chore: minor change
Oct 24, 2024
11e93de
feat: update all routes to align with new database models and added t…
Oct 24, 2024
963057a
feat: add API endpoint to add languages
Oct 24, 2024
163f9bb
feat: add API endpoints for updating and deleting languages
jules-jean-louis1 Oct 25, 2024
482cfd5
feat: Add authentication check to language-related API routes
Oct 25, 2024
b1696bc
feat: wip multi langs
20cents Oct 22, 2024
4b9a565
style: rm unused import
20cents Oct 23, 2024
ff1edf8
fix: date format from locale
20cents Oct 23, 2024
fcc795e
chore: mv hard coded string to i18n files
20cents Oct 23, 2024
0e6e06f
feat: wip add translation table
Oct 23, 2024
b8a8f4e
feat: add is_published and is_default unique to lang table
Oct 23, 2024
5caa139
feat: add languages route
Oct 23, 2024
e0e8976
chore: remove unused marshmallow schema
Oct 23, 2024
3669234
style: code format
20cents Oct 23, 2024
455eb30
feat: wip multi langs
20cents Oct 23, 2024
d1295be
style: code format
20cents Oct 24, 2024
d803d14
feat: wip multi langs
20cents Oct 24, 2024
b701c38
feat: wip multi langs
20cents Oct 24, 2024
8662fa2
Merge branch 'multi-langs_merge_translation-model-migration' into fea…
20cents Oct 25, 2024
c18ab47
Merge pull request #30 from naturalsolutions/feat/translation-model-m…
20cents Oct 25, 2024
d4f2e99
fix: api get sites
20cents Oct 25, 2024
f3beef6
refactor: rename api/languages to langs
20cents Oct 25, 2024
6047207
fix: post langs accept only one lang and serve 409 when needed
20cents Oct 25, 2024
1d84aac
fix: locale detection and redirection
20cents Oct 25, 2024
a0b238b
fix: translations
20cents Oct 28, 2024
7bde4de
style: code format
20cents Oct 28, 2024
e8d0eea
fix: localize gallery route
20cents Oct 28, 2024
9aee361
fix: model schema fallback to default translation
20cents Oct 29, 2024
1e79068
fix: redirection and other bug about locale
20cents Oct 29, 2024
f618047
fix: render localized links in tpl
20cents Oct 29, 2024
e47aeb2
fix: unique constraint on lang.is_default is true
20cents Nov 4, 2024
4e929bc
fix/feat: route constraint add and new route
andriacap Oct 30, 2024
d259326
Merge pull request #32 from naturalsolutions/fix/route-lang-api
andriacap Nov 4, 2024
97ce1f9
fix: no more required positional argument 'locale'
20cents Nov 4, 2024
9ff983a
fix: support localized custom route
20cents Nov 4, 2024
28f9d98
fix: localized link from sites to site
20cents Nov 4, 2024
bcb9e62
fix: babel use default lang
20cents Nov 4, 2024
f0ecd51
feat: add language selector
20cents Nov 4, 2024
16e0a36
feat: maps support wms layer from conf
20cents Nov 4, 2024
674b46a
docs: map layers conf
20cents Nov 5, 2024
bfa1177
refactor: server side rendering for link to site page
20cents Nov 5, 2024
2cef430
chore: main menu tpl present localized links
20cents Nov 5, 2024
84dd928
feat: language selector keep current page in url
20cents Nov 5, 2024
48787b5
fix: babel determine_locale enhancements
20cents Nov 5, 2024
22286d6
fix: add de translations, translate legal notices label
20cents Nov 6, 2024
a41a0a9
feat: add locales to db and route get
andriacap Nov 5, 2024
530bd23
Merge pull request #33 from naturalsolutions/feat/add-locales-db
andriacap Nov 6, 2024
42b5726
feat(front): add internalization with i18n
andriacap Oct 22, 2024
d7b755d
refactor: add some missing translations
andriacap Oct 24, 2024
27e6147
feat: add choose language on login page
andriacap Oct 25, 2024
520b975
fix: add translation for delete site
andriacap Oct 25, 2024
7015874
fix: translation missing arg and en.json
andriacap Oct 25, 2024
d52ef3f
feat(wip): add tabs languages and display dynamic
andriacap Oct 24, 2024
180eb5f
feat: add internationalizationa and languageDB
andriacap Oct 30, 2024
989246a
fix: locales and languages management
andriacap Nov 5, 2024
2edb6b3
Merge pull request #34 from naturalsolutions/feat/admin-tabs-for-lang…
andriacap Nov 6, 2024
53fa7d7
chore: Update language selector style and behavior
Nov 6, 2024
f37f9fc
Merge pull request #35 from naturalsolutions/feat/navbar-select-trans…
20cents Nov 6, 2024
d45f3ae
fix: minor css style
20cents Nov 6, 2024
b676f73
style: code format
20cents Nov 6, 2024
8b9c117
fix: minor lang creation enhancements
20cents Nov 6, 2024
a6d3a37
fix: duplicate translations from default lang to new lang
20cents Nov 6, 2024
31ee873
fix: publishing lang require at least one published site and observatory
20cents Nov 6, 2024
0693d18
feat: Add further check to edit a lang (#36)
jules-jean-louis1 Nov 12, 2024
08798c7
Fix: patch thumbnail and photo, subtheme on site (#37)
jules-jean-louis1 Apr 10, 2025
bf93f3c
fix: include sites in the filters data return value
Apr 16, 2025
f58f077
chore: fix postgres internal port
20cents Apr 30, 2025
8b89bfb
wip: user roles
20cents Apr 30, 2025
9e66177
chore: rm unused (and potentialy dangerous) code
20cents May 5, 2025
ffe2110
fix: site.main_theme_id edition
20cents May 5, 2025
8aa39b7
feat: wip user roles
20cents May 5, 2025
2582242
Merge branch 'multi-langs' of github.com:naturalsolutions/GeoPaysages…
20cents May 5, 2025
bb8327b
fix: no more abort() in try catch
20cents May 6, 2025
a975fd1
filter by user roles
20cents May 6, 2025
b3ccef3
wip user roles are supported
20cents May 8, 2025
de94f00
feat: user roles
20cents May 8, 2025
7e8fc79
fix: user roles enhancements
20cents May 9, 2025
1239c29
fix: ensure default translation is used when none is provided
May 16, 2025
23f2d94
Merge pull request #38 from naturalsolutions/fix/error-site-gallery-page
20cents May 16, 2025
9c29e79
fix: use db.session.query(Model) instead of Model.query
20cents Jul 7, 2025
4f04427
Merge remote-tracking branch 'origin/multi-langs' into user-roles
20cents Jul 10, 2025
3a3db7e
fix: ensure localeGuard always sets a locale
20cents Jul 10, 2025
e58a3d5
Merge commit '3a3db7e47c8dd8e7bc1a4e19db7bd904c947facb' into user-roles
20cents Jul 10, 2025
cb9ee5d
fix: rm trailing slashes from api routes
20cents Jul 10, 2025
642748f
chore: bump version to 1.5.0
20cents Jul 10, 2025
a526653
Add gitlab-ci.yml
20cents Jul 10, 2025
bc1accc
Merge branch 'user-roles' into 'preprod'
20cents Jul 10, 2025
df5e5ab
chore: rename gitlab-ci
20cents Jul 10, 2025
2deecf3
Edit .gitlab-ci.yml
20cents Jul 10, 2025
5ae2719
fix: Filter invalid cor_roles_observatory entries due to missing FK (…
20cents Jul 22, 2025
37f0dc2
style: code format
20cents Jul 22, 2025
fd8d19e
fix: observatory contributor can add sites
20cents Jul 22, 2025
39809ec
chore: bump app version to 1.5.1
20cents Jul 22, 2025
054edfc
Merge branch 'user-roles' into 'preprod'
20cents Jul 22, 2025
09cff45
Edit .gitlab-ci.yml
20cents Jul 22, 2025
5940f22
fix: use custom login route
20cents Nov 6, 2025
b6b7ab7
Merge branch 'user-roles' into 'preprod'
20cents Nov 6, 2025
f4efe7f
chore: bump app version to 1.5.2
20cents Nov 6, 2025
70f33a7
fix: use less usershub functions
20cents Nov 6, 2025
45d1d8b
chore: bump app version to 1.5.3
20cents Nov 6, 2025
9b992ce
Merge branch 'preprod' of gitlab.com:natural-solutions/geopaysages/ge…
20cents Nov 6, 2025
54df2c1
Merge branch 'user-roles' into 'preprod'
20cents Nov 6, 2025
fbc8abb
docs: user roles
20cents Nov 19, 2025
f2504fc
build: upgrade traefik version
20cents Dec 5, 2025
7fb328b
fix: show site testimonials
20cents Dec 5, 2025
9aef175
chore: bump app version to 1.5.4
20cents Dec 5, 2025
9cab738
refactor: no more use USERSHUB_ID_APP
20cents Dec 5, 2025
16f70a8
docs: changelog v1.5.x
20cents Dec 5, 2025
94dce2e
fix: redirect support request without accept_languages
20cents Jan 8, 2026
97f34cc
chore: bump app version to 1.5.5
20cents Jan 8, 2026
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
25 changes: 25 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Lint Code with Black

on:
push:
pull_request:

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.9" # Spécifie la version de Python que tu utilises

- name: Install Black
run: |
python -m pip install --upgrade pip
pip install black==24.10.0

- name: Run Black
run: black --check --exclude "backend/custom_app.py" ./backend
98 changes: 98 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
.kaniko_template:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
variables:
GODEBUG: "http2client=0"
DOCKER_CONFIG: /kaniko/.docker
DOCKER_CONFIG_TPL: '{"auths": {"harbor.naturaliens.cloud": {"auth": "<NS_DOCKER_TOKEN>"}}}'
script:
- mkdir -p /kaniko/.docker
- |
printf '%s\n' "$DOCKER_CONFIG_TPL" | sed "s|<NS_DOCKER_TOKEN>|${NS_DOCKER_TOKEN}|g" > /kaniko/.docker/config.json
- >
/kaniko/executor
--context "${CONTEXT_DIR}"
--dockerfile "${DOCKERFILE_PATH}"
--build-arg APP_VERSION=$(cat VERSION)
--destination "harbor.naturaliens.cloud/geopaysages/${IMAGE_NAME}:$(cat VERSION)"
--destination "harbor.naturaliens.cloud/geopaysages/${IMAGE_NAME}:${CI_COMMIT_BRANCH}"
--cache=true
tags:
- NSCICDK8S

build_db:
extends: .kaniko_template
variables:
CONTEXT_DIR: "${CI_PROJECT_DIR}/db"
DOCKERFILE_PATH: "${CI_PROJECT_DIR}/db/Dockerfile"
IMAGE_NAME: db
rules:
- if: '$CI_COMMIT_BRANCH == "preprod"'
changes:
- db/**
#- .gitlab-ci.yml

build_admin:
extends: .kaniko_template
variables:
CONTEXT_DIR: "${CI_PROJECT_DIR}/admin"
DOCKERFILE_PATH: "${CI_PROJECT_DIR}/admin/Dockerfile"
IMAGE_NAME: admin
rules:
- if: '$CI_COMMIT_BRANCH == "preprod"'
changes:
- admin/**/*
- admin/*
#- .gitlab-ci.yml

build_backend:
extends: .kaniko_template
variables:
CONTEXT_DIR: "${CI_PROJECT_DIR}/backend"
DOCKERFILE_PATH: "${CI_PROJECT_DIR}/backend/Dockerfile"
IMAGE_NAME: backend
rules:
- if: '$CI_COMMIT_BRANCH == "preprod"'
changes:
- backend/**
#- .gitlab-ci.yml

deploy:
stage: deploy
image: registry.gitlab.com/natural-solutions/ns-ansible-infrastructure
id_tokens:
NATURALIENS_ID_TOKEN:
aud: https://vault.naturaliens.cloud
tags:
- NSCICDDOCKER
# needs:
# - job: build_db
# optional: true
# - job: build_keycloak
# optional: true
# - job: build_hasura
# optional: true
# - job: build_python
# optional: true
# - job: build_app
# optional: true
rules:
- if: '$CI_COMMIT_BRANCH == "preprod"'
changes:
# - .gitlab-ci.yml
- db/**
- keycloak/**
- hasura/**
- python/**
- app/**
script:
- export VAULT_TOKEN="$(vault write -field=token auth/jwt/login role=gitlab-runner-geopaysages jwt=$NATURALIENS_ID_TOKEN)"
- cd /home/ansible
- vault kv get -format=json -mount=devops inventories/ns/projects/geopaysages | jq -r '.data.data.hosts.dev.private_key' | base64 -d > private_key
- chmod 600 private_key
- ansible-playbook -i inventory.py playbooks/geopaysages.yml -t geopaysages
variables:
GIT_STRATEGY: none
INVENTORY_PATH: inventories/ns/projects/geopaysages
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.5.5
Loading
Loading