@movalib/movalib-commons 1.0.73 → 1.0.75

package/PV_README.md

@@ -21,3 +21,7 @@ Pour lier la librairie aux projets qui l'utilise, executer la commande suivnte
 Les commandes exécutées (ci-dessous) permettent de contourner un problème de double référence vers react et react-dom lorsque les deux appli utilisent des Hook
 
   "link": "npm link --only=production && npm link \"/home/dimitri/Projets/5 - MOVALIB/02 - Développement/Front-End/movalib-user-app/node_modules/react\" && npm link \"/home/dimitri/Projets/5 - MOVALIB/02 - Développement/Front-End/movalib-user-app/node_modules/react-dom\"",
+
+
+  gsutil setmeta -h "Cache-Control:no-cache, must-revalidate" gs://app.movalib.com/*
+gsutil setmeta -h "Cache-Control:no-cache, must-revalidate" gs://pro.movalib.com/*

package/devIndex.tsx

@@ -23,18 +23,13 @@ import { flexCenter } from './src/helpers/Tools';
 
 const App = () => {
 
-  // Activation des logs console si nous ne sommes pas en PRODUCTION sinon contrôle de la variable debugMode
-  if (process.env.NODE_ENV !== 'production' || localStorage.getItem('debugMode') === 'true') {
-    Logger.enableLogging();
-  }
+  Logger.enableLogging();
 
   // Chargement de données garage de test
   const [garage, setGarage] = useState<Garage>();
 
   useEffect(() => {
-
     refreshGarageData();
-    
   }, []);
 
 
@@ -72,6 +67,7 @@ const App = () => {
 
   const getQRCodeData = ():string => {
     // On renvoie les données pour le QR Code, l'url change selon l'environnement (variables d'environnement)
+    return 'https://www.instagram.com/delightnord/';
     return `https://localhost:3001/#/garage/1?redirect=garage`;
   }
 

package/dist/devIndex.js

@@ -58,10 +58,7 @@ var ScheduleFields_1 = __importDefault(require("./src/ScheduleFields"));
 var Schedule_1 = __importDefault(require("./src/models/Schedule"));
 var Tools_1 = require("./src/helpers/Tools");
 var App = function () {
-    // Activation des logs console si nous ne sommes pas en PRODUCTION sinon contrôle de la variable debugMode
-    if (process.env.NODE_ENV !== 'production' || localStorage.getItem('debugMode') === 'true') {
-        Logger_1.default.enableLogging();
-    }
+    Logger_1.default.enableLogging();
     // Chargement de données garage de test
     var _a = (0, react_1.useState)(), garage = _a[0], setGarage = _a[1];
     (0, react_1.useEffect)(function () {
@@ -96,6 +93,7 @@ var App = function () {
     };
     var getQRCodeData = function () {
         // On renvoie les données pour le QR Code, l'url change selon l'environnement (variables d'environnement)
+        return 'https://www.instagram.com/delightnord/';
         return "https://localhost:3001/#/garage/1?redirect=garage";
     };
     var handleScheduleChange = function (schedule) {

package/dist/src/MovaDialog.js

@@ -52,7 +52,7 @@ var MovaDialog = function (_a) {
         }
     };
     return ((0, jsx_runtime_1.jsxs)(material_1.Dialog, __assign({ fullScreen: fullScreen, fullWidth: true, TransitionComponent: getTransition(), open: open, "aria-labelledby": "garage-dialog-title", "aria-describedby": "garage-dialog-description", onClose: handleOnClose, sx: { textAlign: 'center' } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getLeafImage(), style: {
-                    position: 'fixed',
+                    position: 'absolute',
                     float: 'left',
                     width: '150px',
                     height: '350px',

package/dist/src/QRCode.js

@@ -16,7 +16,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
-var leaf_yellow_small_png_1 = __importDefault(require("./assets/images/leaf_yellow_small.png"));
 var material_1 = require("@mui/material");
 var qr_code_styling_1 = __importDefault(require("qr-code-styling"));
 require("./QRCode.css");
@@ -40,7 +39,7 @@ var QRCode = function (_a) {
         height: 600,
         type: 'canvas',
         data: data !== null && data !== void 0 ? data : defaultData,
-        image: leaf_yellow_small_png_1.default,
+        //image: QRCodeImage,
         margin: 10,
         qrOptions: {
             typeNumber: 0,
@@ -53,13 +52,14 @@ var QRCode = function (_a) {
             margin: 15
         },
         dotsOptions: {
-            color: (0, material_1.darken)(theme.palette.primary.main, 0.3),
+            color: 'black',
+            //color: darken(theme.palette.primary.main, 0.3),
             // gradient: {
             //   type: 'linear', // 'radial'
             //   rotation: 0,
             //   colorStops: [{ offset: 0, color: theme.palette.primary.main }, { offset: 1, color: theme.palette.secondary.main }]
             // },
-            type: 'square' // "dots" | "rounded" | "classy" | "classy-rounded" | "square" | "extra-rounded";
+            type: 'rounded' // "dots" | "rounded" | "classy" | "classy-rounded" | "square" | "extra-rounded";
         },
         backgroundOptions: {
             color: 'white',
@@ -70,8 +70,9 @@ var QRCode = function (_a) {
             // },
         },
         cornersSquareOptions: {
-            color: (0, material_1.darken)(theme.palette.secondary.main, 0.1),
-            type: 'square',
+            color: '#de007dff',
+            //color: darken(theme.palette.secondary.main, 0.1),
+            type: 'extra-rounded',
             // gradient: {
             //   type: 'linear', // 'radial'
             //   rotation: 180,
@@ -79,8 +80,9 @@ var QRCode = function (_a) {
             // },
         },
         cornersDotOptions: {
-            color: (0, material_1.darken)(theme.palette.secondary.main, 0.1),
-            type: 'square',
+            color: '#de007dff',
+            //color: darken(theme.palette.secondary.main, 0.1),
+            type: 'dot',
             // gradient: {
             //   type: 'linear', // 'radial'
             //   rotation: 180,
@@ -89,7 +91,7 @@ var QRCode = function (_a) {
         }
     }), options = _c[0], setOptions = _c[1];
     // Format de téléchargement par défaut
-    var _d = (0, react_1.useState)("png"), fileExt = _d[0], setFileExt = _d[1];
+    var _d = (0, react_1.useState)("svg"), fileExt = _d[0], setFileExt = _d[1];
     var qrCode = (0, react_1.useState)(new qr_code_styling_1.default(options))[0];
     var ref = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(function () {

package/dist/src/helpers/ApiHelper.js

@@ -2,12 +2,11 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = exports.API_BASE_URL = void 0;
 var CookieUtils_1 = require("./CookieUtils");
 var Logger_1 = __importDefault(require("./Logger"));
-exports.API_BASE_URL = (_a = process.env.REACT_APP_API_URL) !== null && _a !== void 0 ? _a : 'https://localhost:8443/api';
+exports.API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 function handleError(error) {
     var msg = error.message.includes('fetch') ? "Connexion impossible" : error.message;
     return {

package/dist/src/helpers/DateUtils.d.ts

@@ -1,4 +1,8 @@
 import { DateFormatTypes } from './Enums';
+export declare const countryTimeZones: {
+    [key: string]: string;
+};
+export declare const toUTCToLocaleDate: (date: "" | Date | null, countryCode: string) => Date;
 export declare const formatDateByCountryCode: (date: Date | undefined, countryCode: string, formatType: DateFormatTypes) => string;
 export declare function getLongFormattedDateTime(date: Date | undefined, timeZone: string, locale: Locale): string;
 export declare function capitalizeFirstLetter(str: string): string;

package/dist/src/helpers/DateUtils.js

@@ -1,22 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = void 0;
+exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.toUTCToLocaleDate = exports.countryTimeZones = void 0;
 var date_fns_tz_1 = require("date-fns-tz");
 var locale_1 = require("date-fns/locale");
 var Enums_1 = require("./Enums");
-var formatDateByCountryCode = function (date, countryCode, formatType) {
+// Tableau de correspondance entre les codes de pays et les fuseaux horaires
+exports.countryTimeZones = {
+    'FR': 'Europe/Paris',
+    // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
+};
+var toUTCToLocaleDate = function (date, countryCode) {
+    var zonedDate = new Date(date !== null && date !== void 0 ? date : "");
     if (date) {
-        // Tableau de correspondance entre les codes de pays et les fuseaux horaires
-        var countryTimeZones = {
-            'FR': 'Europe/Paris',
-            // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
-        };
-        var timeZone = countryTimeZones[countryCode.toUpperCase()];
+        var timeZone = exports.countryTimeZones[countryCode.toUpperCase()];
         if (!timeZone) {
             throw new Error('Code de pays non pris en charge');
         }
         // Convertir la date UTC en date du fuseau horaire local
-        var zonedDate = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
+        zonedDate = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
+    }
+    return zonedDate;
+};
+exports.toUTCToLocaleDate = toUTCToLocaleDate;
+var formatDateByCountryCode = function (date, countryCode, formatType) {
+    if (date) {
+        // Convertir la date UTC en date du fuseau horaire local
+        var zonedDate = (0, exports.toUTCToLocaleDate)(date, countryCode);
+        var timeZone = exports.countryTimeZones[countryCode.toUpperCase()];
         // Formater la date
         switch (formatType) {
             case Enums_1.DateFormatTypes.SHORT_FORMAT_DATE:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/MovaDialog.tsx

@@ -75,7 +75,7 @@ const MovaDialog: FC<MovaDialogProps> = ({fullScreen, open, onClose, closable =
             sx={{ textAlign:'center'}}
         >
             <img src={getLeafImage()} style={{
-                position: 'fixed', 
+                position: 'absolute', 
                 float:'left',
                 width: '150px',
                 height: '350px',

package/src/QRCode.tsx

@@ -43,7 +43,7 @@ const QRCode: FC<QRCodeProps> = ({ data, showDownload=false }) => {
     height: 600,
     type: 'canvas' as DrawType,
     data: data ?? defaultData,
-    image: QRCodeImage,
+    //image: QRCodeImage,
     margin: 10,
     qrOptions: {
       typeNumber: 0 as TypeNumber,
@@ -56,13 +56,14 @@ const QRCode: FC<QRCodeProps> = ({ data, showDownload=false }) => {
       margin: 15
     },
     dotsOptions: {
-      color: darken(theme.palette.primary.main, 0.3),
+      color: 'black',
+      //color: darken(theme.palette.primary.main, 0.3),
       // gradient: {
       //   type: 'linear', // 'radial'
       //   rotation: 0,
       //   colorStops: [{ offset: 0, color: theme.palette.primary.main }, { offset: 1, color: theme.palette.secondary.main }]
       // },
-      type: 'square' as DotType  // "dots" | "rounded" | "classy" | "classy-rounded" | "square" | "extra-rounded";
+      type: 'rounded' as DotType  // "dots" | "rounded" | "classy" | "classy-rounded" | "square" | "extra-rounded";
     },
     backgroundOptions: {
       color: 'white',
@@ -73,8 +74,9 @@ const QRCode: FC<QRCodeProps> = ({ data, showDownload=false }) => {
       // },
     },
     cornersSquareOptions: {
-      color: darken(theme.palette.secondary.main, 0.1),
-      type: 'square' as CornerSquareType,
+      color: '#de007dff', 
+      //color: darken(theme.palette.secondary.main, 0.1),
+      type: 'extra-rounded' as CornerSquareType,
       // gradient: {
       //   type: 'linear', // 'radial'
       //   rotation: 180,
@@ -82,8 +84,9 @@ const QRCode: FC<QRCodeProps> = ({ data, showDownload=false }) => {
       // },
     },
     cornersDotOptions: {
-      color: darken(theme.palette.secondary.main, 0.1),
-      type: 'square' as CornerDotType,
+      color: '#de007dff',
+      //color: darken(theme.palette.secondary.main, 0.1),
+      type: 'dot' as CornerDotType,
       // gradient: {
       //   type: 'linear', // 'radial'
       //   rotation: 180,
@@ -93,7 +96,7 @@ const QRCode: FC<QRCodeProps> = ({ data, showDownload=false }) => {
   });
 
   // Format de téléchargement par défaut
-  const [fileExt, setFileExt] = useState<Extension>("png");
+  const [fileExt, setFileExt] = useState<Extension>("svg");
   const [qrCode] = useState<QRCodeStyling>(new QRCodeStyling(options));
   const ref = useRef<HTMLDivElement>(null);
 

package/src/ScheduleFields.tsx

@@ -9,6 +9,7 @@ import Schedule from './models/Schedule';
 import { DayOfWeek } from './helpers/Enums';
 import Logger from './helpers/Logger';
 import { flexCenter } from './helpers/Tools';
+import { toUTCToLocaleDate } from './helpers/DateUtils';
 
 export const FR_WEEK_DAYS: string[] = ['Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi', 'Dimanche'];
 

package/src/helpers/ApiHelper.ts

@@ -2,7 +2,7 @@ import { APIMethod } from "./Enums";
 import { COOKIE_GARAGE_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
 
-export const API_BASE_URL = process.env.REACT_APP_API_URL ?? 'https://localhost:8443/api';
+export const API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 
 export type APIResponse<T> = {
     success: boolean;

package/src/helpers/DateUtils.ts

@@ -2,15 +2,16 @@ import { format, utcToZonedTime } from 'date-fns-tz';
 import { fr } from 'date-fns/locale';
 import { DateFormatTypes } from './Enums';
 
+// Tableau de correspondance entre les codes de pays et les fuseaux horaires
+export const countryTimeZones: { [key: string]: string } = {
+    'FR': 'Europe/Paris',
+    // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
+};
 
-export const formatDateByCountryCode = (date: Date | undefined, countryCode: string, formatType: DateFormatTypes): string => {
+export const toUTCToLocaleDate = (date: "" | Date | null,  countryCode: string): Date => {
+    let zonedDate = new Date(date ?? "");
 
     if(date){
-        // Tableau de correspondance entre les codes de pays et les fuseaux horaires
-        const countryTimeZones: { [key: string]: string } = {
-            'FR': 'Europe/Paris',
-            // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
-        };
 
         const timeZone = countryTimeZones[countryCode.toUpperCase()];
 
@@ -19,7 +20,19 @@ export const formatDateByCountryCode = (date: Date | undefined, countryCode: str
         }
 
         // Convertir la date UTC en date du fuseau horaire local
-        const zonedDate = utcToZonedTime(date, timeZone);
+        zonedDate = utcToZonedTime(date, timeZone);
+    }
+
+    return zonedDate;
+}
+
+export const formatDateByCountryCode = (date: Date | undefined, countryCode: string, formatType: DateFormatTypes): string => {
+
+    if(date){
+
+        // Convertir la date UTC en date du fuseau horaire local
+        let zonedDate = toUTCToLocaleDate(date, countryCode);
+        const timeZone = countryTimeZones[countryCode.toUpperCase()];
 
         // Formater la date
         switch(formatType){

package/webpack.config.js

@@ -37,8 +37,8 @@ module.exports = {
         template: path.resolve(__dirname, 'public', 'index.html'), // Chemin vers votre fichier HTML de base
       }),
       new webpack.DefinePlugin({
-        'REACT_APP_API_URL': JSON.stringify(process.env.REACT_APP_API_URL),
-        'REACT_APP_MOVALIB_APP_URL': JSON.stringify(process.env.REACT_APP_MOVALIB_APP_URL)
+        'process.env.REACT_APP_API_URL': JSON.stringify(process.env.REACT_APP_API_URL),
+        'process.env.REACT_APP_MOVALIB_APP_URL': JSON.stringify(process.env.REACT_APP_MOVALIB_APP_URL)
       }),
     ],      
 };