11 Commits

Author SHA1 Message Date
Jules Neny
e613fc1ca3 merge(v12-q): iframe AEP forcé desktop transform scale 2026-05-11 18:43:06 +02:00
Jules Neny
d12f77554f merge(v12-n): Carte O fusion noeud central + palette minimaliste 2026-05-11 18:43:06 +02:00
Jules Neny
397484a35e merge(v12-m): header bandeau SiteHeader + titre Trans-Former/Jules Neny 2026-05-11 18:42:50 +02:00
Jules Neny
3f2783e3fc feat(v12-n): Carte O fusion noeud central + palette minimaliste encre/papier/ocre
- YAML: fusion 3 noeuds confus (centre + ncs-politique + medecine-corps-social) en 1 seul noeud central 'Contrat social + Medecine du corps social'
- Build script: toutes les thematiques rattachees directement au centre (suppression mapping NCS/MDCS), radius central 30px, projets 18px
- CarteO.vue palette V1.2: central #0F172A (encre), essais #FFFFFF stroke encre, projets #B45309 (ocre conserve)
- Labels: inscrit dans le cercle (blanc) pour central+projets, a droite (encre douce) pour essais
- Label central long split sur 2-3 lignes via splitCentralLabel()
- Background: #FAFAF7 (papier, raccord colonnes laterales)
- Liens: #94A3B8 opacity 0.4 1px

17 nodes / 19 edges. Build SSR 5 pages prerender + server, 0 warning.
2026-05-11 18:42:06 +02:00
Jules Neny
3ba4628818 feat(v12-m): header bandeau Trans-Former / Jules Neny / baseline palette terre 2026-05-11 18:41:51 +02:00
Jules Neny
7791054ca0 feat(v12-q): iframe AEP forcé desktop via transform scale + viewport 1440px 2026-05-11 18:40:50 +02:00
Jules Neny
78dde6a2a3 merge(v12-r): col-centre default 1/3 + 2/3 (vs 50/50) 2026-05-11 18:34:39 +02:00
Jules Neny
3360daa61f merge(v12-l): footer 1-line 3-zones logos RS palette terre 2026-05-11 18:34:39 +02:00
Jules Neny
d2d3629965 merge(v12-k): nav gauche palette terre + sub-pills Court/Article 2026-05-11 18:34:39 +02:00
Jules Neny
6ea256f8a4 feat(v12-l): footer 1-line 3-zones (nav + subscribe + logos RS terre) 2026-05-11 18:33:46 +02:00
Jules Neny
95b75d4866 feat(v12-k): nav gauche palette terre + sub-pills Court/Article 2026-05-11 18:32:37 +02:00
11 changed files with 344 additions and 190 deletions

View File

@@ -8,26 +8,14 @@
version: "1.1" version: "1.1"
centre: centre:
id: "nouveau-contrat-social" id: "contrat-social-medecine-corps-social"
label: "Nouveau Contrat Social" label: "Contrat social + Medecine du corps social"
niveau: 0 niveau: 0
nature: essai nature: essai
statut: gestation statut: gestation
resume: "Assemblage de tout ce que j'ecris qui s'entrechoque - inventer un nouveau contrat social." resume: "Manifeste central AEP : inventer un nouveau contrat social et diagnostiquer/soigner les pathologies du corps social."
concepts_force: concepts_force: []
- id: "ncs-politique"
label: "Nouveau contrat social"
niveau: 1
nature: essai
statut: gestation
resume: "L'ecriture politique d'un futur habitable - essai central AEP."
- id: "medecine-corps-social"
label: "Medecine du corps social"
niveau: 1
nature: essai
statut: gestation
resume: "Diagnostiquer et soigner les pathologies du corps social - concept AEP mdcs."
thematiques: thematiques:
- id: "systemique" - id: "systemique"

View File

