diff --git a/.env.sample b/.env.sample index d74ab6c..dca440a 100644 --- a/.env.sample +++ b/.env.sample @@ -6,6 +6,16 @@ SITE_URL=http://localhost:3001 NEXT_PUBLIC_READ_TOKEN= NEXT_PUBLIC_ADMIN_JWT_SECRET= +# IDENTITÉ DU SITE (branding) +NEXT_PUBLIC_SITE_NAME=PAWÒL-NU. Paroles et traductions. +NEXT_PUBLIC_SITE_SHORT_NAME=PAWÒL-NU +NEXT_PUBLIC_SITE_DESCRIPTION=PAWÒL-NU a pour but de promouvoir le Medukam (ou Wanni Wannan) et les productions afro-diasporiques. +NEXT_PUBLIC_ORG_NAME=OKI +NEXT_PUBLIC_ORG_FULL_NAME=ORGANISATION KA INTERNATIONALE +NEXT_PUBLIC_ORG_EMAIL=kontak@o-k-i.net +NEXT_PUBLIC_ORG_LOCATION=Guadeloupe +NEXT_PUBLIC_EXCLUSIVE_ARTIST_LABEL=OKI Exclusif + # FUNKWHALE VARIABLE NEXT_PUBLIC_OKI_MIZIK_URL=https://funkwhale-server.com NEXT_PUBLIC_MIZIK_API_USER=user @@ -14,9 +24,11 @@ NEXT_PUBLIC_MIZIK_API_PASSWORD=password NEXT_PUBLIC_AWTIS_POU_CHAK_PAJ=6 NEXT_PUBLIC_SITE_URL=$SITE_URL -# NEXT AUTH +# Auth NEXTAUTH_URL=http://localhost:3000 +BETTER_AUTH_URL=http://localhost:3000 +BETTER_AUTH_SECRET= # TWITTER VARIABLE @@ -32,6 +44,12 @@ GOOGLE_CLIENT_SECRET= NEXT_PUBLIC_CGU_DOWNLOAD_LINK= +# Debug (mettre YES pour afficher les emails dans les logs en développement) +SHOW_EMAILS= + +# Analytique (Plausible — laisser vide pour désactiver) +NEXT_PUBLIC_PLAUSIBLE_URL= + # Menu NEXT_PUBLIC_PROD_DOMAIN= @@ -62,6 +80,8 @@ NEXT_PUBLIC_YOUTUBE_USERNAME= NEXT_PUBLIC_TELEGRAM_GROUP= NEXT_PUBLIC_XMPP= NEXT_PUBLIC_GIT= +NEXT_PUBLIC_CODEBERG= +NEXT_PUBLIC_BLUESKY_URL= # DOMAIN IMAGE NEXT_PUBLIC_DOMAINS_IMAGE="localhost:1337 strapi.mondomaine.com" @@ -85,8 +105,11 @@ SMTP_PASSWORD= SMTP_FROM= SMTP_REPLY_TO= SMTP_SEND_TO= +SMTP_BCC= +SMTP_SECURE= # Twitter Authentification NEXT_PUBLIC_TWITTER_API_KEY= NEXT_PUBLIC_TWITTER_API_KEY_SECRET= +NEXT_PUBLIC_TWITTER_BEARER_TOKEN= diff --git a/.gitea/workflows/deploy-beta.yml b/.gitea/workflows/deploy-beta.yml index 6a2f84b..357e9fd 100644 --- a/.gitea/workflows/deploy-beta.yml +++ b/.gitea/workflows/deploy-beta.yml @@ -2,8 +2,6 @@ name: Déploiement FRONT BETA run-name: ${{ gitea.actor }} déploie FRONT BETA on: push: - branches: - - dev jobs: check: @@ -36,7 +34,8 @@ jobs: export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" cd ${{ secrets.FRONT_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 yarn build diff --git a/app/awtis/[slug]/page.js b/app/awtis/[slug]/page.js index e07b463..8df33d5 100644 --- a/app/awtis/[slug]/page.js +++ b/app/awtis/[slug]/page.js @@ -50,11 +50,11 @@ export async function generateMetadata(props) { type: 'website' }, twitter: { - site: '@OrganisationKA', + site: `@${process.env.NEXT_PUBLIC_TWITTER_USERNAME || 'OrganisationKA'}`, card: 'summary_large_image', title, description, - creator: '@OrganisationKA', + creator: `@${process.env.NEXT_PUBLIC_TWITTER_USERNAME || 'OrganisationKA'}`, images: { url: `${apiUrl}${kuvetiFormat?.url}`, alt: `Photo de ${anAwtis.alias}`, diff --git a/app/awtis/page.js b/app/awtis/page.js index 111822f..be22ea7 100644 --- a/app/awtis/page.js +++ b/app/awtis/page.js @@ -10,17 +10,21 @@ import Pajinasyon from '../../components/awtis/pajinasyon' import {jwennAwtisPajinasyon} from '../../lib/oki-api' import Footer from '../../components/footer' +const siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'PAWÒL-NU. Paroles et traductions.' +const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://pawol.nu' +const twitterHandle = `@${process.env.NEXT_PUBLIC_TWITTER_USERNAME || 'OrganisationKA'}` + export const metadata = { - title: 'PAWÒL-NU | Artistes', + title: `${siteName} | Artistes`, description: 'Liste des artistes ayant une ou plusieurs œuvres présentes sur le site.', openGraph: { - title: 'PAWÒL-NU | Artistes', + title: `${siteName} | Artistes`, description: 'Liste des artistes ayant une ou plusieurs œuvres présentes sur le site.', - url: 'https://pawol.nu/sipote', - siteName: 'PAWÒL-NU. Paroles et traductions.', + url: `${siteUrl}/awtis`, + siteName, images: [ { - url: 'https://pawol.nu/logo-512x512.png', + url: `${siteUrl}/logo-512x512.png`, width: 512, height: 512 } @@ -29,14 +33,14 @@ export const metadata = { type: 'website' }, twitter: { - site: '@OrganisationKA', + site: twitterHandle, card: 'summary_large_image', - title: 'PAWÒL-NU | Artistes', + title: `${siteName} | Artistes`, description: 'Liste des artistes ayant une ou plusieurs œuvres présentes sur le site.', - creator: '@OrganisationKA', + creator: twitterHandle, images: { - url: 'https://pawol.nu/logo-512x512.png', - alt: 'OKI Logo', + url: `${siteUrl}/logo-512x512.png`, + alt: `${siteName} Logo`, } } } diff --git a/app/layout.js b/app/layout.js index bf7cf4a..34a017d 100644 --- a/app/layout.js +++ b/app/layout.js @@ -3,24 +3,33 @@ import TopLoader from '../components/top-loader' import Navigasyon from '../components/navigasyon' import ThemeRegistry from './theme-registy' +const siteName = process.env.NEXT_PUBLIC_SITE_NAME || 'PAWÒL-NU. Paroles et traductions.' +const siteDescription = process.env.NEXT_PUBLIC_SITE_DESCRIPTION || 'PAWÒL-NU a pour but de promouvoir le Medukam (ou Wanni Wannan) et les productions afro-diasporiques.' +const siteUrl = process.env.NEXT_PUBLIC_SITE_URL || 'https://pawol.nu' +const orgName = process.env.NEXT_PUBLIC_ORG_NAME || 'OKI' +const orgEmail = process.env.NEXT_PUBLIC_ORG_EMAIL || 'kontak@o-k-i.net' +const orgLocation = process.env.NEXT_PUBLIC_ORG_LOCATION || 'Guadeloupe' +const twitterHandle = `@${process.env.NEXT_PUBLIC_TWITTER_USERNAME || 'OrganisationKA'}` +const plausibleUrl = process.env.NEXT_PUBLIC_PLAUSIBLE_URL || null + export const metadata = { - metadataBase: new URL('https://pawol.nu'), - manifest: '/manifest.json', - title: 'PAWÒL-NU. Paroles et traductions.', - description: 'PAWÒL-NU a pour but de promouvoir le Medukam (ou Wanni Wannan) et les productions afro-diasporiques.', - author: 'OKI', + metadataBase: new URL(siteUrl), + manifest: '/manifest.webmanifest', + title: siteName, + description: siteDescription, + author: orgName, category: 'music', - creator: 'OKI', - publisher: 'OKI', - applicationName: 'PAWÒL-NU. Paroles et traductions.', + creator: orgName, + publisher: orgName, + applicationName: siteName, openGraph: { - title: 'PAWÒL-NU. Paroles et traductions.', - description: 'PAWÒL-NU a pour but de promouvoir le Medukam (ou Wanni Wannan) et les productions afro-diasporiques.', - url: 'https://pawol.nu', - siteName: 'PAWÒL-NU. Paroles et traductions.', + title: siteName, + description: siteDescription, + url: siteUrl, + siteName, images: [ { - url: 'https://pawol.nu/logo-512x512.png', + url: `${siteUrl}/logo-512x512.png`, width: 512, height: 512 } @@ -29,14 +38,14 @@ export const metadata = { type: 'website' }, twitter: { - site: '@OrganisationKA', + site: twitterHandle, card: 'summary_large_image', - title: 'PAWÒL-NU. Paroles et traductions.', - description: 'PAWÒL-NU a pour but de promouvoir le Medukam (ou Wanni Wannan) et les productions afro-diasporiques.', - creator: '@OrganisationKA', + title: siteName, + description: siteDescription, + creator: twitterHandle, images: { - url: 'https://pawol.nu/logo-512x512.png', - alt: 'PAWÒL-NU Logo', + url: `${siteUrl}/logo-512x512.png`, + alt: `${siteName} Logo`, }, } } @@ -44,30 +53,36 @@ export const metadata = { const jsonLd = { '@context': 'https://schema.org', '@type': 'Organization', - url: 'https://pawol.nu', - email: 'kontak@o-k-i.net', - keywords: ['OKI', 'PAWÒL-NU', 'Paroles', 'Pawol', 'Medukam', 'Wanni Wannan'], - legalName: 'PAWÒL-NU', - location: 'Guadeloupe' + url: siteUrl, + email: orgEmail, + keywords: [orgName, siteName, 'Paroles', 'Pawol'], + legalName: siteName, + location: orgLocation, } export default async function RootLayout({children}) { + const inner = ( + <> + + + + {children} + +
+