imio.smartweb.core 1.2.47__py3-none-any.whl → 1.2.49__py3-none-any.whl

imio/smartweb/core/webcomponents/src/components/Search/ContactResult/ContactResult.jsx

@@ -13,7 +13,10 @@ const ContactResult = (props) => {
             headers: {
                 Accept: "application/json",
             },
-            params: (props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics) ? props.urlParams : {},
+            params:
+                props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics
+                    ? props.urlParams
+                    : {},
         },
         [props]
     );
@@ -32,7 +35,14 @@ const ContactResult = (props) => {
                     <Translate text="Contacts" />
                 </h2>
                 <p className="r-search-header-count">
-                    {resultArray.length > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />}
+                    {resultArray.length > 0 ? (
+                        <>
+                            {" "}
+                            {resultArray.length} <Translate text="Résultats" />{" "}
+                        </>
+                    ) : (
+                        <Translate text="Aucun résultat" />
+                    )}
                 </p>
             </div>
             <ul className="r-search-list">
@@ -40,15 +50,16 @@ const ContactResult = (props) => {
                     <li key={i} className="r-search-item">
                         <a href={item["_url"]}>
                             <div className="r-search-img">
-                                {
-                                    item.has_leadimage[0] ? (
-                                        <div className="r-search-img" style={{
-                                            backgroundImage: "url(" + item.image_url + ")"
-                                        }}></div>
-                                    ) : (
-                                        <div className="r-search-img no-search-item-img"></div>
-                                    )
-                                }
+                                {item.has_leadimage[0] ? (
+                                    <div
+                                        className="r-search-img"
+                                        style={{
+                                            backgroundImage: "url(" + item.image_url + ")",
+                                        }}
+                                    ></div>
+                                ) : (
+                                    <div className="r-search-img no-search-item-img"></div>
+                                )}
                             </div>
                             <Highlighter
                                 highlightClassName="r-search-highlighter"
@@ -62,4 +73,4 @@ const ContactResult = (props) => {
         </div>
     );
 };
-export default ContactResult;
+export default ContactResult;

imio/smartweb/core/webcomponents/src/components/Search/EventsResult/EventsResult.jsx

@@ -13,7 +13,10 @@ const EventsResult = (props) => {
             headers: {
                 Accept: "application/json",
             },
-            params: (props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics) ? props.urlParams : {},
+            params:
+                props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics
+                    ? props.urlParams
+                    : {},
         },
         [props]
     );
