imio.smartweb.core 1.2.48__py3-none-any.whl → 1.2.50__py3-none-any.whl

imio/smartweb/core/webcomponents/package.json

@@ -55,6 +55,7 @@
     "@loadable/component": "^5.16.3",
     "axios": "^1.6.8",
     "babel-polyfill": "^6.26.0",
+    "bootstrap-icons": "^1.11.3",
     "date-fns": "^3.6.0",
     "flexbin": "^0.2.0",
     "leaflet": "^1.9.4",

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

@@ -110,7 +110,7 @@ function AnnuaireView(props) {
             height: filterRef.current.clientHeight,
         });
         setHeaderHeight(filterRef.current.offsetTop);
-    }, [filterRef.current]);
+    }, [response]);
 
     // coditional list render
     let listRender;
@@ -170,6 +170,17 @@ function AnnuaireView(props) {
                         <div className="r-add-contact">
                             <a target="_blank" rel="noreferrer" href={props.proposeUrl}>
                                 <Translate text="Proposer un contact" />
+                                <svg
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    width="16"
+                                    height="16"
+                                    fill="currentColor"
+                                    className="bi bi-plus-circle"
+                                    viewBox="0 0 16 16"
+                                >
+                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16" />
+                                    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4" />
+                                </svg>
                             </a>
                         </div>
                     )}

imio/smartweb/core/webcomponents/src/components/Annuaire/Annuaire.scss

@@ -365,6 +365,16 @@ article>header {
 
               .r-item-contact {
                 width: 100%;
+                .topics {
+                  margin-top: 10px;
+                  span {
+                    padding: 5px;
+                    background: #f1f1f1;
+                    border-radius: 5px;
+                    margin-right: 5px;
+                    
+                  }
+                }
               }
             }
           }

imio/smartweb/core/webcomponents/src/components/Annuaire/ContactCard/ContactCard.jsx

@@ -113,11 +113,11 @@ const ContactCard = ({ item }) => {
                                 : ""}
                         </div>
                         <div className="topics">
-                            {topics
-                                ? topics.map((mail, i) => {
-                                      return <span key={i}>{mail.title}</span>;
-                                  })
-                                : ""}
+                        {topics
+                            ? topics.slice(0, 3).map((mail, i) => {
+                                return <span key={i}>{mail.title}</span>;
+                                })
+                            : ""}
                         </div>
                     </div>
                 </div>

imio/smartweb/core/webcomponents/src/components/Annuaire/ContactContent/ContactContent.jsx

