@movalib/movalib-commons 1.0.20 → 1.0.22

package/dist/src/MovaLogin.js

@@ -112,7 +112,7 @@ var MovaLogin = function (_a) {
         // Validator pour l'email
         newForm.email = (0, Tools_1.validateField)(form.email, Validator_1.validateEmail, 'Adresse email invalide');
         // Validator pour le mot de passe
-        newForm.password = (0, Tools_1.validateField)(form.password, function (value) { return value.length >= 8; }, 'Votre mot de passe doit faire au moins 8 caractères de long');
+        newForm.password = (0, Tools_1.validateField)(form.password, function (value) { return value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value); }, 'Votre mot de passe doit faire au moins 8 caractères de long');
         setForm(newForm);
         return newForm.email.isValid && newForm.password.isValid;
     };

package/dist/src/MovaSignUp.js

@@ -135,12 +135,12 @@ var MovaLogin = function (_a) {
         // Validator pour l'email
         newForm.email = (0, Tools_1.validateField)(userForm.email, Validator_1.validateEmail, 'Adresse email invalide');
         // Validator pour le mot de passe
-        newForm.password = (0, Tools_1.validateField)(userForm.password, function (value) { return value.length >= 8; }, 'Votre mot de passe doit faire au moins 8 caractères de long');
+        newForm.password = (0, Tools_1.validateField)(userForm.password, function (value) { return value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value); }, 'Votre mot de passe doit faire au moins 10 caractères de long, contenir au moins une majuscule et une minuscule');
         // Validator pour les CGU
         newForm.acceptsTerms = (0, Tools_1.validateField)(userForm.acceptsTerms, function (value) { return Boolean(value); }, 'Vous devez accepter les termes de nos CGU');
         setUserForm(newForm);