@@ -32,7 +35,14 @@ const EventsResult = (props) => {
                     <Translate text="Événements" />
                 </h2>
                 <p className="r-search-header-count">
-                    {resultArray.length > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />}
+                    {resultArray.length > 0 ? (
+                        <>
+                            {" "}
+                            {resultArray.length} <Translate text="Résultats" />{" "}
+                        </>
+                    ) : (
+                        <Translate text="Aucun résultat" />
+                    )}
                 </p>
             </div>
             <ul className="r-search-list">
@@ -40,15 +50,16 @@ const EventsResult = (props) => {
                     <li key={i} className="r-search-item">
                         <a href={item["_url"]}>
                             <div className="r-search-img">
-                                {
-                                    item.has_leadimage[0] ? (
-                                        <div className="r-search-img" style={{
-                                            backgroundImage: "url(" + item.image_url + ")"
-                                        }}></div>
-                                    ) : (
-                                        <div className="r-search-img no-search-item-img"></div>
-                                    )
-                                }
+                                {item.has_leadimage[0] ? (
+                                    <div
+                                        className="r-search-img"
+                                        style={{
+                                            backgroundImage: "url(" + item.image_url + ")",
+                                        }}
+                                    ></div>
+                                ) : (
+                                    <div className="r-search-img no-search-item-img"></div>
+                                )}
                             </div>
                             <Highlighter
                                 highlightClassName="r-search-highlighter"
@@ -62,4 +73,4 @@ const EventsResult = (props) => {
         </div>
     );
 };
-export default EventsResult;
+export default EventsResult;

imio/smartweb/core/webcomponents/src/components/Search/Filters/Filter.jsx

@@ -3,7 +3,7 @@ import Select from "react-select";
 import { useNavigate } from "react-router-dom";
 import axios from "axios";
 import { Translate, Translator } from "react-translated";
-import queryString from 'query-string';
+import queryString from "query-string";
 
 function Filters(props) {
     let navigate = useNavigate();
@@ -153,7 +153,7 @@ function Filters(props) {
                                     onChange={HandlerText}
                                     value={searchValues.SearchableText}
                                     placeholder={translate({
-                                        text: 'Recherche'
+                                        text: "Recherche",
                                     })}
                                 />
                             )}
@@ -173,7 +173,7 @@ function Filters(props) {
                             onChange={onChangeHandlerSelect}
                             options={iamFilter && iamFilter}
                             placeholder={translate({
-                                text: 'Je suis'
+                                text: "Je suis",
                             })}
                             value={actIam && actIam[0]}
                         />
@@ -191,7 +191,7 @@ function Filters(props) {
                             onChange={onChangeHandlerSelect}
                             options={topicsFilter && topicsFilter}
                             placeholder={translate({
-                                text: 'Thématiques'
+                                text: "Thématiques",
                             })}
                             value={actTopi && actTopi[0]}
                         />
@@ -202,4 +202,4 @@ function Filters(props) {
     );
 }
 
-export default Filters;
+export default Filters;

imio/smartweb/core/webcomponents/src/components/Search/NewsResult/NewsResult.jsx

@@ -13,7 +13,10 @@ const NewsResult = (props) => {
             headers: {
                 Accept: "application/json",
             },
-            params: (props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics) ? props.urlParams : {},
+            params:
+                props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics
+                    ? props.urlParams
+                    : {},
         },
         [props]
     );
@@ -32,7 +35,14 @@ const NewsResult = (props) => {
                     <Translate text="Actualités" />
                 </h2>
                 <p className="r-search-header-count">
-                    {resultArray.length > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />}
+                    {resultArray.length > 0 ? (
+                        <>
+                            {" "}
+                            {resultArray.length} <Translate text="Résultats" />{" "}
+                        </>
+                    ) : (
+                        <Translate text="Aucun résultat" />
+                    )}
                 </p>
             </div>
             <ul className="r-search-list">
@@ -40,15 +50,16 @@ const NewsResult = (props) => {
                     <li key={i} className="r-search-item">
                         <a href={item["_url"]}>
                             <div className="r-search-img">
-                                {
-                                    item.has_leadimage[0] ? (
-                                        <div className="r-search-img" style={{
-                                            backgroundImage: "url(" + item.image_url + ")"
-                                        }}></div>
-                                    ) : (
-                                        <div className="r-search-img no-search-item-img"></div>
-                                    )
-                                }
+                                {item.has_leadimage[0] ? (
+                                    <div
+                                        className="r-search-img"
+                                        style={{
+                                            backgroundImage: "url(" + item.image_url + ")",
+                                        }}
+                                    ></div>
+                                ) : (
+                                    <div className="r-search-img no-search-item-img"></div>
+                                )}
                             </div>
                             <Highlighter
                                 highlightClassName="r-search-highlighter"
@@ -62,4 +73,4 @@ const NewsResult = (props) => {
         </div>
     );
 };
-export default NewsResult;
+export default NewsResult;

imio/smartweb/core/webcomponents/src/components/Search/Search.jsx

@@ -7,8 +7,8 @@ import EventsResult from "./EventsResult/EventsResult";
 import WebResult from "./WebResult/WebResult";
 import useFilterQuery from "../../hooks/useFilterQuery";
 import { Provider } from "react-translated";
-import translation from '../../utils/translation';
-import queryString from 'query-string';
+import translation from "../../utils/translation";
+import queryString from "query-string";
 
 import "./Search.scss";
 
@@ -22,13 +22,13 @@ export default function Search(props) {
                     resultOption={JSON.parse(props.resultOption)}
                 />
             </Provider>
-        </BrowserRouter >
+        </BrowserRouter>
     );
 }
 const SearchView = (props) => {
     const parsed = queryString.parse(useFilterQuery().toString());
     const { SearchableText, iam, topics } = parsed;
-    const parsed2 = { 'SearchableText': SearchableText, 'iam': iam, 'topics': topics };
+    const parsed2 = { SearchableText: SearchableText, iam: iam, topics: topics };
     // const parsed2 = { ...parsed };
     const [filters, setFilters] = useState(parsed2);
     const [batchSize, setBatchSize] = useState(6);

imio/smartweb/core/webcomponents/src/components/Search/WebResult/WebResult.jsx

@@ -13,7 +13,10 @@ const WebResult = (props) => {
             headers: {
                 Accept: "application/json",
             },
-            params: (props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics) ? props.urlParams : {},
+            params:
+                props.urlParams.SearchableText || props.urlParams.iam || props.urlParams.topics
+                    ? props.urlParams
+                    : {},
         },
         [props]
     );
@@ -30,10 +33,16 @@ const WebResult = (props) => {
             <div className="r-search-header">
                 <h2 className="r-search-header-title">
                     <Translate text="Infos pratiques" />
-
                 </h2>
                 <p className="r-search-header-count">
-                    {resultArray.length > 0 ? <> {resultArray.length} {" "} <Translate text='Résultats' /> </> : <Translate text='Aucun résultat' />}
+                    {resultArray.length > 0 ? (
+                        <>
+                            {" "}
+                            {resultArray.length} <Translate text="Résultats" />{" "}
+                        </>
+                    ) : (
+                        <Translate text="Aucun résultat" />
+                    )}
                 </p>
             </div>
             <ul className="r-search-list">
@@ -52,4 +61,4 @@ const WebResult = (props) => {
         </div>
     );
 };
-export default WebResult;
+export default WebResult;

imio/smartweb/core/webcomponents/src/index.jsx

@@ -16,6 +16,6 @@ ReactWebComponent.create(<Events />, "smartweb-events", false);
 ReactWebComponent.create(<Search />, "smartweb-search", false);
 
 if (module.hot) {
-  // Accept hot module replacement (HMR) while live-reloading
-  module.hot.accept();
-}
+    // Accept hot module replacement (HMR) while live-reloading
+    module.hot.accept();
+}

