release: promote 1.0.3 to production
This commit is contained in:
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
@@ -49,6 +49,7 @@ pipeline {
|
|||||||
env.DEPLOY_NETWORK = 'tiptop-dev'
|
env.DEPLOY_NETWORK = 'tiptop-dev'
|
||||||
|
|
||||||
env.FRONTEND_API_URL = "https://api-dev.dsp5-archi-o24a-4-5-g4.fr"
|
env.FRONTEND_API_URL = "https://api-dev.dsp5-archi-o24a-4-5-g4.fr"
|
||||||
|
env.FRONTEND_GA_ID = ""
|
||||||
|
|
||||||
} else if (env.BRANCH_NAME.startsWith('release-')) {
|
} else if (env.BRANCH_NAME.startsWith('release-')) {
|
||||||
env.DEPLOY_ENABLED = 'true'
|
env.DEPLOY_ENABLED = 'true'
|
||||||
@@ -59,6 +60,7 @@ pipeline {
|
|||||||
env.DEPLOY_NETWORK = 'tiptop-preprod'
|
env.DEPLOY_NETWORK = 'tiptop-preprod'
|
||||||
|
|
||||||
env.FRONTEND_API_URL = "https://api-preprod.dsp5-archi-o24a-4-5-g4.fr"
|
env.FRONTEND_API_URL = "https://api-preprod.dsp5-archi-o24a-4-5-g4.fr"
|
||||||
|
env.FRONTEND_GA_ID = ""
|
||||||
|
|
||||||
} else if (env.BRANCH_NAME == 'main') {
|
} else if (env.BRANCH_NAME == 'main') {
|
||||||
env.DEPLOY_ENABLED = 'true'
|
env.DEPLOY_ENABLED = 'true'
|
||||||
@@ -69,6 +71,7 @@ pipeline {
|
|||||||
env.DEPLOY_NETWORK = 'tiptop-prod'
|
env.DEPLOY_NETWORK = 'tiptop-prod'
|
||||||
|
|
||||||
env.FRONTEND_API_URL = "https://api.dsp5-archi-o24a-4-5-g4.fr"
|
env.FRONTEND_API_URL = "https://api.dsp5-archi-o24a-4-5-g4.fr"
|
||||||
|
env.FRONTEND_GA_ID = "G-4FTNTPJDRJ"
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
env.DEPLOY_ENABLED = 'false'
|
env.DEPLOY_ENABLED = 'false'
|
||||||
@@ -78,6 +81,7 @@ pipeline {
|
|||||||
env.COMPOSE_PROJECT = ''
|
env.COMPOSE_PROJECT = ''
|
||||||
env.DEPLOY_NETWORK = ''
|
env.DEPLOY_NETWORK = ''
|
||||||
env.FRONTEND_API_URL = ''
|
env.FRONTEND_API_URL = ''
|
||||||
|
env.FRONTEND_GA_ID = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Branche : ${env.BRANCH_NAME}"
|
echo "Branche : ${env.BRANCH_NAME}"
|
||||||
@@ -230,6 +234,7 @@ pipeline {
|
|||||||
|
|
||||||
docker build \
|
docker build \
|
||||||
--build-arg VITE_API_URL="${FRONTEND_API_URL}" \
|
--build-arg VITE_API_URL="${FRONTEND_API_URL}" \
|
||||||
|
--build-arg VITE_GA_ID="${FRONTEND_GA_ID}" \
|
||||||
-t "${FRONTEND_IMAGE}:${IMAGE_TAG}" \
|
-t "${FRONTEND_IMAGE}:${IMAGE_TAG}" \
|
||||||
frontend
|
frontend
|
||||||
'''
|
'''
|
||||||
|
|||||||
@@ -8,7 +8,10 @@ RUN npm ci
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
ARG VITE_API_URL
|
ARG VITE_API_URL
|
||||||
|
ARG VITE_GA_ID
|
||||||
|
|
||||||
ENV VITE_API_URL=${VITE_API_URL}
|
ENV VITE_API_URL=${VITE_API_URL}
|
||||||
|
ENV VITE_GA_ID=${VITE_GA_ID}
|
||||||
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
|
|||||||
@@ -1,40 +1,78 @@
|
|||||||
import { useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link, useLocation } from 'react-router-dom'
|
||||||
|
import { initAnalytics, trackPageView } from '../services/analytics'
|
||||||
|
|
||||||
export default function CookieBanner() {
|
export default function CookieBanner() {
|
||||||
const [visible, setVisible] = useState(() => !localStorage.getItem('cookieConsent'))
|
const location = useLocation()
|
||||||
|
|
||||||
if (!visible) return null
|
const [consent, setConsent] = useState(() =>
|
||||||
|
localStorage.getItem('cookieConsent')
|
||||||
|
)
|
||||||
|
|
||||||
|
const visible = consent === null
|
||||||
|
|
||||||
|
// Si le consentement avait déjà été donné lors d'une précédente visite,
|
||||||
|
// Analytics est initialisé au chargement de l'application.
|
||||||
|
useEffect(() => {
|
||||||
|
if (consent !== 'accepted') return
|
||||||
|
|
||||||
|
initAnalytics()
|
||||||
|
trackPageView(location.pathname + location.search)
|
||||||
|
}, [consent, location.pathname, location.search])
|
||||||
|
|
||||||
const handleChoice = (choice) => {
|
const handleChoice = (choice) => {
|
||||||
localStorage.setItem('cookieConsent', choice)
|
localStorage.setItem('cookieConsent', choice)
|
||||||
setVisible(false)
|
setConsent(choice)
|
||||||
|
|
||||||
|
if (choice === 'accepted') {
|
||||||
|
initAnalytics()
|
||||||
|
trackPageView(location.pathname + location.search)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!visible) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed bottom-0 left-0 right-0 z-50 px-4 py-4 bg-white border-t border-gray-200 shadow-lg">
|
<div className="fixed bottom-0 left-0 right-0 z-50 px-4 py-4 bg-white border-t border-gray-200 shadow-lg">
|
||||||
<div className="max-w-5xl mx-auto flex flex-col sm:flex-row items-start sm:items-center gap-4">
|
<div className="max-w-5xl mx-auto flex flex-col sm:flex-row items-start sm:items-center gap-4">
|
||||||
|
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
<p className="text-sm font-semibold text-gray-800 mb-1">Ce site utilise des cookies</p>
|
<p className="text-sm font-semibold text-gray-800 mb-1">
|
||||||
|
Gestion des cookies
|
||||||
|
</p>
|
||||||
|
|
||||||
<p className="text-xs text-gray-500 leading-relaxed">
|
<p className="text-xs text-gray-500 leading-relaxed">
|
||||||
Nous utilisons des cookies essentiels au fonctionnement du site. En continuant votre navigation, vous acceptez leur utilisation conformément à notre{' '}
|
Les cookies strictement nécessaires au fonctionnement du site sont
|
||||||
<Link to="/confidentialite" className="text-[#006B6B] hover:underline">politique de confidentialité</Link>.
|
utilisés automatiquement. Avec votre accord, nous utilisons également
|
||||||
|
Google Analytics afin de mesurer l'audience et améliorer le site. Vous
|
||||||
|
pouvez accepter ou refuser ces cookies statistiques. Consultez notre{' '}
|
||||||
|
<Link
|
||||||
|
to="/confidentialite"
|
||||||
|
className="text-[#006B6B] hover:underline"
|
||||||
|
>
|
||||||
|
politique de confidentialité
|
||||||
|
</Link>.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex gap-2 flex-shrink-0 w-full sm:w-auto">
|
<div className="flex gap-2 flex-shrink-0 w-full sm:w-auto">
|
||||||
<button
|
<button
|
||||||
|
type="button"
|
||||||
onClick={() => handleChoice('refused')}
|
onClick={() => handleChoice('refused')}
|
||||||
className="flex-1 sm:flex-none border border-gray-300 text-gray-600 hover:bg-gray-50 text-sm font-medium px-4 py-2.5 rounded-lg transition-colors"
|
className="flex-1 sm:flex-none border border-gray-300 text-gray-600 hover:bg-gray-50 text-sm font-medium px-4 py-2.5 rounded-lg transition-colors"
|
||||||
>
|
>
|
||||||
Refuser
|
Refuser
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
|
type="button"
|
||||||
onClick={() => handleChoice('accepted')}
|
onClick={() => handleChoice('accepted')}
|
||||||
className="flex-1 sm:flex-none bg-[#006B6B] hover:bg-[#005959] text-white text-sm font-medium px-4 py-2.5 rounded-lg transition-colors"
|
className="flex-1 sm:flex-none bg-[#006B6B] hover:bg-[#005959] text-white text-sm font-medium px-4 py-2.5 rounded-lg transition-colors"
|
||||||
>
|
>
|
||||||
Accepter
|
Accepter
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
33
frontend/src/services/analytics.js
Normal file
33
frontend/src/services/analytics.js
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
const GA_ID = import.meta.env.VITE_GA_ID
|
||||||
|
|
||||||
|
export function initAnalytics() {
|
||||||
|
if (!GA_ID || window.gtag) return
|
||||||
|
|
||||||
|
const script = document.createElement('script')
|
||||||
|
script.async = true
|
||||||
|
script.src = `https://www.googletagmanager.com/gtag/js?id=${GA_ID}`
|
||||||
|
document.head.appendChild(script)
|
||||||
|
|
||||||
|
window.dataLayer = window.dataLayer || []
|
||||||
|
|
||||||
|
window.gtag = function gtag() {
|
||||||
|
window.dataLayer.push(arguments)
|
||||||
|
}
|
||||||
|
|
||||||
|
window.gtag('js', new Date())
|
||||||
|
|
||||||
|
// Les page_view sont envoyées explicitement lors des changements de route React.
|
||||||
|
window.gtag('config', GA_ID, {
|
||||||
|
send_page_view: false,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function trackPageView(path) {
|
||||||
|
if (!GA_ID || !window.gtag) return
|
||||||
|
|
||||||
|
window.gtag('event', 'page_view', {
|
||||||
|
page_path: path,
|
||||||
|
page_location: window.location.href,
|
||||||
|
page_title: document.title,
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ describe('CookieBanner', () => {
|
|||||||
it("s'affiche quand aucun choix n'a été fait", () => {
|
it("s'affiche quand aucun choix n'a été fait", () => {
|
||||||
renderWithProviders(<CookieBanner />)
|
renderWithProviders(<CookieBanner />)
|
||||||
|
|
||||||
expect(screen.getByText(/ce site utilise des cookies/i)).toBeInTheDocument()
|
expect(screen.getByText(/gestion des cookies/i)).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('enregistre le consentement et disparaît quand on accepte', async () => {
|
it('enregistre le consentement et disparaît quand on accepte', async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user