-        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid
-            && newForm.password.isValid && newForm.gender.isValid && newForm.birthDate.isValid;
+        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid && newForm.password.isValid
+            && newForm.gender.isValid && newForm.birthDate.isValid && newForm.acceptsTerms.isValid;
     };
     var getMovaLogo = function () {
         return movaAppType === Enums_1.MovaAppType.GARAGE ? logo_pro_large_png_1.default :
@@ -161,7 +161,7 @@ var MovaLogin = function (_a) {
                             alignItems: 'center',
                         } }, { children: [(0, jsx_runtime_1.jsx)("img", { src: getMovaLogo(), style: { width: '50%' } }), (0, jsx_runtime_1.jsx)("br", {}), (0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "button", sx: { pt: 2 } }, { children: "Nouveau compte utilisateur" }))] })), (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ component: "form", onSubmit: handleSubmit, noValidate: true, sx: { mt: 1 } }, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, autoFocus: true, fullWidth: true, id: "firstname", label: "Pr\u00E9nom", name: "firstname", autoComplete: "given-name", onChange: function (e) { return handleInputChange(e); }, value: userForm.firstname.value, error: Boolean(userForm.firstname.error), helperText: userForm.firstname.error }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "lastname", label: "Nom", name: "lastname", autoComplete: "family-name", onChange: function (e) { return handleInputChange(e); }, value: userForm.lastname.value, error: Boolean(userForm.lastname.error), helperText: userForm.lastname.error }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, name: "password", label: "Mot de passe", type: "password", id: "password", autoComplete: "current-password", onChange: function (e) { return handleInputChange(e); }, value: userForm.password.value, error: !userForm.password.isValid, helperText: Boolean(userForm.password.error) ? userForm.password.error : "8 caractères minimum" }), (0, jsx_runtime_1.jsx)(GenderSelector_1.default, { handleSelectChange: handleSelectChange, form: userForm, required: true, sx: { width: '40%', mr: 2 } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, name: "birthDate", label: "Date de naissance", type: "date", InputLabelProps: {
                                     shrink: true,
-                                }, autoComplete: "bday", value: userForm.birthDate.value, error: !userForm.birthDate.isValid, helperText: userForm.birthDate.error, onChange: function (e) { return handleInputChange(e); }, sx: { width: '50%', float: 'right' } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/terms-and-conditions", target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
+                                }, autoComplete: "bday", value: userForm.birthDate.value, error: !userForm.birthDate.isValid, helperText: userForm.birthDate.error, onChange: function (e) { return handleInputChange(e); }, sx: { width: '50%', float: 'right' } }), (0, jsx_runtime_1.jsxs)(material_1.FormControl, __assign({ error: !userForm.acceptsTerms.isValid }, { children: [(0, jsx_runtime_1.jsx)(material_1.FormControlLabel, { control: (0, jsx_runtime_1.jsx)(material_1.Checkbox, { name: "acceptsTerms", color: "primary", checked: userForm.acceptsTerms.value, onChange: function (e, checked) { return handleCheckboxChange(e, checked); } }), label: (0, jsx_runtime_1.jsxs)("span", { children: ["J'accepte les", ' ', (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/terms-and-conditions", target: "_blank" }, { children: "Conditions G\u00E9n\u00E9rales d'Utilisation" }))] }) }), (0, jsx_runtime_1.jsx)(material_1.FormHelperText, { children: userForm.acceptsTerms.error })] })), alertMessage && alertSeverity && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: alertSeverity, sx: { mb: 2 } }, { children: alertMessage })), (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loading, type: "submit", fullWidth: true, variant: "contained", sx: { mt: 3, mb: 2 } }, { children: (0, jsx_runtime_1.jsx)("span", { children: "Cr\u00E9er mon compte" }) })), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ container: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: true }, { children: (0, jsx_runtime_1.jsx)(material_1.Link, __assign({ href: "/login", variant: "body2", color: "text.secondary" }, { children: "Se connecter" })) })) }))] })), (0, jsx_runtime_1.jsx)(MovaCopyright_1.default, { sx: { mt: 8, mb: 4 } })] })), (0, jsx_runtime_1.jsx)("img", { src: leaf_pink_large_png_1.default, style: { position: 'fixed',
                     float: 'right',
                     width: '250px',
                     height: '400px',

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

@@ -1,3 +1,8 @@
+export declare enum DocumentType {
+    INVOICE = "INVOICE",
+    TYRE_PICTURE = "TYRE_PICTURE",
+    CAR_PICTURE = "CAR_PICTURE"
+}
 export declare enum MovaAppType {
     /**
     * Application Garagiste

package/dist/src/helpers/Enums.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleType = exports.MovaAppType = void 0;
+exports.RoleType = exports.MovaAppType = exports.DocumentType = void 0;
+var DocumentType;
+(function (DocumentType) {
+    DocumentType["INVOICE"] = "INVOICE";
+    DocumentType["TYRE_PICTURE"] = "TYRE_PICTURE";
+    DocumentType["CAR_PICTURE"] = "CAR_PICTURE";
+})(DocumentType = exports.DocumentType || (exports.DocumentType = {}));
 var MovaAppType;
 (function (MovaAppType) {
     /**

package/dist/src/models/Document.d.ts

@@ -0,0 +1,10 @@
+import { DocumentType } from "../helpers/Enums";
+export default class Document {
+    id: string;
+    name: string;
+    type: DocumentType;
+    content: string;
+    creationDate: Date;
+    updateDate: Date;
+    constructor(id: string, name: string, type: DocumentType, content: string, creationDate: Date, updateDate: Date);
+}

package/dist/src/models/Document.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var Document = /** @class */ (function () {
+    function Document(id, name, type, content, creationDate, updateDate) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.content = content;
+        this.creationDate = creationDate;
+        this.updateDate = updateDate;
+    }
+    return Document;
+}());
+exports.default = Document;

package/dist/src/models/User.d.ts

@@ -1,4 +1,5 @@
 import Address from './Address';
+import Vehicle from "./Vehicle";
 export default class User {
     id: string;
     roles: string[];
@@ -10,7 +11,8 @@ export default class User {
     created: Date;
     addresses?: Address[];
     phoneNumber?: string;
-    constructor(id: string, roles: string[], firstname?: string, lastname?: string, avatar?: string, email?: string, password?: string, created?: Date, addresses?: Address[], phoneNumber?: string);
+    vehicles?: Vehicle[];
+    constructor(id: string, roles: string[], firstname?: string, lastname?: string, avatar?: string, email?: string, password?: string, created?: Date, addresses?: Address[], phoneNumber?: string, vehicles?: Vehicle[]);
     static getFirstLetter: (user: User) => string;
     static isCustomer: (user: User) => boolean;
     static isTechnician: (user: User) => boolean;

package/dist/src/models/User.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var Enums_1 = require("../helpers/Enums");
 var User = /** @class */ (function () {
-    function User(id, roles, firstname, lastname, avatar, email, password, created, addresses, phoneNumber) {
+    function User(id, roles, firstname, lastname, avatar, email, password, created, addresses, phoneNumber, vehicles) {
         if (firstname === void 0) { firstname = ''; }
         if (lastname === void 0) { lastname = ''; }
         if (avatar === void 0) { avatar = ''; }
@@ -19,6 +19,7 @@ var User = /** @class */ (function () {
         this.created = created;
         this.addresses = addresses;
         this.phoneNumber = phoneNumber;
+        this.vehicles = vehicles;
     }
     User.getFirstLetter = function (user) {
         var firstLetter = user.lastname[0].toUpperCase();

package/dist/src/models/Vehicle.d.ts

@@ -0,0 +1,21 @@
+import Document from './Document';
+export default class Vehicle {
+    id: number;
+    ownerId: number;
+    averageMileagePerYear: number;
+    plate: string;
+    brand: string;
+    model: string;
+    version: string;
+    vin: string;
+    currentMileage: number;
+    digitalPassportIndex: string;
+    firstRegistrationDate: Date;
+    ktype: string;
+    tireDiameter: string;
+    tireHeight: string;
+    tireSpeedIndex: string;
+    tireWidth: string;
+    documents: Document[];
+    constructor(id: number, ownerId: number, averageMileagePerYear: number, plate: string, brand: string, model: string, version: string, vin: string, currentMileage: number, digitalPassportIndex: string, firstRegistrationDate: Date, ktype: string, tireDiameter: string, tireHeight: string, tireSpeedIndex: string, tireWidth: string, documents: Document[]);
+}

package/dist/src/models/Vehicle.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* AUDI A5 Sportback (F5A, F5F)
+Marque : AUDI
+Modele : A5 Sportback (F5A, F5F)
+Corps : 3/5 portes
+Version : 2.0 TFSI
+Immatriculation : FE-291-MF
+Années de production : 06 2016 -
+Carburant : Essence
+Cylindrée : 1984 cm3
+Puissance : 140 KW (190 HP) */
+var Vehicle = /** @class */ (function () {
+    function Vehicle(id, ownerId, averageMileagePerYear, plate, brand, model, version, vin, currentMileage, digitalPassportIndex, firstRegistrationDate, ktype, tireDiameter, tireHeight, tireSpeedIndex, tireWidth, documents) {
+        this.id = id;
+        this.ownerId = ownerId;
+        this.averageMileagePerYear = averageMileagePerYear;
+        this.plate = plate;
+        this.brand = brand;
+        this.model = model;
+        this.version = version;
+        this.vin = vin;
+        this.currentMileage = currentMileage;
+        this.digitalPassportIndex = digitalPassportIndex;
+        this.firstRegistrationDate = firstRegistrationDate;
+        this.ktype = ktype;
+        this.tireDiameter = tireDiameter;
+        this.tireHeight = tireHeight;
+        this.tireSpeedIndex = tireSpeedIndex;
+        this.tireWidth = tireWidth;
+        this.documents = documents;
+    }
+    return Vehicle;
+}());
+exports.default = Vehicle;

package/package.json

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

package/src/MovaLogin.tsx

@@ -82,7 +82,9 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         newForm.email = validateField(form.email, validateEmail, 'Adresse email invalide');
 
         // Validator pour le mot de passe
-        newForm.password = validateField(form.password, value => value.length >= 8, 'Votre mot de passe doit faire au moins 8 caractères de long');
+        newForm.password = validateField(form.password, 
+            value => value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value), 
+            'Votre mot de passe doit faire au moins 8 caractères de long');
 
         setForm(newForm);
 

package/src/MovaSignUp.tsx

@@ -110,15 +110,17 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
         newForm.email = validateField(userForm.email, validateEmail, 'Adresse email invalide');
 
         // Validator pour le mot de passe
-        newForm.password = validateField(userForm.password, value => value.length >= 8, 'Votre mot de passe doit faire au moins 8 caractères de long');
+        newForm.password = validateField(userForm.password, 
+            value => value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value),
+            'Votre mot de passe doit faire au moins 10 caractères de long, contenir au moins une majuscule et une minuscule');
 
         // Validator pour les CGU
         newForm.acceptsTerms = validateField(userForm.acceptsTerms, value => Boolean(value), 'Vous devez accepter les termes de nos CGU');
 
         setUserForm(newForm);
 
-        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid 
-            && newForm.password.isValid && newForm.gender.isValid && newForm.birthDate.isValid;
+        return newForm.firstname.isValid && newForm.lastname.isValid && newForm.email.isValid && newForm.password.isValid 
+            && newForm.gender.isValid && newForm.birthDate.isValid && newForm.acceptsTerms.isValid;
     }   
   
     const getMovaLogo = () => {
@@ -262,6 +264,14 @@ const MovaLogin: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, o
                         <span>Créer mon compte</span>
                     </LoadingButton>
 
+                    <Grid container>
+                        <Grid item xs>
+                            <Link href="/login" variant="body2" color="text.secondary">
+                                Se connecter
+                            </Link>
+                        </Grid>
+                    </Grid>
+
                 </Box>
                 <MovaCopyright sx={{ mt: 8, mb: 4 }} />
             </Container>

package/src/helpers/Enums.ts

@@ -1,3 +1,9 @@
+export enum DocumentType {
+    INVOICE = 'INVOICE',
+    TYRE_PICTURE = 'TYRE_PICTURE',
+    CAR_PICTURE = 'CAR_PICTURE'
+}
+
 
 export enum MovaAppType {
     /**

package/src/models/Document.ts

@@ -0,0 +1,28 @@
+import { DocumentType } from "../helpers/Enums";
+
+export default class Document {
+
+  //Properties
+  id: string; // UUID
+	name: string;
+	type: DocumentType;
+	content: string;	// Photos stockée en base64
+	creationDate: Date;
+	updateDate: Date;
+
+    constructor(
+      id: string,
+      name: string,
+      type: DocumentType,
+      content: string,
+      creationDate: Date,
+      updateDate: Date
+    ) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.content = content;
+        this.creationDate = creationDate;
+        this.updateDate = updateDate;
+      }
+}

package/src/models/User.ts

@@ -1,5 +1,6 @@
 import { RoleType } from "../helpers/Enums";
 import Address from './Address';
+import Vehicle from "./Vehicle";
 
 export default class User {
 
@@ -14,6 +15,7 @@ export default class User {
     created: Date;
     addresses? : Address[] 
     phoneNumber?: string;
+    vehicles?: Vehicle[];
 
     constructor(
         id: string,
@@ -25,7 +27,8 @@ export default class User {
         password: string = '',
         created: Date = new Date(),
         addresses?: Address[],
-        phoneNumber?: string 
+        phoneNumber?: string ,
+        vehicles?: Vehicle[]
     ) {
         this.id = id;
         this.roles = roles;
@@ -37,6 +40,7 @@ export default class User {
         this.created = created;
         this.addresses = addresses;
         this.phoneNumber = phoneNumber;
+        this.vehicles = vehicles;
     }
 
     static getFirstLetter = (user: User) : string => {

package/src/models/Vehicle.ts

@@ -0,0 +1,72 @@
+import Document from './Document';
+
+/* AUDI A5 Sportback (F5A, F5F)
+Marque : AUDI
+Modele : A5 Sportback (F5A, F5F)
+Corps : 3/5 portes
+Version : 2.0 TFSI
+Immatriculation : FE-291-MF
+Années de production : 06 2016 -
+Carburant : Essence
+Cylindrée : 1984 cm3
+Puissance : 140 KW (190 HP) */
+
+export default class Vehicle {
+
+     // Properties
+     id: number;
+     ownerId: number;
+     averageMileagePerYear: number;
+     plate: string;
+     brand: string;
+     model: string;
+     version: string;
+     vin: string;
+     currentMileage: number;
+     digitalPassportIndex: string;
+     firstRegistrationDate: Date;
+     ktype: string;
+     tireDiameter: string;
+     tireHeight: string;
+     tireSpeedIndex: string;     
+     tireWidth: string;
+     documents : Document[];
+
+    constructor(
+        id: number,
+        ownerId: number,
+        averageMileagePerYear: number,
+        plate: string,
+        brand: string,
+        model: string,
+        version: string,
+        vin: string,
+        currentMileage: number,
+        digitalPassportIndex: string,
+        firstRegistrationDate: Date,
+        ktype: string,
+        tireDiameter: string,
+        tireHeight: string,
+        tireSpeedIndex: string,
+        tireWidth: string,
+        documents: Document[]
+    ) {
+        this.id = id;
+        this.ownerId = ownerId;
+        this.averageMileagePerYear = averageMileagePerYear;
+        this.plate = plate;
+        this.brand = brand;
+        this.model = model;
+        this.version = version;
+        this.vin = vin;
+        this.currentMileage = currentMileage;
+        this.digitalPassportIndex = digitalPassportIndex;
+        this.firstRegistrationDate = firstRegistrationDate;
+        this.ktype = ktype;
+        this.tireDiameter = tireDiameter;
+        this.tireHeight = tireHeight;
+        this.tireSpeedIndex = tireSpeedIndex;
+        this.tireWidth = tireWidth;
+        this.documents = documents;
+    }
+}