doc(demo) update demo and licence

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 AXA France
+Copyright (c) 2018 Axa France IARD / Axa France VIE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

examples/demo/package.json

@@ -43,19 +43,19 @@
     "babel-eslint": "9.0.0",
     "bootstrap": "^4.2.1",
     "classnames": "^2.2.6",
-    "cuid": "^2.1.4",
-    "moment": "^2.23.0",
-    "mw.validation": "^1.0.9",
+    "cuid": "^2.1.6",
+    "moment": "^2.24.0",
+    "mw.validation": "^1.0.15",
     "outy": "^0.1.2",
-    "rc-slider": "^8.6.4",
-    "react": "^16.7.0",
+    "rc-slider": "^8.7.1",
+    "react": "^16.9.0",
     "react-datepicker": "^1.8.0",
-    "react-dom": "^16.7.0",
+    "react-dom": "^16.9.0",
     "react-dropzone": "^7.0.1",
-    "react-modal": "^3.8.1",
-    "react-router-dom": "^4.3.1",
+    "react-modal": "^3.10.1",
+    "react-router-dom": "^5.0.1",
     "react-scripts": "2.1.1",
-    "react-select": "^2.2.0",
+    "react-select": "^2.4.4",
     "recompose": "^0.30.0"
   },
   "scripts": {
@@ -76,11 +76,11 @@
     "not op_mini all"
   ],
   "devDependencies": {
-    "concurrently": "^4.0.1",
-    "express": "^4.16.4",
-    "node-sass": "^4.11.0",
-    "nodemon": "^1.18.9",
-    "stylelint-config-standard": "^18.2.0"
+    "concurrently": "^4.1.2",
+    "express": "^4.17.1",
+    "node-sass": "^4.12.0",
+    "nodemon": "^1.19.2",
+    "stylelint-config-standard": "^18.3.0"
   },
   "homepage": ".",
   "proxy": "http://localhost:5000",

examples/demo/src/EnvironmentProvider.js

@@ -1,40 +1,47 @@
-import React from 'react';
+import React, { createContext, useEffect, useState } from 'react';
 import { Loader } from '@axa-fr/react-toolkit-all';
 
-const EnvironmentContext = React.createContext();
+export const EnvironmentContext = createContext();
 
 export const EnvironmentConsumer = EnvironmentContext.Consumer;
 
 export const withEnvironment = Component => props => (
   <EnvironmentConsumer>
-    {store =>
-      !store.environment ? (
-        <Loader> </Loader>
-      ) : (
-        <Component {...props} {...store} />
-      )
-    }
+    {store => <Component {...props} {...store} />}
   </EnvironmentConsumer>
 );
 
-export default class EnvironmentProvider extends React.Component {
-  state = {
-    environment: null
-  };
-  async componentDidMount() {
-    let fileName =
-      process.env.NODE_ENV === 'development'
-        ? 'environment.dev.json'
-        : 'environment.json';
-        const data = await fetch(`./${fileName}`);
-        const variables = await data.json();
-        this.setState({ environment: variables });
-  }
-  render() {
-    return (
-      <EnvironmentContext.Provider value={this.state}>
-        {this.props.children}
-      </EnvironmentContext.Provider>
-    );
-  }
-}
+const getEnvironmentData = async () => {
+  const fileName =
+    process.env.NODE_ENV === 'development'
+      ? 'environment.dev.json'
+      : 'environment.json';
+  const data = await fetch(`/${fileName}`);
+  return data.json();
+};
+
+const EnvironmentProvider = ({ children }) => {
+  const [environment, setEnvironment] = useState(null);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    getEnvironmentData().then(data => {
+      setEnvironment({ environment: data });
+      setLoading(false);
+    });
+  }, []);
+
+  return (
+    <>
+      {loading ? (
+        <Loader mode="get" text="Loading..." />
+      ) : (
+        <EnvironmentContext.Provider value={environment}>
+          {children}
+        </EnvironmentContext.Provider>
+      )}
+    </>
+  );
+};
+
+export default EnvironmentProvider;

examples/demo/src/Home/Home.container.js

@@ -1,48 +1,33 @@
 import Home from './Home';
 import fetchDevis from './Home.service';
-import { LoaderModes } from '@axa-fr/react-toolkit-all';
-import {
-  lifecycle,
-  compose,
-  withStateHandlers,
-  setDisplayName,
-  withProps
-} from 'recompose';
+
+import React, {useState, useEffect} from 'react';
 import withCustomFetch from '../withCustomFetch';
+import withLoader from "../withLoader";
+
+const HomeWithLoader = withLoader(Home);
+
+const HomeContainer = (props) => {
+  const { fetch } = props;
+
+  const [state, setState]  = useState({
+     loading: true,
+     items: []
+   });
+
+  useEffect(() => {
+     const init = async () => {
+       const items = await fetchDevis(fetch)();
+       setState({
+         loading: false,
+         items: items
+       });
+     };
+     init();
+   },[]);
+
+    return (<HomeWithLoader {...state} />);
+
+};
 
-const withInitState = lifecycle({
-  state: {
-    loading: true,
-    items: []
-  }
-});
-
-const withInitData = withStateHandlers(() => ({}), {
-  init: (state, props) => items => ({
-    items,
-    loading: false
-  })
-});
-
-const withFetchData = lifecycle({
-  async componentDidMount() {
-    const { init, fetch } = this.props;
-    const items = await fetchDevis(fetch)();
-    init(items);
-  }
-});
-
-const withLoaderMode = withProps(({ loading }) => ({
-  loaderMode: loading ? LoaderModes.get : LoaderModes.none
-}));
-
-const enhance = compose(
-  setDisplayName('EnhancedHome'),
-  withInitState,
-  withInitData,
-  withCustomFetch(fetch),
-  withFetchData,
-  withLoaderMode
-);
-
-export default enhance(Home);
+export default withCustomFetch(fetch)(HomeContainer);

examples/demo/src/New/New.js

@@ -6,7 +6,6 @@ import {
   SelectInput,
   DateInput,
   Button,
-  SliderInput,
 } from '@axa-fr/react-toolkit-all';
 import './New.scss';
 import {
@@ -100,13 +99,6 @@ const New = ({ fields, onChange, hasSubmit, onSubmit }) => (
               messageType="error"
             />
           </section>
-          <section className="af-panel__content">
-            <SliderInput
-              className="af-form__slider"
-              name="testslider"
-              onChange={onChange}
-            />
-          </section>
         </article>
         <Button
           classModifier="hasiconRight confirm"

examples/demo/src/withCustomFetch.js

@@ -16,7 +16,7 @@ const withCustomFetch = fetch => Component => props => {
     fetch={customFetch(fetch)(props.environment.apiUrl)}
   />
 );
-  }
+  };
 
 export default (fetch = undefined) =>
   compose(

examples/demo/src/withLoader.js

@@ -0,0 +1,9 @@
+import {LoaderModes} from "@axa-fr/react-toolkit-loader";
+import React from "react";
+
+const withLoader =  (Component) => ({loading, ...otherProps}) => {
+  const loaderMode= loading ? LoaderModes.get : LoaderModes.none;
+  return (<Component loaderMode={loaderMode} {...otherProps} />);
+};
+
+export default withLoader;