From 0a56eef09044c21ecfa974e74dc5080800e9d314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= <loic.poincelet@jdev.fr>
Date: Wed, 18 Dec 2024 16:37:34 +0100
Subject: [PATCH 1/2] Modify Cadastrapp icon

---
 assets/img/cadastrapp_icon.svg     | 59 ++++++++++++++++++++++++++++++
 js/extension/cadastrapp.css        |  4 ++
 js/extension/plugins/Extension.jsx |  5 ++-
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 assets/img/cadastrapp_icon.svg

diff --git a/assets/img/cadastrapp_icon.svg b/assets/img/cadastrapp_icon.svg
new file mode 100644
index 0000000..f00272b
--- /dev/null
+++ b/assets/img/cadastrapp_icon.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="9.6088867mm"
+   height="9.5314484mm"
+   viewBox="0 0 9.6088867 9.5314484"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="interface__cadastrApp.svg"
+   inkscape:export-filename="C:\Users\Agathe\Desktop\Cadastrapp\Refonte_interface\Cadastrapp__interfaceSearchProp.png"
+   inkscape:export-xdpi="150"
+   inkscape:export-ydpi="150"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     lock-margins="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.76666667"
+     inkscape:cx="1211.7391"
+     inkscape:cy="500.21739"
+     inkscape:window-width="2400"
+     inkscape:window-height="1271"
+     inkscape:window-x="2391"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:groupmode="layer"
+     id="g7521"
+     inkscape:label="iconPlugin_active"
+     style="display:inline"
+     sodipodi:insensitive="true"
+     transform="translate(-497.8299,-130.00899)">
+    <path
+       style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke-width:0.0424805"
+       d="m 502.20537,137.90467 c -0.17523,-0.0696 -0.87775,-0.34899 -1.56116,-0.62076 -0.68341,-0.27176 -1.24256,-0.51022 -1.24256,-0.52991 0,-0.0197 0.20486,-0.13218 0.45524,-0.24997 l 0.45524,-0.21419 0.74484,0.30471 c 0.40966,0.16758 1.14214,0.46766 1.62774,0.66683 0.49725,0.20395 0.87613,0.38257 0.86738,0.40893 -0.0204,0.0614 -0.78487,0.36058 -0.92191,0.36081 -0.0584,9e-5 -0.24958,-0.0568 -0.42481,-0.12645 z m 1.50806,-0.7135 c -0.25701,-0.10925 -0.46729,-0.22233 -0.46729,-0.25129 0,-0.0457 1.17494,-0.73085 1.25338,-0.73085 0.027,0 0.59453,0.82693 0.59453,0.86626 0,0.0374 -0.73609,0.32294 -0.822,0.31886 -0.0502,-0.002 -0.30161,-0.0937 -0.55862,-0.20298 z m 1.75394,-0.43685 c -0.30654,-0.41823 -0.50076,-0.71564 -0.50076,-0.76682 0,-0.0317 0.21399,-0.17834 0.47552,-0.32587 l 0.47553,-0.26824 0.46967,0.20271 c 1.07808,0.46529 1.10959,0.4821 1.01911,0.54388 -0.0782,0.0534 -1.62003,0.69689 -1.76581,0.73698 -0.0433,0.0119 -0.10843,-0.0342 -0.17326,-0.12264 z m -2.96464,-0.0662 c -0.33249,-0.12509 -1.51655,-0.62383 -1.54583,-0.65112 -0.0209,-0.0194 0.10669,-0.1067 0.28482,-0.19483 l 0.3226,-0.15963 0.23026,0.0726 c 0.95387,0.30069 1.92996,0.0824 2.66201,-0.59539 l 0.29135,-0.26974 0.27925,0.11179 c 0.1536,0.0615 0.27887,0.13366 0.27839,0.16038 -8.1e-4,0.0402 -2.67136,1.56379 -2.72272,1.55329 -0.009,-0.002 -0.0451,-0.0142 -0.0801,-0.0273 z m -4.20617,-0.34415 c -0.40558,-0.17513 -0.46669,-0.2093 -0.46669,-0.26092 0,-0.0198 0.13859,-0.0942 0.30798,-0.16535 0.16939,-0.0711 0.52782,-0.22684 0.79651,-0.34601 0.26869,-0.11917 0.73358,-0.32259 1.03308,-0.45206 l 0.54455,-0.23538 0.24717,0.22697 c 0.13594,0.12483 0.24932,0.2509 0.25196,0.28015 0.003,0.0293 -0.1338,0.11792 -0.30319,0.19704 -0.62228,0.29068 -1.1248,0.5302 -1.51413,0.72171 -0.21946,0.10795 -0.42974,0.19487 -0.46729,0.19315 -0.0376,-0.002 -0.23103,-0.0734 -0.42995,-0.1593 z m 3.88982,-1.0297 c -0.33246,-0.0556 -0.78326,-0.30276 -1.06944,-0.58629 -0.53716,-0.53218 -0.75326,-1.24259 -0.61057,-2.00718 0.11348,-0.60805 0.60843,-1.22373 1.21671,-1.5135 0.31247,-0.14885 0.36358,-0.1599 0.80664,-0.17434 0.7382,-0.0241 1.16733,0.13746 1.64207,0.61805 0.4593,0.46496 0.6249,0.86794 0.6249,1.52066 0,0.48694 -0.10163,0.84386 -0.34332,1.20579 -0.49566,0.74227 -1.34124,1.09169 -2.26699,0.93681 z m 0.0955,-0.85543 c 0.0339,-0.0339 0.051,-0.21943 0.051,-0.55411 v -0.50314 l 0.30799,0.0125 0.30798,0.0125 0.0212,0.53101 0.0212,0.53101 h 0.36109 0.36108 l 0.0212,-0.63721 0.0212,-0.63721 0.2124,-0.0212 c 0.11683,-0.0117 0.21241,-0.0409 0.21241,-0.065 0,-0.0665 -1.47331,-1.42183 -1.54556,-1.42183 -0.0788,0 -1.49608,1.40305 -1.46617,1.45145 0.012,0.0195 0.0972,0.0354 0.18928,0.0354 h 0.16741 v 0.63013 c 0,0.34657 0.0127,0.64287 0.0283,0.65845 0.0507,0.0507 0.67392,0.0313 0.72784,-0.0227 z"
+       id="path7519" />
+  </g>
+</svg>
diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css
index bf0be3c..f057eb0 100644
--- a/js/extension/cadastrapp.css
+++ b/js/extension/cadastrapp.css
@@ -335,3 +335,7 @@ input.request-obj-double.form-control{
 .cadastrapp-modal .react-grid-Cell, .cadastrapp .react-grid-Grid .react-grid-Cell {
   user-select: text;
 }
+
+ button.active .cadastrappIcon {
+  filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(140deg) brightness(105%) contrast(104%);
+}
diff --git a/js/extension/plugins/Extension.jsx b/js/extension/plugins/Extension.jsx
index a45fd2c..d5cbb41 100644
--- a/js/extension/plugins/Extension.jsx
+++ b/js/extension/plugins/Extension.jsx
@@ -7,6 +7,7 @@ import Message from "@mapstore/components/I18N/Message";
 import Main from './cadastrapp/Main';
 import init from '../enhancers/init';
 import { CONTROL_NAME } from '../constants';
+import cadastrapp_icon from '../../../assets/img/cadastrapp_icon.svg';
 
 import {setUp} from '../actions/cadastrapp';
 
@@ -47,14 +48,14 @@ export default {
             name: "cadastrapp",
             position: 1050,
             text: <Message msgId="cadastrapp.title"/>,
-            icon: <Glyphicon glyph="th" />,
+            icon: <img src={ cadastrapp_icon } className="cadastrappIcon"/>,
             doNotHide: true,
             action: toggleControl.bind(null, CONTROL_NAME, null),
             priority: 2
         },
         SidebarMenu: {
             name: "cadastrapp",
-            icon: <Glyphicon glyph="th" />,
+            icon: <img src={ cadastrapp_icon } className="cadastrappIcon"/>,
             tooltip: "cadastrapp.title",
             text: <Message msgId="cadastrapp.title"/>,
             doNotHide: true,

From 5c547b83f2d962b38315eedaf4df9aef274dddb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Poincelet?= <loic.poincelet@jdev.fr>
Date: Thu, 26 Dec 2024 11:35:57 +0100
Subject: [PATCH 2/2] modify cadastrapp icon upload

---
 .../extension/assets}/cadastrapp_icon.svg     |  0
 js/extension/plugins/Extension.jsx            |  8 +--
 .../cadastrapp/toolbar/cadastrapIcon.js       | 57 +++++++++++++++++++
 3 files changed, 61 insertions(+), 4 deletions(-)
 rename {assets/img => js/extension/assets}/cadastrapp_icon.svg (100%)
 create mode 100644 js/extension/plugins/cadastrapp/toolbar/cadastrapIcon.js

diff --git a/assets/img/cadastrapp_icon.svg b/js/extension/assets/cadastrapp_icon.svg
similarity index 100%
rename from assets/img/cadastrapp_icon.svg
rename to js/extension/assets/cadastrapp_icon.svg
diff --git a/js/extension/plugins/Extension.jsx b/js/extension/plugins/Extension.jsx
index d5cbb41..d83a38f 100644
--- a/js/extension/plugins/Extension.jsx
+++ b/js/extension/plugins/Extension.jsx
@@ -7,7 +7,6 @@ import Message from "@mapstore/components/I18N/Message";
 import Main from './cadastrapp/Main';
 import init from '../enhancers/init';
 import { CONTROL_NAME } from '../constants';
-import cadastrapp_icon from '../../../assets/img/cadastrapp_icon.svg';
 
 import {setUp} from '../actions/cadastrapp';
 
@@ -17,6 +16,7 @@ import {mapLayoutValuesSelector} from "@js/extension/selectors/maplayout";
 const compose = (...functions) => args => functions.reduceRight((arg, fn) => fn(arg), args);
 
 import '../cadastrapp.css';
+import { cadastrappIcon } from "./cadastrapp/toolbar/cadastrapIcon";
 
 
 const Cadastrapp = compose(
@@ -37,7 +37,7 @@ const Cadastrapp = compose(
         init()
     )
 )(Main);
-
+const svgDataUrl = `data:image/svg+xml;utf8,${encodeURIComponent(cadastrappIcon)}`;
 export default {
     name: "Cadastrapp",
     component: Cadastrapp,
@@ -48,14 +48,14 @@ export default {
             name: "cadastrapp",
             position: 1050,
             text: <Message msgId="cadastrapp.title"/>,
-            icon: <img src={ cadastrapp_icon } className="cadastrappIcon"/>,
+            icon: <img src={ svgDataUrl } className="cadastrappIcon"/>,
             doNotHide: true,
             action: toggleControl.bind(null, CONTROL_NAME, null),
             priority: 2
         },
         SidebarMenu: {
             name: "cadastrapp",
-            icon: <img src={ cadastrapp_icon } className="cadastrappIcon"/>,
+            icon: <img src={ svgDataUrl } className="cadastrappIcon"/>,
             tooltip: "cadastrapp.title",
             text: <Message msgId="cadastrapp.title"/>,
             doNotHide: true,
diff --git a/js/extension/plugins/cadastrapp/toolbar/cadastrapIcon.js b/js/extension/plugins/cadastrapp/toolbar/cadastrapIcon.js
new file mode 100644
index 0000000..97f0c43
--- /dev/null
+++ b/js/extension/plugins/cadastrapp/toolbar/cadastrapIcon.js
@@ -0,0 +1,57 @@
+export const cadastrappIcon = `<svg
+   width="9.6088867mm"
+   height="9.5314484mm"
+   viewBox="0 0 9.6088867 9.5314484"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="interface__cadastrApp.svg"
+   inkscape:export-filename="C:\Users\Agathe\Desktop\Cadastrapp\Refonte_interface\Cadastrapp__interfaceSearchProp.png"
+   inkscape:export-xdpi="150"
+   inkscape:export-ydpi="150"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     lock-margins="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.76666667"
+     inkscape:cx="1211.7391"
+     inkscape:cy="500.21739"
+     inkscape:window-width="2400"
+     inkscape:window-height="1271"
+     inkscape:window-x="2391"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs2" />
+  <g
+     inkscape:groupmode="layer"
+     id="g7521"
+     inkscape:label="iconPlugin_active"
+     style="display:inline"
+     sodipodi:insensitive="true"
+     transform="translate(-497.8299,-130.00899)">
+    <path
+       style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke-width:0.0424805"
+       d="m 502.20537,137.90467 c -0.17523,-0.0696 -0.87775,-0.34899 -1.56116,-0.62076 -0.68341,-0.27176 -1.24256,-0.51022 -1.24256,-0.52991 0,-0.0197 0.20486,-0.13218 0.45524,-0.24997 l 0.45524,-0.21419 0.74484,0.30471 c 0.40966,0.16758 1.14214,0.46766 1.62774,0.66683 0.49725,0.20395 0.87613,0.38257 0.86738,0.40893 -0.0204,0.0614 -0.78487,0.36058 -0.92191,0.36081 -0.0584,9e-5 -0.24958,-0.0568 -0.42481,-0.12645 z m 1.50806,-0.7135 c -0.25701,-0.10925 -0.46729,-0.22233 -0.46729,-0.25129 0,-0.0457 1.17494,-0.73085 1.25338,-0.73085 0.027,0 0.59453,0.82693 0.59453,0.86626 0,0.0374 -0.73609,0.32294 -0.822,0.31886 -0.0502,-0.002 -0.30161,-0.0937 -0.55862,-0.20298 z m 1.75394,-0.43685 c -0.30654,-0.41823 -0.50076,-0.71564 -0.50076,-0.76682 0,-0.0317 0.21399,-0.17834 0.47552,-0.32587 l 0.47553,-0.26824 0.46967,0.20271 c 1.07808,0.46529 1.10959,0.4821 1.01911,0.54388 -0.0782,0.0534 -1.62003,0.69689 -1.76581,0.73698 -0.0433,0.0119 -0.10843,-0.0342 -0.17326,-0.12264 z m -2.96464,-0.0662 c -0.33249,-0.12509 -1.51655,-0.62383 -1.54583,-0.65112 -0.0209,-0.0194 0.10669,-0.1067 0.28482,-0.19483 l 0.3226,-0.15963 0.23026,0.0726 c 0.95387,0.30069 1.92996,0.0824 2.66201,-0.59539 l 0.29135,-0.26974 0.27925,0.11179 c 0.1536,0.0615 0.27887,0.13366 0.27839,0.16038 -8.1e-4,0.0402 -2.67136,1.56379 -2.72272,1.55329 -0.009,-0.002 -0.0451,-0.0142 -0.0801,-0.0273 z m -4.20617,-0.34415 c -0.40558,-0.17513 -0.46669,-0.2093 -0.46669,-0.26092 0,-0.0198 0.13859,-0.0942 0.30798,-0.16535 0.16939,-0.0711 0.52782,-0.22684 0.79651,-0.34601 0.26869,-0.11917 0.73358,-0.32259 1.03308,-0.45206 l 0.54455,-0.23538 0.24717,0.22697 c 0.13594,0.12483 0.24932,0.2509 0.25196,0.28015 0.003,0.0293 -0.1338,0.11792 -0.30319,0.19704 -0.62228,0.29068 -1.1248,0.5302 -1.51413,0.72171 -0.21946,0.10795 -0.42974,0.19487 -0.46729,0.19315 -0.0376,-0.002 -0.23103,-0.0734 -0.42995,-0.1593 z m 3.88982,-1.0297 c -0.33246,-0.0556 -0.78326,-0.30276 -1.06944,-0.58629 -0.53716,-0.53218 -0.75326,-1.24259 -0.61057,-2.00718 0.11348,-0.60805 0.60843,-1.22373 1.21671,-1.5135 0.31247,-0.14885 0.36358,-0.1599 0.80664,-0.17434 0.7382,-0.0241 1.16733,0.13746 1.64207,0.61805 0.4593,0.46496 0.6249,0.86794 0.6249,1.52066 0,0.48694 -0.10163,0.84386 -0.34332,1.20579 -0.49566,0.74227 -1.34124,1.09169 -2.26699,0.93681 z m 0.0955,-0.85543 c 0.0339,-0.0339 0.051,-0.21943 0.051,-0.55411 v -0.50314 l 0.30799,0.0125 0.30798,0.0125 0.0212,0.53101 0.0212,0.53101 h 0.36109 0.36108 l 0.0212,-0.63721 0.0212,-0.63721 0.2124,-0.0212 c 0.11683,-0.0117 0.21241,-0.0409 0.21241,-0.065 0,-0.0665 -1.47331,-1.42183 -1.54556,-1.42183 -0.0788,0 -1.49608,1.40305 -1.46617,1.45145 0.012,0.0195 0.0972,0.0354 0.18928,0.0354 h 0.16741 v 0.63013 c 0,0.34657 0.0127,0.64287 0.0283,0.65845 0.0507,0.0507 0.67392,0.0313 0.72784,-0.0227 z"
+       id="path7519" />
+  </g>
+</svg>
+`
\ No newline at end of file