imio/smartweb/core/webcomponents/src/index.scss

@@ -12,7 +12,6 @@
   }
 }
 
-/* Filters */
 .r-wrapper {
   position: relative;
 
@@ -21,77 +20,33 @@
   }
 }
 
-.r-result-filter-container,
 .r-actu-wrapper {
   padding-top: 1rem;
 }
 
 .r-result {
   position: relative;
-
-  &-filter {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 20px;
-    padding-bottom: 20px;
-    border-bottom: solid 1px #cccc;
-    align-items: center;
-
-    .r-filter {
-      width: 100%;
-      max-width: 200px;
-
-      label {
-        display: block;
-      }
-
-      .r-filter-search {
-        position: relative;
-
-        .input-custom-class {
-          line-height: 50px;
-          border: 1px solid #CCCCCC;
-          height: 50px;
-          padding: 0 10px;
-          font-weight: bold;
-          color: #000;
-          width: 100%;
-          letter-spacing: 1.2px;
-
-          &::placeholder {
-            color: #000;
-            font-size: 12px;
-            opacity: 1;
-            text-transform: uppercase;
-            letter-spacing: '1.2px';
-          }
-        }
-
-        button {
-          background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cg id='Calque_2' data-name='Calque 2'%3E%3Cg id='Calque_1-2' data-name='Calque 1'%3E%3Cg id='search'%3E%3Cpath id='Shape' d='M11.08,6.77a4.31,4.31,0,1,0-4.31,4.31h0A4.32,4.32,0,0,0,11.08,6.77Zm4.92,8A1.24,1.24,0,0,1,14.77,16a1.17,1.17,0,0,1-.86-.37l-3.3-3.28a6.77,6.77,0,1,1,1.74-1.74l3.3,3.3A1.25,1.25,0,0,1,16,14.77Z' style='fill:%23141414;fill-rule:evenodd'/%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E") no-repeat;
-          background-position: center;
-          background-size: 80%;
-          border: none;
-          width: 20px;
-          position: absolute;
-          right: 10px;
-          top: 0;
-          bottom: 0;
-        }
-      }
-
-    }
-  }
 }
 
 .r-add-event,
 .r-add-news,
 .r-add-contact {
+  @media screen and (min-width: 992px) {
+    position: absolute;
+    right: 0;
+    bottom: 0px;
+    padding-bottom: 1rem;
+  }
   a {
-    background: #000;
-    color: #fff;
+    color: #2d2d2d;
     text-decoration: none;
-    padding: 1rem;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 7px;
+    &:hover,&:focus {
+      text-decoration: underline;
+    }
   }
 }
 