@@ -1,35 +1,15 @@
{ {
"version": "1.1", "version": "1.1",
"generatedAt": "2026-05-11T13:04:29.806Z", "generatedAt": "2026-05-11T16:41:21.600Z",
"nodes": [ "nodes": [
{ {
"id": "nouveau-contrat-social", "id": "contrat-social-medecine-corps-social",
"label": "Nouveau Contrat Social", "label": "Contrat social + Medecine du corps social",
"niveau": 0, "niveau": 0,
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": "Assemblage de tout ce que j'ecris qui s'entrechoque - inventer un nouveau contrat social.", "resume": "Manifeste central AEP : inventer un nouveau contrat social et diagnostiquer/soigner les pathologies du corps social.",
"radius": 28, "radius": 30,
"family": "concept"
},
{
"id": "ncs-politique",
"label": "Nouveau contrat social",
"niveau": 1,
"nature": "essai",
"statut": "gestation",
"resume": "L'ecriture politique d'un futur habitable - essai central AEP.",
"radius": 18,
"family": "concept"
},
{
"id": "medecine-corps-social",
"label": "Medecine du corps social",
"niveau": 1,
"nature": "essai",
"statut": "gestation",
"resume": "Diagnostiquer et soigner les pathologies du corps social - concept AEP mdcs.",
"radius": 18,
"family": "concept" "family": "concept"
}, },
{ {
@@ -39,7 +19,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -49,7 +29,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -59,7 +39,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -69,7 +49,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -79,7 +59,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -89,7 +69,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -99,7 +79,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -109,7 +89,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -119,7 +99,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -129,7 +109,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -139,7 +119,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -149,7 +129,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -159,7 +139,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -169,7 +149,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -179,7 +159,7 @@
"nature": "essai", "nature": "essai",
"statut": "gestation", "statut": "gestation",
"resume": null, "resume": null,
"radius": 10, "radius": 12,
"family": "concept" "family": "concept"
}, },
{ {
@@ -189,77 +169,69 @@
"nature": "projet", "nature": "projet",
"statut": "gestation", "statut": "gestation",
"resume": "Transport, mobilite, industrie, politique - projet archi. Exemple de projet archi relie aux thematiques AEP.", "resume": "Transport, mobilite, industrie, politique - projet archi. Exemple de projet archi relie aux thematiques AEP.",
"radius": 14, "radius": 18,
"family": "ressource" "family": "ressource"
} }
], ],
"edges": [ "edges": [
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "ncs-politique"
},
{
"source": "nouveau-contrat-social",
"target": "medecine-corps-social"
},
{
"source": "ncs-politique",
"target": "systemique" "target": "systemique"
}, },
{ {
"source": "ncs-politique", "source": "contrat-social-medecine-corps-social",
"target": "pratiques-collectives" "target": "pratiques-collectives"
}, },
{ {
"source": "medecine-corps-social", "source": "contrat-social-medecine-corps-social",
"target": "art-narration" "target": "art-narration"
}, },
{ {
"source": "ncs-politique", "source": "contrat-social-medecine-corps-social",
"target": "pouvoir-domination" "target": "pouvoir-domination"
}, },
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "medias-critique" "target": "medias-critique"
}, },
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "justice-securite" "target": "justice-securite"
}, },
{ {
"source": "medecine-corps-social", "source": "contrat-social-medecine-corps-social",
"target": "sante-globale" "target": "sante-globale"
}, },
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "agriculture" "target": "agriculture"
}, },
{ {
"source": "ncs-politique", "source": "contrat-social-medecine-corps-social",
"target": "post-croissance" "target": "post-croissance"
}, },
{ {
"source": "medecine-corps-social", "source": "contrat-social-medecine-corps-social",
"target": "anthropocene" "target": "anthropocene"
}, },
{ {
"source": "ncs-politique", "source": "contrat-social-medecine-corps-social",
"target": "education" "target": "education"
}, },
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "urbanisme" "target": "urbanisme"
}, },
{ {
"source": "nouveau-contrat-social", "source": "contrat-social-medecine-corps-social",
"target": "geopolitique" "target": "geopolitique"
}, },
{ {
"source": "medecine-corps-social", "source": "contrat-social-medecine-corps-social",
"target": "ia-technologie" "target": "ia-technologie"
}, },
{ {
"source": "medecine-corps-social", "source": "contrat-social-medecine-corps-social",
"target": "spiritualite" "target": "spiritualite"
}, },
{ {

View File

@@ -11,12 +11,12 @@ const REPO_ROOT = path.resolve(__dirname, '..')
const SOURCE = path.join(REPO_ROOT, 'public/data/carte-o-source.yaml') const SOURCE = path.join(REPO_ROOT, 'public/data/carte-o-source.yaml')
const OUTPUT = path.join(REPO_ROOT, 'public/data/carte-o.json') const OUTPUT = path.join(REPO_ROOT, 'public/data/carte-o.json')
// radius par niveau + nature // radius par niveau + nature (V1.2-N palette minimaliste)
function getRadius(niveau, nature) { function getRadius(niveau, nature) {
if (niveau === 0) return 28 if (niveau === 0) return 30
if (niveau === 1) return 18 if (nature === 'projet') return 18
if (niveau === 2 && nature === 'projet') return 14 if (niveau === 1) return 16
return 10 return 12
} }
// compat backward : nature -> family // compat backward : nature -> family
@@ -24,30 +24,8 @@ function getFamily(nature) {
return nature === 'projet' ? 'ressource' : 'concept' return nature === 'projet' ? 'ressource' : 'concept'
} }
// thematiques rattachees directement au centre (ni ncs-politique ni medecine-corps-social) // V1.2-N : noeud central fusionne -> toutes les thematiques sont rattachees au centre
const CENTRE_THEMATIQUES = new Set([ // (les anciens groupes NCS_THEMATIQUES / MDCS_THEMATIQUES sont supprimes avec leurs sous-noeuds)
'medias-critique',
'justice-securite',
'agriculture',
'urbanisme',
'geopolitique',
])
const NCS_THEMATIQUES = new Set([
'systemique',
'pratiques-collectives',
'pouvoir-domination',
'post-croissance',
'education',
])
const MDCS_THEMATIQUES = new Set([
'art-narration',
'sante-globale',
'spiritualite',
'ia-technologie',
'anthropocene',
])
async function main() { async function main() {
const raw = await fs.readFile(SOURCE, 'utf-8') const raw = await fs.readFile(SOURCE, 'utf-8')
@@ -80,21 +58,17 @@ async function main() {
const centreId = data.centre.id const centreId = data.centre.id
addNode(data.centre) addNode(data.centre)
for (const cf of data.concepts_force) { // concepts_force vide en V1.2-N (fusionne dans le centre)
for (const cf of (data.concepts_force || [])) {
addNode(cf) addNode(cf)
addEdge(centreId, cf.id) addEdge(centreId, cf.id)
} }
// toutes les thematiques rattachees directement au noeud central
for (const th of data.thematiques) { for (const th of data.thematiques) {
addNode(th) addNode(th)
if (NCS_THEMATIQUES.has(th.id)) {
addEdge('ncs-politique', th.id)
} else if (MDCS_THEMATIQUES.has(th.id)) {
addEdge('medecine-corps-social', th.id)
} else if (CENTRE_THEMATIQUES.has(th.id)) {
addEdge(centreId, th.id) addEdge(centreId, th.id)
} }
}
for (const proj of data.projets) { for (const proj of data.projets) {
addNode(proj) addNode(proj)

View File

@@ -5,19 +5,19 @@ const categories = [
{ {
id: 'politique', id: 'politique',
label: 'Politique', label: 'Politique',
color: '#1d4ed8', color: '#B5443A',
hashtags: ['#politique', '#aep-politique'], hashtags: ['#politique', '#aep-politique'],
plateformes: [ plateformes: [
{ id: 'instagram', label: '@aep.politique', url: 'https://www.instagram.com/aep.politique/' }, { id: 'instagram', label: 'Court', url: 'https://www.instagram.com/aep.politique/' },
{ id: 'castopod', label: 'Podcast', url: 'https://podcast.trans-former.fr' }, { id: 'castopod', label: 'Podcast', url: 'https://podcast.trans-former.fr' },
{ id: 'substack', label: 'Substack', url: 'https://julesneny.substack.com' }, { id: 'substack', label: 'Article', url: 'https://julesneny.substack.com' },
], ],
hasSelector: true, hasSelector: true,
}, },
{ {
id: 'art', id: 'art',
label: 'Art', label: 'Art',
color: '#dc2626', color: '#5B6B3A',
hashtags: ['#peinture', '#art'], hashtags: ['#peinture', '#art'],
plateformes: [ plateformes: [
{ id: 'instagram', label: '@julesneny', url: 'https://www.instagram.com/julesneny/' }, { id: 'instagram', label: '@julesneny', url: 'https://www.instagram.com/julesneny/' },
@@ -27,7 +27,7 @@ const categories = [
{ {
id: 'outils', id: 'outils',
label: 'Outils', label: 'Outils',
color: '#16a34a', color: '#475569',
hashtags: ['#stack', '#building-public'], hashtags: ['#stack', '#building-public'],
plateformes: [ plateformes: [
{ id: 'gitea', label: 'Gitea', url: 'https://git.trans-former.fr/jules' }, { id: 'gitea', label: 'Gitea', url: 'https://git.trans-former.fr/jules' },
@@ -68,7 +68,7 @@ const categories = [
type="button" type="button"
data-platform-id={p.id} data-platform-id={p.id}
class="platform-pill" class="platform-pill"
style="font-family:'Courier New',Courier,monospace;font-size:12px;padding:2px 8px;border-radius:12px;cursor:pointer;border:1px solid #1d4ed8;background:transparent;color:#1d4ed8;" style="font-family:'Courier New',Courier,monospace;font-size:12px;padding:2px 8px;border-radius:12px;cursor:pointer;border:1px solid #B5443A;background:transparent;color:#B5443A;"
> >
{p.label} {p.label}
</button> </button>
@@ -219,11 +219,11 @@ const categories = [
pills.forEach((pill) => { pills.forEach((pill) => {
const pid = pill.dataset.platformId; const pid = pill.dataset.platformId;
if (!active || pid === active) { if (!active || pid === active) {
pill.style.background = '#1d4ed8'; pill.style.background = '#B5443A';
pill.style.color = '#fff'; pill.style.color = '#fff';
} else { } else {
pill.style.background = 'transparent'; pill.style.background = 'transparent';
pill.style.color = '#1d4ed8'; pill.style.color = '#B5443A';
} }
}); });
}; };

View File

@@ -1,36 +1,94 @@
--- ---
// Footer.astro - CTA infolettre Kit + nav footer // Footer.astro - V1.2-L : 1 ligne 3 zones (nav / subscribe / logos RS)
// Style monochrome encre #0F172A palette terre V1.2
--- ---
<footer class="border-t border-neutral-200 px-6 py-8 text-sm bg-white"> <footer class="border-t border-neutral-200 px-6 py-4 bg-[#FAFAF7] text-[#0F172A]">
<div class="max-w-3xl mx-auto"> <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-3 md:gap-6">
<h3 class="font-semibold mb-1" style="font-family: 'Courier New', Courier, monospace;">
S'abonner a la lettre <!-- ZONE GAUCHE : liens nav -->
</h3> <nav class="flex gap-4 text-xs justify-center md:justify-start">
<p class="text-neutral-600 text-xs mb-3"> <a href="/manifeste" class="opacity-60 hover:opacity-100 transition-opacity">Manifeste</a>
1-2 emails par mois - pas de spam - desinscription en 1 clic. <a href="/a-propos" class="opacity-60 hover:opacity-100 transition-opacity">A propos</a>
</p> <a href="/mentions-legales" class="opacity-60 hover:opacity-100 transition-opacity">Mentions legales</a>
<form id="subscribe-form" class="flex gap-2 max-w-md"> </nav>
<!-- ZONE CENTRE : subscribe form compact (endpoint /api/subscribe V1.1-I) -->
<div class="flex flex-col items-center gap-1">
<form id="subscribe-form" class="flex gap-2 items-center">
<input <input
type="email" type="email"
name="email" name="email"
required required
placeholder="ton@email.fr" placeholder="ton@email.fr"
class="flex-1 px-3 py-2 border border-neutral-300 rounded-lg text-sm focus:outline-none focus:border-neutral-900" class="px-3 py-1.5 border border-neutral-300 rounded text-xs focus:outline-none focus:border-[#0F172A] bg-white"
/> />
<button <button
type="submit" type="submit"
class="px-4 py-2 bg-neutral-900 text-white rounded-lg text-sm hover:bg-neutral-700 transition-colors" class="px-3 py-1.5 bg-[#0F172A] text-white rounded text-xs hover:bg-[#475569] transition-colors whitespace-nowrap"
> >
s'abonner s'abonner
</button> </button>
</form> </form>
<p id="subscribe-msg" class="mt-2 text-xs text-neutral-500 min-h-[1rem]"></p> <p id="subscribe-msg" class="text-[10px] text-neutral-500 min-h-[0.75rem]"></p>
<nav class="mt-6 flex flex-wrap gap-4 text-xs text-neutral-500"> </div>
<a href="/manifeste" class="hover:text-neutral-900">Manifeste</a>
<a href="/a-propos" class="hover:text-neutral-900">A propos</a> <!-- ZONE DROITE : logos RS cliquables (SVG inline, fill #0F172A 60%) -->
<a href="/mentions-legales" class="hover:text-neutral-900">Mentions legales</a> <div class="flex gap-3 items-center justify-center md:justify-end text-[#0F172A]">
<a href="https://www.instagram.com/aep.politique/" target="_blank" rel="noopener" class="hover:text-neutral-900">@aep.politique</a> <!-- Instagram -->
</nav> <a
href="https://www.instagram.com/aep.politique/"
target="_blank"
rel="noopener noreferrer"
aria-label="Instagram @aep.politique"
class="opacity-60 hover:opacity-100 transition-opacity"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-[18px] h-[18px] md:w-5 md:h-5" fill="currentColor" aria-hidden="true">
<path d="M12 2.163c3.204 0 3.584.012 4.85.07 1.366.062 2.633.336 3.608 1.311.975.975 1.249 2.242 1.311 3.608.058 1.266.069 1.646.069 4.85s-.012 3.584-.07 4.85c-.062 1.366-.336 2.633-1.311 3.608-.975.975-2.242 1.249-3.608 1.311-1.266.058-1.646.07-4.85.07s-3.584-.012-4.85-.07c-1.366-.062-2.633-.336-3.608-1.311-.975-.975-1.249-2.242-1.311-3.608C2.175 15.647 2.163 15.267 2.163 12s.012-3.584.07-4.85c.062-1.366.336-2.633 1.311-3.608.975-.975 2.242-1.249 3.608-1.311 1.266-.058 1.646-.07 4.85-.07zm0 1.838c-3.15 0-3.522.012-4.766.069-1.024.047-1.58.218-1.95.362-.49.19-.84.418-1.207.786-.367.367-.595.717-.786 1.207-.144.37-.315.926-.362 1.95-.057 1.244-.069 1.616-.069 4.766s.012 3.522.069 4.766c.047 1.024.218 1.58.362 1.95.19.49.418.84.786 1.207.367.367.717.595 1.207.786.37.144.926.315 1.95.362 1.244.057 1.616.069 4.766.069s3.522-.012 4.766-.069c1.024-.047 1.58-.218 1.95-.362.49-.19.84-.418 1.207-.786.367-.367.595-.717.786-1.207.144-.37.315-.926.362-1.95.057-1.244.069-1.616.069-4.766s-.012-3.522-.069-4.766c-.047-1.024-.218-1.58-.362-1.95-.19-.49-.418-.84-.786-1.207-.367-.367-.717-.595-1.207-.786-.37-.144-.926-.315-1.95-.362C15.522 4.013 15.15 4.001 12 4.001zm0 3.135a4.864 4.864 0 110 9.728 4.864 4.864 0 010-9.728zm0 8.027a3.162 3.162 0 100-6.325 3.162 3.162 0 000 6.325zm6.187-8.249a1.137 1.137 0 11-2.275 0 1.137 1.137 0 012.275 0z"/>
</svg>
</a>
<!-- GitHub (TODO: si 404 connu, fallback https://git.trans-former.fr/jules Gitea) -->
<a
href="https://github.com/julesneny"
target="_blank"
rel="noopener noreferrer"
aria-label="GitHub"
class="opacity-60 hover:opacity-100 transition-opacity"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-[18px] h-[18px] md:w-5 md:h-5" fill="currentColor" aria-hidden="true">
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
</svg>
</a>
<!-- LinkedIn TODO: confirmer URL LinkedIn Jules -->
<a
href="https://www.linkedin.com/in/jules-neny/"
target="_blank"
rel="noopener noreferrer"
aria-label="LinkedIn"
class="opacity-60 hover:opacity-100 transition-opacity"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-[18px] h-[18px] md:w-5 md:h-5" fill="currentColor" aria-hidden="true">
<path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433a2.062 2.062 0 01-2.063-2.065 2.063 2.063 0 112.063 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/>
</svg>
</a>
<!-- Substack -->
<a
href="https://julesneny.substack.com"
target="_blank"
rel="noopener noreferrer"
aria-label="Substack"
class="opacity-60 hover:opacity-100 transition-opacity"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-[18px] h-[18px] md:w-5 md:h-5" fill="currentColor" aria-hidden="true">
<path d="M22.539 8.242H1.46V5.406h21.08v2.836zM1.46 10.812V24L12 18.11 22.54 24V10.812H1.46zM22.54 0H1.46v2.836h21.08V0z"/>
</svg>
</a>
<!-- TODO V1.3 : ajouter logo Pinterest quand compte créé -->
</div>
</div> </div>
</footer> </footer>

View File

@@ -6,7 +6,7 @@
<nav <nav
id="mobile-tab-bar" id="mobile-tab-bar"
aria-label="Navigation colonnes" aria-label="Navigation colonnes"
class="fixed top-0 left-0 right-0 z-30 h-11 bg-white border-b border-neutral-200 flex items-stretch justify-around md:hidden" class="fixed top-12 left-0 right-0 z-30 h-11 bg-white border-b border-neutral-200 flex items-stretch justify-around md:hidden"
> >
<button <button
type="button" type="button"

View File

@@ -0,0 +1,52 @@
---
// SiteHeader.astro - V1.2-M : bandeau header pleine largeur identite site
// Palette terre figee : papier #FAFAF7, encre #0F172A, encre douce #475569
// Composition retenue : 2 lignes hierarchique
// ligne 1 : "Trans-Former" wordmark dominant (semibold tracking serre)
// ligne 2 : "Jules Neny" + baseline italique cote a cote (separateur point median)
// Rationale : le wordmark domine sans ecraser ; la baseline reste lisible ;
// composition adaptee a un manifeste (hierarchie typographique forte).
// Hauteur : ~64px desktop / ~48px mobile (compacte)
// Baseline raccourcie mobile : "architecture politique du vivant"
---
<header
class="site-header w-full border-b border-[#E5E7EB] bg-[#FAFAF7] text-[#0F172A] px-4 md:px-6 flex items-center"
role="banner"
>
<a
href="/"
class="flex flex-col md:flex-row md:items-baseline gap-x-3 gap-y-0 no-underline text-[#0F172A] hover:text-[#0F172A]"
aria-label="trans-former.fr - retour accueil"
>
<!-- Ligne 1 : wordmark dominant -->
<span
class="font-semibold tracking-tight text-[#0F172A] text-[17px] md:text-[20px] leading-none"
>
Trans-Former
</span>
<!-- Ligne 2 (desktop : inline ; mobile : sous wordmark) : Jules Neny + baseline -->
<span class="flex items-baseline gap-2 text-[#475569] leading-none">
<span class="text-[11px] md:text-[13px]">Jules Neny</span>
<span class="text-[#94A3B8]" aria-hidden="true">·</span>
<!-- Baseline longue : desktop / Baseline courte : mobile -->
<span class="italic text-[11px] md:text-[13px] hidden sm:inline">
architecture d'ecologie politique
</span>
<span class="italic text-[11px] inline sm:hidden">
architecture politique du vivant
</span>
</span>
</a>
</header>
<style>
.site-header {
height: 48px;
}
@media (min-width: 768px) {
.site-header {
height: 64px;
}
}
</style>

View File

@@ -64,32 +64,46 @@ let zoomBehavior: d3.ZoomBehavior<SVGSVGElement, unknown> | null = null
const isMobile = computed(() => width.value < 600) const isMobile = computed(() => width.value < 600)
const nodeRadius = computed(() => isMobile.value ? 10 : 14) const nodeRadius = computed(() => isMobile.value ? 10 : 14)
// V1.2-N palette : encre / papier / ocre
// - central niveau 0 : fill encre #0F172A, label blanc inscrit dans le cercle
// - essais (niveaux 1-2) : fill papier #FFFFFF, stroke encre, label encre a droite
// - projets : fill ocre #B45309, label blanc inscrit dans le cercle
// - statut "edite" : stroke epaissi (l'epaisseur conserve l'info, pas la couleur)
function colorFor(d: SimNode): string { function colorFor(d: SimNode): string {
if (d.nature === 'projet') return '#b45309' if (d.nature === 'projet') return '#B45309'
if (d.niveau === 0) return '#1d4ed8' if (d.niveau === 0) return '#0F172A'
if (d.niveau === 1) return '#2563eb' return '#FFFFFF'
if (d.niveau === 2) return '#60a5fa'
return props.familyColors[d.family] || '#9ca3af'
} }
function getRadius(d: SimNode): number { function getRadius(d: SimNode): number {
return d.radius ?? nodeRadius.value if (d.radius != null) return d.radius
if (d.niveau === 0) return 30
if (d.nature === 'projet') return 18
return nodeRadius.value
} }
function strokeFor(d: SimNode): string { function strokeFor(d: SimNode): string {
return d.statut === 'edite' ? '#0f172a' : '#94a3b8' if (d.nature === 'projet') return '#B45309'
if (d.niveau === 0) return '#0F172A'
return '#0F172A'
} }
function strokeWidthFor(d: SimNode): number { function strokeWidthFor(d: SimNode): number {
return d.statut === 'edite' ? 2.5 : 1 return d.statut === 'edite' ? 2.5 : 1.5
} }
function labelWeightFor(d: SimNode): string { function labelWeightFor(d: SimNode): string {
return d.statut === 'edite' ? 'bold' : 'normal' return d.statut === 'edite' ? 'bold' : 'normal'
} }
// Label inscrit dans le cercle (fond fonce) pour central + projets
function labelInsideFor(d: SimNode): boolean {
return d.niveau === 0 || d.nature === 'projet'
}
function labelColorFor(d: SimNode): string { function labelColorFor(d: SimNode): string {
return d.statut === 'edite' ? '#0f172a' : '#6b7280' if (labelInsideFor(d)) return '#FFFFFF'
return d.statut === 'edite' ? '#0F172A' : '#475569'
} }
function truncate(str: string, max: number): string { function truncate(str: string, max: number): string {
@@ -97,6 +111,27 @@ function truncate(str: string, max: number): string {
return str.length > max ? str.slice(0, max - 1) + '…' : str return str.length > max ? str.slice(0, max - 1) + '…' : str
} }
// Split intelligent du label central sur 2-3 lignes (autour de "+")
function splitCentralLabel(label: string): string[] {
if (!label) return ['']
// priorite : split sur " + " si present
if (label.includes(' + ')) {
const parts = label.split(' + ')
return [parts[0].trim(), '+', parts.slice(1).join(' + ').trim()]
}
// fallback : split a peu pres au milieu sur un espace
if (label.length > 14) {
const mid = Math.floor(label.length / 2)
const left = label.lastIndexOf(' ', mid)
const right = label.indexOf(' ', mid)
const cut = (mid - left <= right - mid && left > 0) ? left : right
if (cut > 0) {
return [label.slice(0, cut).trim(), label.slice(cut).trim()]
}
}
return [label]
}
function buildSimNodes(): SimNode[] { function buildSimNodes(): SimNode[] {
return props.nodes.map(n => ({ ...n })) return props.nodes.map(n => ({ ...n }))
} }
@@ -167,14 +202,14 @@ function render() {
const fontSize = isMobile.value ? 9 : 11 const fontSize = isMobile.value ? 9 : 11
// Liens // Liens — gris doux papier
gLinks! gLinks!
.selectAll<SVGLineElement, SimLink>('line') .selectAll<SVGLineElement, SimLink>('line')
.data(simLinks) .data(simLinks)
.join('line') .join('line')
.attr('stroke', '#94a3b8') .attr('stroke', '#94A3B8')
.attr('stroke-opacity', 0.45) .attr('stroke-opacity', 0.4)
.attr('stroke-width', 1.2) .attr('stroke-width', 1)
// Noeuds = groupe <g> par node // Noeuds = groupe <g> par node
const nodeGroups = gNodes! const nodeGroups = gNodes!
@@ -202,17 +237,58 @@ function render() {
.attr('stroke', d => strokeFor(d)) .attr('stroke', d => strokeFor(d))
.attr('stroke-width', d => strokeWidthFor(d)) .attr('stroke-width', d => strokeWidthFor(d))
// Label // Label : inscrit dans le cercle pour central + projets, a droite sinon
nodeGroups.append('text') // Pour le noeud central (label long), on passe en multi-lignes
.attr('text-anchor', 'start') nodeGroups.each(function (d) {
const g = d3.select(this)
const inside = labelInsideFor(d)
if (inside && d.niveau === 0) {
// Noeud central : label en 2 lignes inscrites au centre
const parts = splitCentralLabel(d.label)
const lineHeight = isMobile.value ? 10 : 12
const fs = isMobile.value ? 9 : 11
const startY = -((parts.length - 1) * lineHeight) / 2
parts.forEach((line, i) => {
g.append('text')
.attr('text-anchor', 'middle')
.attr('dominant-baseline', 'central') .attr('dominant-baseline', 'central')
.attr('dx', d => getRadius(d) + 4) .attr('x', 0)
.attr('y', startY + i * lineHeight)
.attr('font-size', fs)
.attr('font-family', 'system-ui, sans-serif')
.attr('font-weight', 'bold')
.attr('fill', '#FFFFFF')
.attr('pointer-events', 'none')
.text(line)
})
} else if (inside) {
// Projets : label centre dans le cercle (court)
g.append('text')
.attr('text-anchor', 'middle')
.attr('dominant-baseline', 'central')
.attr('x', 0)
.attr('y', 0)
.attr('font-size', fontSize) .attr('font-size', fontSize)
.attr('font-family', 'system-ui, sans-serif') .attr('font-family', 'system-ui, sans-serif')
.attr('font-weight', d => labelWeightFor(d)) .attr('font-weight', labelWeightFor(d))
.attr('fill', d => labelColorFor(d)) .attr('fill', '#FFFFFF')
.attr('pointer-events', 'none') .attr('pointer-events', 'none')
.text(d => truncate(d.label, isMobile.value ? 18 : 30)) .text(truncate(d.label, 6))
} else {
// Essais : label a droite du cercle
g.append('text')
.attr('text-anchor', 'start')
.attr('dominant-baseline', 'central')
.attr('dx', getRadius(d) + 4)
.attr('font-size', fontSize)
.attr('font-family', 'system-ui, sans-serif')
.attr('font-weight', labelWeightFor(d))
.attr('fill', labelColorFor(d))
.attr('pointer-events', 'none')
.text(truncate(d.label, isMobile.value ? 18 : 30))
}
})
// Tooltip <title> // Tooltip <title>
nodeGroups.append('title') nodeGroups.append('title')
@@ -325,7 +401,7 @@ onUnmounted(() => {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; position: relative;
background: #fafafa; background: #FAFAF7;
overflow: hidden; overflow: hidden;
} }

View File

@@ -14,8 +14,27 @@ interface JournalItem {
const selectedItem = ref<JournalItem | null>(null) const selectedItem = ref<JournalItem | null>(null)
const iframeRef = ref<HTMLIFrameElement | null>(null) const iframeRef = ref<HTMLIFrameElement | null>(null)
const wrapperRef = ref<HTMLDivElement | null>(null)
const skeletonHidden = ref(false) const skeletonHidden = ref(false)
// Force rendu desktop de l'iframe AEP : viewport simulée 1440px + scale dynamique
const VIEWPORT_W = 1440
const iframeScale = ref(0.42)
let resizeObs: ResizeObserver | null = null
const updateScale = () => {
if (!wrapperRef.value) return
const w = wrapperRef.value.clientWidth
if (w > 0) iframeScale.value = w / VIEWPORT_W
}
const iframeStyle = computed(() => ({
width: VIEWPORT_W + 'px',
height: (100 / iframeScale.value) + '%',
transform: `scale(${iframeScale.value})`,
transformOrigin: '0 0',
}))
const onJournalItemClick = (e: Event) => { const onJournalItemClick = (e: Event) => {
const ce = e as CustomEvent const ce = e as CustomEvent
if (ce.detail?.item) selectedItem.value = ce.detail.item if (ce.detail?.item) selectedItem.value = ce.detail.item
@@ -23,9 +42,16 @@ const onJournalItemClick = (e: Event) => {
onMounted(() => { onMounted(() => {
window.addEventListener('journal-item-click', onJournalItemClick as EventListener) window.addEventListener('journal-item-click', onJournalItemClick as EventListener)
if (wrapperRef.value && typeof ResizeObserver !== 'undefined') {
updateScale()
resizeObs = new ResizeObserver(updateScale)
resizeObs.observe(wrapperRef.value)
}
}) })
onUnmounted(() => { onUnmounted(() => {
window.removeEventListener('journal-item-click', onJournalItemClick as EventListener) window.removeEventListener('journal-item-click', onJournalItemClick as EventListener)
resizeObs?.disconnect()
resizeObs = null
}) })
const reset = () => { const reset = () => {
@@ -89,18 +115,19 @@ const formatDate = (iso: string) => {
<!-- DEFAULT : iframe AEP (aucun item selectionne) --> <!-- DEFAULT : iframe AEP (aucun item selectionne) -->
<div v-if="!selectedItem" class="h-full"> <div v-if="!selectedItem" class="h-full">
<div class="relative h-full bg-neutral-100"> <div ref="wrapperRef" class="relative h-full bg-neutral-100 overflow-hidden">
<div <div
v-if="!skeletonHidden" v-if="!skeletonHidden"
id="embed-skeleton" id="embed-skeleton"
class="absolute inset-0 flex items-center justify-center bg-neutral-50 animate-pulse" class="absolute inset-0 flex items-center justify-center bg-neutral-50 animate-pulse z-10"
> >
<span class="text-neutral-400 text-sm">Chargement de la carte AEP...</span> <span class="text-neutral-400 text-sm">Chargement de la carte AEP...</span>
</div> </div>
<iframe <iframe
src="https://aep.trans-former.fr/agences" src="https://aep.trans-former.fr/agences"
title="Carte AEP" title="Carte AEP"
class="w-full h-full border-0 opacity-0 transition-opacity duration-500" class="absolute top-0 left-0 border-0 opacity-0 transition-opacity duration-500"
:style="iframeStyle"
sandbox="allow-scripts allow-same-origin allow-popups allow-forms" sandbox="allow-scripts allow-same-origin allow-popups allow-forms"
@load="onIframeLoad" @load="onIframeLoad"
ref="iframeRef" ref="iframeRef"

View File

@@ -1,6 +1,7 @@
--- ---
import '../styles/global.css'; import '../styles/global.css';
import Footer from '../components/astro/Footer.astro'; import Footer from '../components/astro/Footer.astro';
import SiteHeader from '../components/astro/SiteHeader.astro';
interface Props { interface Props {
title?: string; title?: string;
@@ -28,8 +29,11 @@ const {
<meta name="twitter:title" content={title} /> <meta name="twitter:title" content={title} />
<meta name="twitter:description" content={description} /> <meta name="twitter:description" content={description} />
</head> </head>
<body class="m-0 bg-white text-neutral-900 antialiased"> <body class="m-0 bg-white text-neutral-900 antialiased min-h-screen flex flex-col">
<SiteHeader />
<div class="flex-1 flex flex-col min-h-0">
<slot /> <slot />
</div>
<Footer /> <Footer />
</body> </body>
</html> </html>

View File

@@ -15,15 +15,18 @@ import PopupOnboarding from '../components/astro/PopupOnboarding.astro';
<MobileTabBar /> <MobileTabBar />
<PopupOnboarding /> <PopupOnboarding />
<!-- Desktop : grid 3 colonnes --> <!-- Desktop : grid 3 colonnes (header 64px deja consommes par SiteHeader, on prend le reste) -->
<div class="hidden md:grid md:grid-cols-[320px_1fr_320px] h-screen overflow-hidden"> <div
class="hidden md:grid md:grid-cols-[320px_1fr_320px] overflow-hidden"
style="height: calc(100vh - 64px);"
>
<aside class="border-r border-neutral-200 overflow-y-auto"><ColJournal /></aside> <aside class="border-r border-neutral-200 overflow-y-auto"><ColJournal /></aside>
<main class="overflow-hidden"><ColCentre /></main> <main class="overflow-hidden"><ColCentre /></main>
<aside class="border-l border-neutral-200 overflow-y-auto"><ColInsta /></aside> <aside class="border-l border-neutral-200 overflow-y-auto"><ColInsta /></aside>
</div> </div>
<!-- Mobile : SwipeContainer Vue island - decale de 44px pour la tabbar --> <!-- Mobile : SwipeContainer Vue island - header 48px + tabbar 44px = 92px reserves -->
<div class="md:hidden overflow-hidden" style="height: calc(100dvh - 44px); margin-top: 44px;"> <div class="md:hidden overflow-hidden" style="height: calc(100dvh - 48px - 44px); margin-top: 44px;">
<SwipeContainer client:load> <SwipeContainer client:load>
<ColJournal slot="left" /> <ColJournal slot="left" />
<ColCentre slot="center" /> <ColCentre slot="center" />