Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixs sur le site #3337

Merged
merged 3 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/site/app/Temoignages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ type TemoignagesProps = {

const Temoignages = ({ titre, contenu }: TemoignagesProps) => {
return contenu.length > 1 ? (
<Section>
<Section containerClassName="max-md:!py-6 md:max-lg:!py-12 lg:!py-18">
{!!titre.trim() && <h2 className="text-center max-md:mb-2">{titre}</h2>}
<TestimonialSlideshow
contenu={contenu}
className="rounded-md md:w-3/4 mx-auto md:border border-primary-3"
className="rounded-md max-md:p-2 md:w-3/4 max-w-full mx-auto md:border border-primary-3"
dotsColor="orange"
backgroundColor="bg-white md:bg-primary-0"
displayButtons={false}
Expand Down
2 changes: 1 addition & 1 deletion packages/site/app/collectivites/CollectiviteSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const CollectiviteSearch = ({
const router = useRouter();

return (
<div className="mx-auto w-96">
<div className="mx-auto w-96 max-w-full">
<Select
placeholder="Rechercher une collectivité"
debounce={500}
Expand Down
17 changes: 7 additions & 10 deletions packages/site/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,13 @@ export default function RootLayout({ children }: { children: JSX.Element }) {
_linkedin_partner_id = "1701996";
window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || [];
window._linkedin_data_partner_ids.push(_linkedin_partner_id);
</script><script type="text/javascript">
(function(l) {
if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])};
window.lintrk.q=[]}
var s = document.getElementsByTagName("script")[0];
var b = document.createElement("script");
b.type = "text/javascript";b.async = true;
b.src = "
https://snap.licdn.com/li.lms-analytics/insight.min.js";
s.parentNode.insertBefore(b, s);})(window.lintrk);

(function(l) { if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])}; window.lintrk.q=[]}
var s = document.getElementsByTagName("script")[0];
var b = document.createElement("script");
b.type = "text/javascript";b.async = true;
b.src = "https://snap.licdn.com/li.lms-analytics/insight.min.js";
s.parentNode.insertBefore(b, s);})(window.lintrk);
`}
</Script>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const TemoignagesPlateforme = ({ temoignages }: TemoignagesPlateformeProps) => {
>
<TestimonialSlideshow
contenu={temoignages}
className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 w-3/4 mx-auto"
className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 md:w-3/4 max-w-full mx-auto"
dotsColor="orange"
displayButtons={false}
autoSlideDelay={12000}
Expand Down
4 changes: 2 additions & 2 deletions packages/site/app/trajectoire/Documentation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Documentation = ({
<Alert description={<Markdown texte={info} />} />
<CardsWrapper cols={2}>
{/* Excel */}
<div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex gap-5">
<div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex max-md:flex-col gap-5">
<div className="shrink-0 w-12 h-12 bg-primary-3 rounded-md flex justify-center items-center">
<Icon icon="table-line" size="xl" className="text-primary-9" />
</div>
Expand All @@ -54,7 +54,7 @@ const Documentation = ({
</div>

{/* PDF */}
<div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex gap-5">
<div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex max-md:flex-col gap-5">
<div className="shrink-0 w-12 h-12 bg-primary-3 rounded-md flex justify-center items-center">
<Icon icon="file-2-line" size="xl" className="text-primary-9" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/site/app/trajectoire/TemoignagesTrajectoire.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const TemoignagesTrajectoire = ({
<Section containerClassName="bg-primary-7 max-md:!py-6 md:max-lg:!py-12 lg:!py-20">
<TestimonialSlideshow
contenu={temoignages}
className="rounded-[10px] md:w-3/4 mx-auto"
className="rounded-[10px] md:w-3/4 max-w-full mx-auto"
dotsColor="orange"
title="Témoignages de collectivités"
displayButtons={false}
Expand Down
8 changes: 4 additions & 4 deletions packages/site/components/layout/AppHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ export type MenuProps = {
function Brand({ menuOpened, setMenuOpened }: MenuProps) {
return (
<div className="fr-header__brand-top">
<div className="fr-header__logo">
<div className="fr-header__logo md:max-xl:p-2 md:max-xl:!mr-0">
<p className="fr-logo">
République
<br />
Française
</p>
</div>
<div className="fr-header__operator">
<div className="fr-header__operator md:max-xl:p-2 md:max-xl:!mr-0">
<div className="fr-grid-row" style={{ minWidth: 160 + 'px' }}>
<Image src="/ademe.jpg" alt="ADEME" width="70" height="80" />
<Image
Expand Down Expand Up @@ -114,7 +114,7 @@ function Body(props: MenuProps) {
<div className="fr-header__body-row">
<div className="fr-header__brand fr-enlarge-link">
<Brand {...props} />
<div className="fr-header__service max-md:text-center">
<div className="fr-header__service max-md:text-center md:max-xl:p-2">
<a
href="/"
aria-current="page"
Expand All @@ -130,7 +130,7 @@ function Body(props: MenuProps) {
</a>
</div>
</div>
<div className="fr-header__tools">
<div className="fr-header__tools md:max-xl:pr-0 md:max-xl:pl-1">
<div className="fr-header__tools-links">
<Links />
</div>
Expand Down
28 changes: 22 additions & 6 deletions packages/site/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,27 @@ export function middleware(request: NextRequest) {
// options de la politique de sécurité
const cspHeader = `
default-src 'self';
script-src ${scriptSrc} *.axept.io *.posthog.com client.crisp.chat *.googletagmanager.com *.adform.net;
script-src ${scriptSrc}
*.axept.io
*.posthog.com
client.crisp.chat
*.googletagmanager.com
*.adform.net
https://snap.licdn.com;
style-src ${styleSrc} client.crisp.chat;
img-src 'self' blob: data: ytimg.com px.ads.linkedin.com server.adform.net https://image.crisp.chat https://client.crisp.chat ${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
'strapiapp',
'media.strapiapp'
)};
img-src 'self' blob: data:
ytimg.com
px.ads.linkedin.com
server.adform.net
https://axeptio.imgix.net
https://favicons.axept.io
https://image.crisp.chat
https://client.crisp.chat
https://px4.ads.linkedin.com
${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
'strapiapp',
'media.strapiapp'
)};
font-src 'self' client.crisp.chat;
object-src 'none';
connect-src 'self'
Expand All @@ -41,7 +56,8 @@ export function middleware(request: NextRequest) {
*.axept.io
client.crisp.chat
wss://client.relay.crisp.chat
wss://stream.relay.crisp.chat;
wss://stream.relay.crisp.chat
https://px.ads.linkedin.com;
base-uri 'self';
form-action 'self';
frame-ancestors 'none';
Expand Down
Loading