@@ -121,15 +76,7 @@
 }
 
 //// for bla ////
-/* filters */
-.r-filter {
-  label {
-    text-transform: uppercase;
-    font-weight: bold;
-    font-size: 13px;
-    margin-bottom: 10px;
-  }
-}
+
 
 // content
 .r-content-description {
@@ -372,4 +319,14 @@
 
 .r-search-img {
   background-color: #c9c9c9 !important;
+}
+
+.portaltype-imio-smartweb-eventsview,
+.portaltype-imio-smartweb-directoryview,
+.portaltype-imio-smartweb-newsview {
+
+  #portal-breadcrumbs,
+  #portal-header {
+    margin-bottom: 0 !important;
+  }
 }

imio/smartweb/core/webcomponents/src/utils/Map.jsx

@@ -8,7 +8,7 @@ import { Link } from "react-router-dom";
 import "./Map.scss";
 import "leaflet/dist/leaflet.css";
 import removeAccents from "remove-accents";
-import queryString from 'query-string';
+import queryString from "query-string";
 
 function ChangeMapView({ activeItem, arrayOfLatLngs }) {
     const map = useMap();
@@ -28,12 +28,17 @@ function Map(props) {
     const [activeItem, setActiveItem] = useState(null);
     const [filterGeoArray, setFilterGeoArray] = useState([]);
     const [allPosition, setAllPosition] = useState(null);
-    const { u, ...parsed } = Object.assign(
-        { UID: queryString.parse(useFilterQuery().toString())['u'] },
-    );
+    const { u, ...parsed } = Object.assign({
+        UID: queryString.parse(useFilterQuery().toString())["u"],
+    });
     // Delete Imio positions
     useEffect(() => {
-        const filterArray = props.items.filter((isgeo) => isgeo.geolocation.latitude && isgeo.geolocation.latitude !== 50.4989185 && isgeo.geolocation.longitude !== 4.7184485);
+        const filterArray = props.items.filter(
+            (isgeo) =>
+                isgeo.geolocation.latitude &&
+                isgeo.geolocation.latitude !== 50.4989185 &&
+                isgeo.geolocation.longitude !== 4.7184485
+        );
         setFilterGeoArray(filterArray);
     }, [props]);
 
@@ -43,7 +48,7 @@ function Map(props) {
             iconUrl: url,
             iconSize: [29, 37],
         });
-    }
+    };
     // Get Marker Icon and Z-index
     const getMarkerIcon = (index) => {
         if (index === parsed.UID) {
@@ -73,7 +78,6 @@ function Map(props) {
         setActiveItem(result[0]);
     }, [filterGeoArray]);
 
-
     useEffect(() => {
         if (filterGeoArray.length > 0) {
             let posArray = [];
@@ -87,9 +91,9 @@ function Map(props) {
     }, [filterGeoArray]);
     const position = [50.85034, 4.35171];
 
-    const markers = filterGeoArray.map((mark) => (
+    const markers = filterGeoArray.map((mark,i) => (
         <Marker
-            key={mark.UID}
+            key={i}
             icon={getMarkerIcon(mark.UID)}
             zIndexOffset={getMarkerZindex(mark.UID)}
             position={[
@@ -107,7 +111,12 @@ function Map(props) {
                     className="r-map-popup"
                     style={{ textDecoration: "none" }}
                     to={{
-                        pathname: "/" + removeAccents(mark.title).replace(/[^a-zA-Z ]/g, "").replace(/\s/g, "-").toLowerCase(),
+                        pathname:
+                            "/" +
+                            removeAccents(mark.title)
+                                .replace(/[^a-zA-Z ]/g, "")
+                                .replace(/\s/g, "-")
+                                .toLowerCase(),
                         search: `?u=${mark.UID}`,
                         state: {
                             idItem: mark.UID,
@@ -147,4 +156,4 @@ function Map(props) {
     );
 }
 
-export default Map;
+export default Map;

imio/smartweb/core/webcomponents/src/utils/translation.js

@@ -66,6 +66,24 @@ export default {
         de: "Kategorien",
         nl: "Categorieën",
     },
+    "Catégories locale": {
+        en: 'Local categories',
+        fr: "Catégories locale",
+        de: "Lokale Kategorien",
+        nl: "Lokale categorieën",
+    },
+    "Catégories spécifiques": {
+        en: 'Specific categories',
+        fr: "Catégories spécifiques",
+        de: "Spezifische Kategorien",
+        nl: "Specifieke categorieën",
+    },
+    "Quoi": {
+        en: 'What',
+        fr: "Quoi",
+        de: "Was",
+        nl: "Wat",
+    },
     "Facilités": {
         en: 'Facilities',
         fr: "Facilités",
@@ -156,6 +174,12 @@ export default {
         de: ' Veranstaltung gefunden',
         nl: ' Evenement gevonden',
     },
+    'Gratuit': {
+        en: 'Free',
+        fr: 'Gratuit',
+        de: 'Kostenlos',
+        nl: 'Gratis',
+    },
     "Aucun événement n'a été trouvé": {
         en: 'No event was found',
         fr: "Aucun événement n'a été trouvé",
@@ -210,6 +234,12 @@ export default {
         de: 'Kontakt vorschlagen',
         nl: 'Contact voorstellen',
     },
+    "Quand": {
+        en: 'When',
+        fr: "Quand",
+        de: 'Wann',
+        nl: 'Wanneer',
+    },
     "Toutes les dates": {
         en: 'All dates',
         fr: "Toutes les dates",

{imio.smartweb.core-1.2.47.dist-info → imio.smartweb.core-1.2.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.47
+Version: 1.2.49
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,35 @@ Changelog
 =========
 
 
+1.2.49 (2024-05-29)
+-------------------
+
+- WEB-4101 : Encode URLs parameters for `search-filters`. This fixes issues with special chars.
+  [laulaz]
+
+- WEB-3802: Fix after testing, complited traduction, optimize code
+  [thomlamb]
+
+
+1.2.48 (2024-05-27)
+-------------------
+
+- WEB-3802: Add grouped filter for category and local category in React filters
+  [thomlamb]
+
+- WEB-4101 : Handle (local) categories translations correctly
+  [laulaz]
+
+- SUP-36937: Add Recurrence dates in React event content view
+  [thomlamb]
+
+- WEB-4104 : When change section size (front-office method), reindexParent to refresh cache
+  [boulch]
+
+- WEB-4105 : Make text section smarter about its lead image format (portrait / landscape)
+  [boulch]
+
+
 1.2.47 (2024-05-07)
 -------------------