From afb38a067bf88f5aa796c903049c993465e665d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 00:33:32 +0400 Subject: [PATCH 1/7] feat: use STRAPI_ADMIN_SITE_NAME for admin panel titles --- .env.example | 3 +++ src/admin/app.js | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index c06a92a..0565e38 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,9 @@ PORT=1337 STRAPI_URL= STRAPI_ADMIN_URL=/admin +# Branding (affiché dans l'interface admin Strapi — rebuild requis) +STRAPI_ADMIN_SITE_NAME=OKI + APP_KEYS= API_TOKEN_SALT= ADMIN_JWT_SECRET= diff --git a/src/admin/app.js b/src/admin/app.js index 6c7e064..69d3340 100644 --- a/src/admin/app.js +++ b/src/admin/app.js @@ -13,14 +13,14 @@ export default { locales: ['fr'], translations: { fr: { - 'Auth.form.welcome.subtitle': 'Connectez-vous à votre compte OKI API', - 'Auth.form.welcome.title': 'Bienvenue sur OKI API !', + 'Auth.form.welcome.subtitle': `Connectez-vous à votre compte ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API`, + 'Auth.form.welcome.title': `Bienvenue sur ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API !`, 'LeftMenu.navbrand.title': 'Tableau de bord', 'LeftMenu.navbrand.workplace': 'Menu', }, en: { - 'Auth.form.welcome.subtitle': 'Log in to your OKI API account', - 'Auth.form.welcome.title': 'Welcome to OKI API !', + 'Auth.form.welcome.subtitle': `Log in to your ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API account`, + 'Auth.form.welcome.title': `Welcome to ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API !`, 'LeftMenu.navbrand.title': 'Dashboard', 'LeftMenu.navbrand.workplace': 'Workplace', } -- 2.30.2 From c8dd6e9c4aaf55522e49cfb54b2f69cc90f226ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 00:33:42 +0400 Subject: [PATCH 2/7] feat: use WEBSITE_URL in publication notification emails --- src/api/parole/content-types/parole/lifecycles.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/parole/content-types/parole/lifecycles.js b/src/api/parole/content-types/parole/lifecycles.js index 130f2d7..f58a974 100644 --- a/src/api/parole/content-types/parole/lifecycles.js +++ b/src/api/parole/content-types/parole/lifecycles.js @@ -193,7 +193,7 @@ module.exports = { strapi.plugins['email'].services.email.send({ from: process.env.SMTP_FROM, to: previousData.user.email, - subject: `Publication de "${previousData.titre}" sur pawol.nu`, + subject: `Publication de "${previousData.titre}" sur ${(process.env.WEBSITE_URL || 'https://pawol.nu').replace(/^https?:\/\//, '')}`, text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site. Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug} Merci pour votre contribution ❤️`, @@ -206,7 +206,7 @@ module.exports = { strapi.plugins['email'].services.email.send({ from: process.env.SMTP_FROM, to: previousData.userAdmin.email, - subject: `Publication de "${previousData.titre}" sur pawol.nu`, + subject: `Publication de "${previousData.titre}" sur ${(process.env.WEBSITE_URL || 'https://pawol.nu').replace(/^https?:\/\//, '')}`, text: `Le titre que vous avez soumis, "${previousData.titre}" a été publié sur le site. Vous pouvez le trouver à l'adresse ${process.env.WEBSITE_URL}/paroles/${previousData.slug}. Merci pour votre contribution ❤️`, -- 2.30.2 From 029ba3cc90436fdc901c017184980f56f45071ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 00:33:45 +0400 Subject: [PATCH 3/7] refactor: rename isOKIAwtis to isExclusiveArtist --- src/api/artiste/content-types/artiste/schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/artiste/content-types/artiste/schema.json b/src/api/artiste/content-types/artiste/schema.json index 7513421..f5fd683 100644 --- a/src/api/artiste/content-types/artiste/schema.json +++ b/src/api/artiste/content-types/artiste/schema.json @@ -58,7 +58,7 @@ "musicBrainzUrl": { "type": "string" }, - "isOKIAwtis": { + "isExclusiveArtist": { "type": "boolean", "default": false }, -- 2.30.2 From 7fea170597cecf583e74279cac6d21a11463cba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 00:36:34 +0400 Subject: [PATCH 4/7] chore: regenerate types after isExclusiveArtist rename --- types/generated/contentTypes.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts index 2adda0a..c5ea3af 100644 --- a/types/generated/contentTypes.d.ts +++ b/types/generated/contentTypes.d.ts @@ -448,7 +448,8 @@ export interface ApiArtisteArtiste extends Struct.CollectionTypeSchema { createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> & Schema.Attribute.Private; dateNaissance: Schema.Attribute.Date; - isOKIAwtis: Schema.Attribute.Boolean & Schema.Attribute.DefaultTo; + isExclusiveArtist: Schema.Attribute.Boolean & + Schema.Attribute.DefaultTo; locale: Schema.Attribute.String & Schema.Attribute.Private; localizations: Schema.Attribute.Relation< 'oneToMany', -- 2.30.2 From 0a0772eea3976bef18dbed8d320cb77333cbe86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 07:12:55 +0400 Subject: [PATCH 5/7] ci: deploy beta on any branch except master --- .gitea/workflows/deploy-beta.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-beta.yml b/.gitea/workflows/deploy-beta.yml index 7f8d05c..1d53d23 100644 --- a/.gitea/workflows/deploy-beta.yml +++ b/.gitea/workflows/deploy-beta.yml @@ -2,8 +2,8 @@ name: Déploiement API BETA run-name: ${{ gitea.actor }} déploie API BETA on: push: - branches: - - dev + branches-ignore: + - master jobs: build: @@ -39,7 +39,7 @@ jobs: export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" cd ${{ secrets.DEPLOY_PATH }} - git pull --ff-only origin dev + git pull --ff-only origin ${{ gitea.ref_name }} corepack enable yarn install --frozen-lockfile NODE_ENV=production yarn build -- 2.30.2 From 58fd049d0336cf843385757385ef397baef6eb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 07:14:13 +0400 Subject: [PATCH 6/7] ci: checkout correct branch before deploy --- .gitea/workflows/deploy-beta.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-beta.yml b/.gitea/workflows/deploy-beta.yml index 1d53d23..f94d05b 100644 --- a/.gitea/workflows/deploy-beta.yml +++ b/.gitea/workflows/deploy-beta.yml @@ -39,7 +39,8 @@ jobs: export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" cd ${{ secrets.DEPLOY_PATH }} - git pull --ff-only origin ${{ gitea.ref_name }} + git fetch origin + git checkout -B ${{ gitea.ref_name }} origin/${{ gitea.ref_name }} corepack enable yarn install --frozen-lockfile NODE_ENV=production yarn build -- 2.30.2 From 36da183404acd94b88d4250e45cf625d30ff12ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20FAMIBELLE-PRONZOLA?= Date: Fri, 26 Jun 2026 07:26:04 +0400 Subject: [PATCH 7/7] ci: deploy beta on all branches including master --- .gitea/workflows/deploy-beta.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/deploy-beta.yml b/.gitea/workflows/deploy-beta.yml index f94d05b..154b863 100644 --- a/.gitea/workflows/deploy-beta.yml +++ b/.gitea/workflows/deploy-beta.yml @@ -2,8 +2,6 @@ name: Déploiement API BETA run-name: ${{ gitea.actor }} déploie API BETA on: push: - branches-ignore: - - master jobs: build: -- 2.30.2