Merge pull request 'feat: add social network field to artiste' (#3) from feat/improve-artist-page into master

Reviewed-on: #3

.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=

.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:
-    - dev
 
 jobs:
   build:
@@ -39,7 +37,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 dev
+          git fetch origin
+          git checkout -B ${{ gitea.ref_name }} origin/${{ gitea.ref_name }}
           corepack enable
           yarn install --frozen-lockfile
           NODE_ENV=production yarn build

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.subtitle': `Connectez-vous à votre compte ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API`,
-        'Auth.form.welcome.title': 'Bienvenue sur 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.subtitle': `Log in to your ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API account`,
-      	'Auth.form.welcome.title': 'Welcome to OKI API !',
+      	'Auth.form.welcome.title': `Welcome to ${process.env.STRAPI_ADMIN_SITE_NAME || 'OKI'} API !`,
   	  	'LeftMenu.navbrand.title': 'Dashboard',
   		'LeftMenu.navbrand.workplace': 'Workplace',
       }

src/api/artiste/content-types/artiste/schema.json

@@ -58,7 +58,7 @@
     "musicBrainzUrl": {
       "type": "string"
     },
-    "isOKIAwtis": {
+    "isExclusiveArtist": {
       "type": "boolean",
       "default": false
     },
@@ -66,6 +66,11 @@
       "type": "relation",
       "relation": "manyToOne",
       "target": "api::parole.parole"
+    },
+    "rezoSosyal": {
+      "type": "component",
+      "repeatable": true,
+      "component": "social.rezo-sosyal"
     }
   }
 }

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 ❤️`,

src/components/social/rezo-sosyal.json

@@ -0,0 +1,38 @@
+{
+  "collectionName": "components_social_rezo_sosyal",
+  "info": {
+    "displayName": "Rézo Sosyal",
+    "icon": "earth",
+    "description": ""
+  },
+  "options": {},
+  "attributes": {
+    "plateforme": {
+      "type": "enumeration",
+      "enum": [
+        "Mastodon",
+        "Peertube",
+        "Pixelfed",
+        "Funkwhale",
+        "Bluesky",
+        "Instagram",
+        "Youtube",
+        "Tiktok",
+        "Spotify",
+        "Deezer",
+        "Applemusic",
+        "Bandcamp",
+        "Soundcloud",
+        "Facebook",
+        "Twitter",
+        "Linktree",
+        "SiteWeb"
+      ],
+      "required": true
+    },
+    "url": {
+      "type": "string",
+      "required": true
+    }
+  }
+}

types/generated/components.d.ts

@@ -25,6 +25,40 @@ export interface DifferenceParolesDiff extends Struct.ComponentSchema {
   };
 }
 
+export interface SocialRezoSosyal extends Struct.ComponentSchema {
+  collectionName: 'components_social_rezo_sosyal';
+  info: {
+    description: '';
+    displayName: 'R\u00E9zo Sosyal';
+    icon: 'earth';
+  };
+  attributes: {
+    plateforme: Schema.Attribute.Enumeration<
+      [
+        'Mastodon',
+        'Peertube',
+        'Pixelfed',
+        'Funkwhale',
+        'Bluesky',
+        'Instagram',
+        'Youtube',
+        'Tiktok',
+        'Spotify',
+        'Deezer',
+        'Applemusic',
+        'Bandcamp',
+        'Soundcloud',
+        'Facebook',
+        'Twitter',
+        'Linktree',
+        'SiteWeb',
+      ]
+    > &
+      Schema.Attribute.Required;
+    url: Schema.Attribute.String & Schema.Attribute.Required;
+  };
+}
+
 export interface StoreAlbum extends Struct.ComponentSchema {
   collectionName: 'components_store_albums';
   info: {
@@ -84,6 +118,7 @@ declare module '@strapi/strapi' {
   export module Public {
     export interface ComponentSchemas {
       'difference.paroles-diff': DifferenceParolesDiff;
+      'social.rezo-sosyal': SocialRezoSosyal;
       'store.album': StoreAlbum;
       'trad.traductions': TradTraductions;
       'url.liens': UrlLiens;

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<false>;
+    isExclusiveArtist: Schema.Attribute.Boolean &
+      Schema.Attribute.DefaultTo<false>;
     locale: Schema.Attribute.String & Schema.Attribute.Private;
     localizations: Schema.Attribute.Relation<
       'oneToMany',
@@ -461,6 +462,7 @@ export interface ApiArtisteArtiste extends Struct.CollectionTypeSchema {
     photo: Schema.Attribute.Media<'images'>;
     prenom: Schema.Attribute.String;
     publishedAt: Schema.Attribute.DateTime;
+    rezoSosyal: Schema.Attribute.Component<'social.rezo-sosyal', true>;
     slug: Schema.Attribute.String;
     titrePhare: Schema.Attribute.Relation<'manyToOne', 'api::parole.parole'>;
     updatedAt: Schema.Attribute.DateTime;