@@ -176,7 +176,7 @@ const ContactContent = ({ queryUrl, onChange }) => {
                                         width="16"
                                         height="16"
                                         fill="currentColor"
-                                        class="bi bi-clock-fill"
+                                        className="bi bi-clock-fill"
                                         viewBox="0 0 16 16"
                                     >
                                         <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71z" />
@@ -199,7 +199,7 @@ const ContactContent = ({ queryUrl, onChange }) => {
                                                 width="10"
                                                 height="10"
                                                 fill="currentColor"
-                                                class="bi bi-caret-down-fill"
+                                                className="bi bi-caret-down-fill"
                                                 viewBox="0 0 16 16"
                                             >
                                                 <path d="M7.247 11.14 2.451 5.658C1.885 5.013 2.345 4 3.204 4h9.592a1 1 0 0 1 .753 1.659l-4.796 5.48a1 1 0 0 1-1.506 0z" />

imio/smartweb/core/webcomponents/src/components/Events/EventCard/EventCard.jsx

@@ -34,7 +34,7 @@ const ContactCard = ({ item, showCategoriesOrTopics }) => {
                 )}
                 <span className="r-item-title">{title}</span>
                 {showCategoriesOrTopics === "topic" ? (
-                    item.topics[0] && (
+                    item.topics && item.topics[0] && (
                         <span className="r-item-categorie">{item.topics[0].title}</span>
                     )
                 ) : showCategoriesOrTopics === "category" ? (

imio/smartweb/core/webcomponents/src/components/Events/EventContent/EventContent.jsx

@@ -9,11 +9,13 @@ import "../../../../node_modules/flexbin/flexbin.css";
 import { Translate } from "react-translated";
 import queryString from "query-string";
 
-const ContactContent = ({ queryUrl, onChange }) => {
+const ContactContent = ({ queryUrl, onChange, onlyPastEvents }) => {
     let navigate = useNavigate();
     const { u, ...parsed } = Object.assign({
         UID: queryString.parse(useFilterQuery().toString())["u"],
         fullobjects: 1,
+        "event_dates.query": moment().format("YYYY-MM-DD"),
+        "event_dates.range": onlyPastEvents === "True" ? "max" : "min",
     });
     const [params, setParams] = useState(parsed);
     const [item, setitem] = useState({});
@@ -44,7 +46,11 @@ const ContactContent = ({ queryUrl, onChange }) => {
             // set recurrence
             if (response.items.length > 1) {
                 response.items.map((item, i) => {
-                    setRecurence((prevRecurrence) => [...prevRecurrence, item.start]);
+                    const currentDate = new Date();
+                    const itemDate = new Date(item.start);
+                    if (itemDate >= currentDate) {
+                        setRecurence((prevRecurrence) => [...prevRecurrence, item.start]);
+                    }
                 });
             } else {
                 setRecurence(null);
@@ -117,8 +123,19 @@ const ContactContent = ({ queryUrl, onChange }) => {
                 <Translate text="Retour" />
             </button>
             <article>
-                <header>
+                <header className="r-content-header">
                     <h2 className="r-content-title">{item.title}</h2>
+                    {item.local_category ? (
+                        <span className="r-content-title-cat">{item.local_category.title}</span>
+                    ) : (
+                        ""
+                    )}
+                    {item.category ? (
+                        <span className="r-content-title-cat">{item.category.title}</span>
+                    ) : (
+                        ""
+                    )}
+                    <span></span>
                 </header>
                 <figure>
                     <div
@@ -236,9 +253,33 @@ const ContactContent = ({ queryUrl, onChange }) => {
                                         aria-expanded="false"
                                     >
                                         <p>
-                                            {moment(futureDates[0]).format("DD-MM-YYYY")}
+                                            {item.whole_day ? (
+                                                moment(futureDates[0]).format("DD-MM-YYYY")
+                                            ) : (
+                                                <>
+                                                    {moment(futureDates[0]).format("DD-MM-YYYY")}
+                                                    <div className="r-content-recur-start-hours">
+                                                        <span>
+                                                            <Translate text="de" />
+                                                            &nbsp;
+                                                        </span>
+                                                        <div className="r-time-hours">
+                                                            {startHours}
+                                                        </div>
+                                                        <span>
+                                                            &nbsp;
+                                                            <Translate text="à" />
+                                                            &nbsp;
+                                                        </span>
+                                                        <div className="r-time-hours">
+                                                            {endHours}
+                                                        </div>
+                                                    </div>
+                                                </>
+                                            )}
                                             <span className="recurence-schedul-more">
-                                                Prochaines dates (+)
+                                                Prochaines dates
+                                                <i class="bi bi-arrow-down-short"></i>
                                             </span>
                                         </p>
                                         <div
@@ -248,11 +289,12 @@ const ContactContent = ({ queryUrl, onChange }) => {
                                                     : "recurence-modal-hide"
                                             }
                                         >
-                                            <span>Prochaines dates</span>
                                             <ul>
                                                 {futureDates.map((date, i) => {
                                                     return (
-                                                        <li>{moment(date).format("DD-MM-YYYY")}</li>
+                                                        <li key={i}>
+                                                            {moment(date).format("DD-MM-YYYY")}
+                                                        </li>
                                                     );
                                                 })}
                                             </ul>
@@ -295,28 +337,39 @@ const ContactContent = ({ queryUrl, onChange }) => {
                                 ) : (
                                     ""
                                 )}
+                                {item.free_entry === true ? (
+                                    <div className="r-content-news-info--entry">
+                                        <span>
+                                            <Translate text="Gratuit" />
+                                        </span>
+                                    </div>
+                                ) : (
+                                    ""
+                                )}
                             </div>
                         </div>
                         {/* contact */}
-                        <div className="r-content-news-info-contact">
-                            <div className="dpinlb">
-                                <div className="r-content-news-info--name">
-                                    <span>{item.contact_name}</span>
-                                </div>
-                                <div className="r-content-news-info--phone">
-                                    <span>
-                                        <a href={`tel:${item.contact_phone}`}>
-                                            {item.contact_phone}
+                        {(item.contact_name || item.contact_phone || item.contact_email) && (
+                            <div className="r-content-news-info-contact">
+                                <div className="dpinlb">
+                                    <div className="r-content-news-info--name">
+                                        <span>{item.contact_name}</span>
+                                    </div>
+                                    <div className="r-content-news-info--phone">
+                                        <span>
+                                            <a href={`tel:${item.contact_phone}`}>
+                                                {item.contact_phone}
+                                            </a>
+                                        </span>
+                                    </div>
+                                    <div className="r-content-news-info--email">
+                                        <a href={`mailto:${item.contact_email}`}>
+                                            {item.contact_email}
                                         </a>
-                                    </span>
-                                </div>
-                                <div className="r-content-news-info--email">
-                                    <a href={`mailto:${item.contact_email}`}>
-                                        {item.contact_email}
-                                    </a>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        )}
                         {/* link  */}
                         {item.event_url === null &&
                         item.online_participation === null &&
@@ -514,6 +567,16 @@ const ContactContent = ({ queryUrl, onChange }) => {
                         </div>
                     </div>
                 )}
+                {/* add category & Topics */}
+                {item.topics && item.topics.length > 0 && (
+                    <div className="r-content-topics">
+                        {item.topics.map((topic, i) => (
+                            <a key={i}>
+                                <span>{topic.title}</span>
+                            </a>
+                        ))}
+                    </div>
+                )}
             </article>
         </div>
     );

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

@@ -119,7 +119,7 @@ function EventsView(props) {
             height: filterRef.current.clientHeight,
         });
         setHeaderHeight(filterRef.current.offsetTop);
-    }, [filterRef.current]);
+    }, [response]);
 
     // coditional list render
     let listRender;
@@ -185,6 +185,17 @@ function EventsView(props) {
                         <div className="r-add-event">
                             <a target="_blank" href={props.proposeUrl}>
                                 <Translate text="Proposer un événement" />
+                                <svg
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    width="16"
+                                    height="16"
+                                    fill="currentColor"
+                                    className="bi bi-plus-circle"
+                                    viewBox="0 0 16 16"
+                                >
+                                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16" />
+                                    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4" />
+                                </svg>
                             </a>
                         </div>
                     )}
@@ -252,7 +263,7 @@ function EventsView(props) {
                     element={
                         <div className="r-wrapper container r-annuaire-wrapper">
                             <div className="r-result r-annuaire-result">
-                                <EventContent queryUrl={props.queryUrl} onChange={clickID} />
+                                <EventContent queryUrl={props.queryUrl} onChange={clickID} onlyPastEvents={props.onlyPastEvents} />
                             </div>
                             {displayMap && (
                                 <div

imio/smartweb/core/webcomponents/src/components/Events/Events.scss

@@ -358,8 +358,16 @@ article>header {
   padding-bottom: 60%;
 }
 
+.r-content-header {
+  margin-bottom: 1rem;
+}
+
 .r-content-title {
-  margin: 1rem 0;
+  margin: 0;
+}
+
+.r-content-recur-start-hours {
+  display: flex;
 }
 
 .news-info-title {
@@ -471,6 +479,24 @@ article>header {
   }
 }
 
+.r-content-topics {
+  display: flex;
+  gap: 15px;
+
+  span {
+    padding: 5px;
+    background: #f1f1f1;
+    border-radius: 5px;
+    margin-right: 5px;
+  }
+}
+
+.r-content-title-cat {
+  color: #8e8e8e;
+  margin-right: 5px;
+  font-size: 14px;
+}
+
 // //  No Map
 //   // Main
 .no-map {

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

@@ -62,7 +62,7 @@ function Filters(props) {
     // const to group category and local category
     const groupedOptions = [
         {
-            label: <Translate text="Catégories locale" />,
+            label: <Translate text="Catégories spécifiques" />,
             options: localsCategoryFilter,
         },
         {

imio/smartweb/core/webcomponents/src/components/Filters/DateFilter.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useContext } from "react";
+import React, { useState } from "react";
 import DatePicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
 import moment from "moment";
@@ -15,7 +15,6 @@ const languageList = {
     en: enGB,
 };
 function DateFilter({ language, setDates }) {
-    // const currentLanguage = useContext(LanguageContext);
     const [dateRange, setDateRange] = useState([null, null]);
     const [startDate, endDate] = dateRange;
     const [filter, setFilter] = useState(<Translate text="Quand" />);

imio/smartweb/core/webcomponents/src/components/Filters/MainFilter.scss

@@ -2,14 +2,23 @@
   @media screen and (min-width:1200px) {
     position: sticky;
   }
-
   z-index: 1;
   background: #fff;
-
+  &:after {
+    content: "";
+    background: #fff;
+    position: absolute;
+    left: 0;
+    right: 0;
+    height: 312px;
+    top: 0;
+    transform: translateY(-100%);
+  }
   .r-result-filter {
     padding-top: 1rem;
     padding-bottom: 1rem;
     border-bottom: solid 1px #cccc;
+    position: relative;
   }
 }
 
@@ -23,8 +32,9 @@
   }
 }
 
-
-
+.r-result-filter {
+  position: relative;
+}
 //  react filter menu 
 
 .react-filters-menu {

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

@@ -5,7 +5,7 @@ import useAxios from "../../../hooks/useAxios";
 import { Translator, Translate} from "react-translated";
 import queryString from "query-string";
 import { iam } from "./../../Filters/IamData";
-import { menuStyles, moreFilterStyles } from "./../../Filters/SelectStyles";
+import { menuStyles } from "./../../Filters/SelectStyles";
 
 function Filters(props) {
     let navigate = useNavigate();
@@ -52,7 +52,7 @@ function Filters(props) {
     // const to group category and local category
     const groupedOptions = [
         {
-            label: <Translate text="Catégories locale" />,
+            label: <Translate text="Catégories spécifiques" />,
             options: localsCategoryFilter,
         },
         {
@@ -85,6 +85,18 @@ function Filters(props) {
         }
     });
 
+    const onChangeGroupSelect = useCallback((value, action) => {
+        if (value) {
+            setInputValues((state) => ({ ...state, [value.queryString]: value.value }), []);
+        } else {
+            setInputValues((prevState) => {
+                const state = { ...prevState };
+                const { [action.removedValues[0].queryString]: remove, ...rest } = state;
+                return rest;
+            });
+        }
+    });
+
     // make to no launch useEffect first time
     const firstUpdate = useRef(true);
     useEffect(() => {
@@ -180,7 +192,7 @@ function Filters(props) {
                                     name={"category"}
                                     className="select-custom-no-border library-facilities"
                                     isClearable
-                                    onChange={onChangeHandlerSelect}
+                                    onChange={onChangeGroupSelect}
                                     options={localsCategoryFilter.length === 0 ? taxonomyFilter &&  taxonomyFilter : groupedOptions}
                                     placeholder={translate({
                                         text: "Catégories",

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, createContext, useContex } from "react";
+import React, { useEffect, useState, createContext } from "react";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import Filters from "./Filters/Filter";
 import NewsContent from "./NewsContent/NewsContent";
@@ -124,7 +124,6 @@ const NewsView = (props) => {
             </div>
         </div>
     );
-
     return (
         <div>
             <div className="r-wrapper r-actu-wrapper">
@@ -145,6 +144,17 @@ const NewsView = (props) => {
                                             <div className="r-add-news">
                                                 <a target="_blank" href={props.proposeUrl}>
                                                     <Translate text="Proposer une actualité" />
+                                                    <svg
+                                                        xmlns="http://www.w3.org/2000/svg"
+                                                        width="16"
+                                                        height="16"
+                                                        fill="currentColor"
+                                                        className="bi bi-plus-circle"
+                                                        viewBox="0 0 16 16"
+                                                    >
+                                                        <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16" />
+                                                        <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4" />
+                                                    </svg>
                                                 </a>
                                             </div>
                                         )}

imio/smartweb/core/webcomponents/src/components/News/NewsContent/NewsContent.jsx

@@ -262,9 +262,9 @@ const ContactContent = ({ queryUrl, onChange }) => {
                 {/* add gallery */}
                 {gallery && (
                     <div className="r-content-gallery">
-                        <div class="spotlight-group flexbin r-content-gallery">
+                        <div className="spotlight-group flexbin r-content-gallery">
                             {gallery.map((image, i) => (
-                                <a key={i} class="spotlight" href={image.image_full_scale}>
+                                <a key={i} className="spotlight" href={image.image_full_scale}>
                                     <img src={image.image_preview_scale} alt="" />
                                 </a>
                             ))}

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

@@ -31,11 +31,22 @@
 .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;
+    }
   }
 }
 

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

@@ -91,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={[

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

@@ -72,6 +72,12 @@ export default {
         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",
@@ -168,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é",

imio.smartweb.core-1.2.50-py3.11-nspkg.pth

@@ -0,0 +1,2 @@
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio',));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio', types.ModuleType('imio'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('imio', 'smartweb'));importlib = __import__('importlib.util');__import__('importlib.machinery');m = sys.modules.setdefault('imio.smartweb', importlib.util.module_from_spec(importlib.machinery.PathFinder.find_spec('imio.smartweb', [os.path.dirname(p)])));m = m or sys.modules.setdefault('imio.smartweb', types.ModuleType('imio.smartweb'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p);m and setattr(sys.modules['imio'], 'smartweb', m)

{imio.smartweb.core-1.2.48.dist-info → imio.smartweb.core-1.2.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.48
+Version: 1.2.50
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -26,7 +26,7 @@ License-File: LICENSE.rst
 Requires-Dist: setuptools
 Requires-Dist: z3c.jbot
 Requires-Dist: z3c.unconfigure
-Requires-Dist: plone.api (>=1.8.4)
+Requires-Dist: plone.api >=1.8.4
 Requires-Dist: plone.gallery
 Requires-Dist: plone.restapi
 Requires-Dist: plone.app.dexterity
@@ -48,7 +48,7 @@ Requires-Dist: imio.smartweb.common
 Requires-Dist: imio.smartweb.locales
 Provides-Extra: test
 Requires-Dist: plone.app.testing ; extra == 'test'
-Requires-Dist: plone.testing (>=5.0.0) ; extra == 'test'
+Requires-Dist: plone.testing >=5.0.0 ; extra == 'test'
 Requires-Dist: plone.app.contenttypes ; extra == 'test'
 Requires-Dist: plone.app.robotframework[debug] ; extra == 'test'
 Requires-Dist: plone.restapi[test] ; extra == 'test'
@@ -189,6 +189,23 @@ Changelog
 =========
 
 
+1.2.50 (2024-05-30)
+-------------------
+
+- Fix loaded calcul of sticky filter menu in React view
+  [thomlamb]
+
+
+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)
 -------------------