From 7370bef3f0577f7e0e8a32a20a1df3707369af02 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Wed, 23 Aug 2023 14:18:09 +0200
Subject: [PATCH] add ma bulle
---
docs/ecolyo/technical/architecture.drawio | 74 ++++++++++++-----------
docs/ecolyo/technical/architecture.md | 4 +-
2 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/docs/ecolyo/technical/architecture.drawio b/docs/ecolyo/technical/architecture.drawio
index 94ac76f..b02d26b 100644
--- a/docs/ecolyo/technical/architecture.drawio
+++ b/docs/ecolyo/technical/architecture.drawio
@@ -1,9 +1,12 @@
<mxfile host="65bd71144e">
<diagram id="rQLdPiCnsRMsCoYtmiVD" name="Page-1">
- <mxGraphModel dx="1555" dy="827" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+ <mxGraphModel dx="1955" dy="1996" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
+ <mxCell id="117" value="<b><font style="font-size: 15px;">Ma bulle</font></b>" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;" vertex="1" parent="1">
+ <mxGeometry x="100" y="90" width="670" height="460" as="geometry"/>
+ </mxCell>
<mxCell id="16" value="Cozy Stack (SaaS chez Cozy)" style="rounded=1;arcSize=3;strokeColor=#000000;fillColor=#BBE6F3;gradientColor=none;strokeWidth=1;verticalAlign=top;fontStyle=5;fontSize=14;flipH=0;" parent="1" vertex="1">
<mxGeometry x="280" y="150" width="440" height="360" as="geometry"/>
</mxCell>
@@ -26,13 +29,13 @@
<mxCell id="41" style="edgeStyle=none;rounded=0;html=1;strokeColor=#666666;fontSize=10;" parent="1" source="15" target="4" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
- <mxCell id="42" value="accède <br>par navigateur" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=10;" parent="41" vertex="1" connectable="0">
+ <mxCell id="42" value="accède <br>par navigateur <br>/ application cozy" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=10;" parent="41" vertex="1" connectable="0">
<mxGeometry x="0.4667" y="1" relative="1" as="geometry">
<mxPoint x="-26" y="1" as="offset"/>
</mxGeometry>
</mxCell>
<mxCell id="15" value="Utilisateur" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="10" y="290" width="30" height="60" as="geometry"/>
+ <mxGeometry x="-20" y="290" width="30" height="60" as="geometry"/>
</mxCell>
<mxCell id="30" style="edgeStyle=none;html=1;strokeColor=#3399FF;fontSize=14;" parent="1" source="22" target="20" edge="1">
<mxGeometry relative="1" as="geometry"/>
@@ -43,7 +46,7 @@
</mxGeometry>
</mxCell>
<mxCell id="32" value="" style="group" parent="1" vertex="1" connectable="0">
- <mxGeometry x="800" y="255" width="160" height="200" as="geometry"/>
+ <mxGeometry x="880" y="260" width="160" height="200" as="geometry"/>
</mxCell>
<mxCell id="22" value="Partenaires" style="rounded=1;arcSize=3;strokeColor=#000000;fillColor=none;gradientColor=none;strokeWidth=1;verticalAlign=top;fontStyle=5;fontSize=14;" parent="32" vertex="1">
<mxGeometry width="160" height="200" as="geometry"/>
@@ -79,7 +82,7 @@
<mxGeometry y="92" width="110" height="34.5" as="geometry"/>
</mxCell>
<mxCell id="38" value="Statistiques Matomo" style="rounded=1;whiteSpace=wrap;html=1;flipH=0;flipV=0;" parent="1" vertex="1">
- <mxGeometry x="130" y="510" width="120" height="40" as="geometry"/>
+ <mxGeometry x="130" y="585" width="120" height="40" as="geometry"/>
</mxCell>
<mxCell id="39" value="Statistiques DACC" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#BBE6F3;strokeColor=#6c8ebf;" parent="1" vertex="1">
<mxGeometry x="330" y="365" width="110" height="40" as="geometry"/>
@@ -101,13 +104,6 @@
<mxCell id="55" value="Stockage des<br>&nbsp;données" style="edgeStyle=none;rounded=0;html=1;strokeColor=#666666;fontSize=10;exitX=-0.002;exitY=0.361;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="20" target="54" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
- <mxCell id="59" style="edgeStyle=none;rounded=0;html=1;strokeColor=#FFCC99;fontSize=10;shape=flexArrow;strokeWidth=2;width=5.822784810126582;endSize=3.7721518987341773;endWidth=9.158788655664155;" parent="1" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="320" y="585" as="sourcePoint"/>
- <mxPoint x="400" y="585" as="targetPoint"/>
- <Array as="points"/>
- </mxGeometry>
- </mxCell>
<mxCell id="61" style="edgeStyle=none;rounded=0;html=1;strokeColor=#FFCC99;fontSize=10;shape=flexArrow;strokeWidth=2;width=5.822784810126582;endSize=3.7721518987341773;endWidth=9.158788655664155;" parent="1" source="4" target="38" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="305.8052681503102" y="690" as="sourcePoint"/>
@@ -120,9 +116,6 @@
<mxPoint y="1" as="offset"/>
</mxGeometry>
</mxCell>
- <mxCell id="64" value="Données anonymisées" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="1" vertex="1">
- <mxGeometry x="440" y="560" width="160" height="40" as="geometry"/>
- </mxCell>
<mxCell id="65" style="edgeStyle=none;rounded=0;html=1;strokeColor=#FFCC99;fontSize=10;shape=flexArrow;strokeWidth=2;width=5.822784810126582;endSize=3.7721518987341773;endWidth=9.158788655664155;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1.007;exitY=0.93;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="4" target="40" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="329.9952681503099" y="660.0000000000001" as="sourcePoint"/>
@@ -172,7 +165,7 @@
</mxGeometry>
</mxCell>
<mxCell id="79" value="" style="group" parent="1" vertex="1" connectable="0">
- <mxGeometry x="140" y="20" width="290" height="99.5" as="geometry"/>
+ <mxGeometry x="130" y="-60" width="290" height="99.5" as="geometry"/>
</mxCell>
<mxCell id="33" value="Ecolyo Agent (OpenShift chezSynAAps)" style="rounded=1;arcSize=3;strokeColor=#d6b656;fillColor=#fff2cc;strokeWidth=1;verticalAlign=top;fontStyle=5;labelBackgroundColor=none;" parent="79" vertex="1">
<mxGeometry width="290" height="99.5" as="geometry"/>
@@ -184,22 +177,7 @@
<mxGeometry x="30" y="40" width="120" height="40" as="geometry"/>
</mxCell>
<mxCell id="84" value="Proxies" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
- <mxGeometry x="740" y="380" width="40" height="30" as="geometry"/>
- </mxCell>
- <mxCell id="90" value="<u>Légende</u>" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="1" vertex="1">
- <mxGeometry x="370" y="530" width="110" height="30" as="geometry"/>
- </mxCell>
- <mxCell id="97" value="Élément" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
- <mxGeometry x="320" y="610" width="80" height="20" as="geometry"/>
- </mxCell>
- <mxCell id="98" value="Élément" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
- <mxGeometry x="320" y="650" width="80" height="20" as="geometry"/>
- </mxCell>
- <mxCell id="100" value="Résponsabilité Métropole" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="1" vertex="1">
- <mxGeometry x="440" y="600" width="160" height="40" as="geometry"/>
- </mxCell>
- <mxCell id="102" value="Responsabilité Cozy" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="1" vertex="1">
- <mxGeometry x="440" y="640" width="160" height="40" as="geometry"/>
+ <mxGeometry x="800" y="390" width="40" height="30" as="geometry"/>
</mxCell>
<mxCell id="103" value="Services" style="sketch=0;pointerEvents=1;shadow=0;dashed=0;html=1;strokeColor=none;fillColor=#505050;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;outlineConnect=0;align=center;shape=mxgraph.office.communications.exchange_active_sync;" parent="1" vertex="1">
<mxGeometry x="620" y="180" width="29" height="29" as="geometry"/>
@@ -213,7 +191,7 @@
</mxGeometry>
</mxCell>
<mxCell id="110" value="data.grandlyon.com" style="rounded=1;whiteSpace=wrap;html=1;flipH=0;flipV=0;" parent="1" vertex="1">
- <mxGeometry x="820" y="174.5" width="120" height="40" as="geometry"/>
+ <mxGeometry x="900" y="169" width="120" height="40" as="geometry"/>
</mxCell>
<mxCell id="114" style="edgeStyle=none;html=1;entryX=-0.013;entryY=0.858;entryDx=0;entryDy=0;entryPerimeter=0;dashed=1;" parent="1" source="113" target="4" edge="1">
<mxGeometry relative="1" as="geometry">
@@ -228,11 +206,39 @@
</mxGeometry>
</mxCell>
<mxCell id="113" value="France Connect" style="rounded=1;whiteSpace=wrap;html=1;flipH=0;flipV=0;" parent="1" vertex="1">
- <mxGeometry x="10" y="450" width="100" height="25" as="geometry"/>
+ <mxGeometry x="-20" y="440" width="100" height="25" as="geometry"/>
</mxCell>
<mxCell id="116" value="Serveur mail" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#BBE6F3;" parent="1" vertex="1">
<mxGeometry x="337.5" y="225" width="95" height="30" as="geometry"/>
</mxCell>
+ <mxCell id="118" value="" style="group" vertex="1" connectable="0" parent="1">
+ <mxGeometry x="400" y="580" width="280" height="150" as="geometry"/>
+ </mxCell>
+ <mxCell id="59" style="edgeStyle=none;rounded=0;html=1;strokeColor=#FFCC99;fontSize=10;shape=flexArrow;strokeWidth=2;width=5.822784810126582;endSize=3.7721518987341773;endWidth=9.158788655664155;" parent="118" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint y="55" as="sourcePoint"/>
+ <mxPoint x="80" y="55" as="targetPoint"/>
+ <Array as="points"/>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="64" value="Données anonymisées" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="118" vertex="1">
+ <mxGeometry x="120" y="30" width="160" height="40" as="geometry"/>
+ </mxCell>
+ <mxCell id="90" value="<u>Légende</u>" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="118" vertex="1">
+ <mxGeometry x="50" width="110" height="30" as="geometry"/>
+ </mxCell>
+ <mxCell id="97" value="Élément" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="118" vertex="1">
+ <mxGeometry y="80" width="80" height="20" as="geometry"/>
+ </mxCell>
+ <mxCell id="98" value="Élément" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="118" vertex="1">
+ <mxGeometry y="120" width="80" height="20" as="geometry"/>
+ </mxCell>
+ <mxCell id="100" value="Résponsabilité Métropole" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="118" vertex="1">
+ <mxGeometry x="120" y="70" width="160" height="40" as="geometry"/>
+ </mxCell>
+ <mxCell id="102" value="Responsabilité Cozy" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;labelBackgroundColor=none;fontSize=10;" parent="118" vertex="1">
+ <mxGeometry x="120" y="110" width="160" height="40" as="geometry"/>
+ </mxCell>
</root>
</mxGraphModel>
</diagram>
diff --git a/docs/ecolyo/technical/architecture.md b/docs/ecolyo/technical/architecture.md
index 6464103..bf25d3d 100644
--- a/docs/ecolyo/technical/architecture.md
+++ b/docs/ecolyo/technical/architecture.md
@@ -2,9 +2,9 @@
## Architecture schema
-
+[Click here to open in full screen](./architecture.svg)
-[Full page link](./architecture.svg)
+
<!-- DEV NOTE use `hediet.vscode-drawio` to edit with VSCode. Then export it to architecture.svg -->
## Old diagram
--
GitLab