migration

MacKentoch · MacKentoch · commit be1278464794 · 2019-11-11T07:14:01.000+01:00
diff --git a/front/src/Root.js b/front/src/Root.js
@@ -3,7 +3,7 @@
 // #region imports
 import React, { Component, Fragment } from 'react';
 import { Router, Switch, Route } from 'react-router-dom';
-import compose from 'recompose/compose';
+import {compose} from 'redux';
 import createHistory from 'history/createBrowserHistory';
 import withMainLayout from './hoc/withMainLayout';
 import MainRoutes from './routes/MainRoutes';
diff --git a/front/src/components/loadingContent/LoadingContent.tsx b/front/src/components/loadingContent/LoadingContent.tsx
@@ -1,17 +1,13 @@
-// @flow
-
-// #region imports
 import React from 'react';
-// #endregion
 
-// #region flow types
-type Props = {
-  ...any,
-};
+// #region types
+type Props = {};
 // #endregion
 
 function LoadingContent(props: Props) {
   return <div>loading...</div>;
 }
 
+LoadingContent.displayName = 'LoadingContent';
+
 export default LoadingContent;
diff --git a/front/src/components/loadingContent/index.ts b/front/src/components/loadingContent/index.ts
@@ -1,8 +1,5 @@
-// @flow
-
-// #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import LoadingContent from './LoadingContent';
-// #endregion
 
 export default compose()(LoadingContent);
+<
diff --git a/front/src/components/logoutRoute/index.js b/front/src/components/logoutRoute/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import LgoutRoute from './LogoutRoute';
 import withAuth from '../../contexts/auth/consumerHOC';
 // #endregion
diff --git a/front/src/components/navigation/index.js b/front/src/components/navigation/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withAuth from '../../contexts/auth/consumerHOC';
 import NavigationBar from './NavigationBar';
 // #endregion
diff --git a/front/src/components/privateRoute/index.js b/front/src/components/privateRoute/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import PrivateRoute from './PrivateRoute';
 import withAuth from '../../contexts/auth/consumerHOC';
 // #endregion
diff --git a/front/src/hoc/withMainLayout/index.js b/front/src/hoc/withMainLayout/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withMainLayout from './withMainLayout';
 // #endregion
 
diff --git a/front/src/hoc/withMainLayout/withMainLayout.js b/front/src/hoc/withMainLayout/withMainLayout.js
@@ -3,7 +3,7 @@
 // #region imports
 import React, { Component } from 'react';
 import wrapDisplayName from 'recompose/wrapDisplayName';
-import compose from 'recompose/compose';
+import {compose} from 'redux';
 import { withRouter } from 'react-router';
 import { type Match, type Location, type RouterHistory } from 'react-router';
 import Container from 'reactstrap/lib/Container';
diff --git a/front/src/pages/about/index.js b/front/src/pages/about/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import About from './About';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/front/src/pages/home/index.js b/front/src/pages/home/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Home from './Home';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/front/src/pages/login/index.js b/front/src/pages/login/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Login from './Login';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 import withAuth from '../../contexts/auth/consumerHOC';
diff --git a/front/src/pages/pageNotFound/index.js b/front/src/pages/pageNotFound/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import {compose} from redux';
 import PageNotFound from './PageNotFound';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/front/src/pages/protected/index.js b/front/src/pages/protected/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Protected from './Protected';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/front/src/routes/MainRoutes.js b/front/src/routes/MainRoutes.js
@@ -2,7 +2,7 @@
 
 // #region imports
 import React from 'react';
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withSuspense from '../hoc/withSuspense';
 import { Route, Switch } from 'react-router';
 import PrivateRoute from '../components/privateRoute';
diff --git a/src/front/Root.js b/src/front/Root.js
@@ -3,7 +3,7 @@
 // #region imports
 import React, { Component, Fragment } from 'react';
 import { Router, Switch, Route } from 'react-router-dom';
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import createHistory from 'history/createBrowserHistory';
 import withMainLayout from './hoc/withMainLayout';
 import MainRoutes from './routes/MainRoutes';
diff --git a/src/front/components/loadingContent/index.js b/src/front/components/loadingContent/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import LoadingContent from './LoadingContent';
 // #endregion
 
diff --git a/src/front/components/logoutRoute/index.js b/src/front/components/logoutRoute/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import LgoutRoute from './LogoutRoute';
 import withAuth from '../../contexts/auth/consumerHOC';
 // #endregion
diff --git a/src/front/components/navigation/index.js b/src/front/components/navigation/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withAuth from '../../contexts/auth/consumerHOC';
 import NavigationBar from './NavigationBar';
 // #endregion
diff --git a/src/front/components/privateRoute/index.js b/src/front/components/privateRoute/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import PrivateRoute from './PrivateRoute';
 import withAuth from '../../contexts/auth/consumerHOC';
 // #endregion
diff --git a/src/front/hoc/withMainLayout/index.js b/src/front/hoc/withMainLayout/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withMainLayout from './withMainLayout';
 // #endregion
 
diff --git a/src/front/hoc/withMainLayout/withMainLayout.js b/src/front/hoc/withMainLayout/withMainLayout.js
@@ -3,7 +3,7 @@
 // #region imports
 import React, { Component } from 'react';
 import wrapDisplayName from 'recompose/wrapDisplayName';
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import { withRouter } from 'react-router';
 import { type Match, type Location, type RouterHistory } from 'react-router';
 import Container from 'reactstrap/lib/Container';
diff --git a/src/front/pages/about/index.js b/src/front/pages/about/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import About from './About';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/src/front/pages/home/index.js b/src/front/pages/home/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Home from './Home';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/src/front/pages/login/index.js b/src/front/pages/login/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Login from './Login';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 import withAuth from '../../contexts/auth/consumerHOC';
diff --git a/src/front/pages/pageNotFound/index.js b/src/front/pages/pageNotFound/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import PageNotFound from './PageNotFound';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/src/front/pages/protected/index.js b/src/front/pages/protected/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import Protected from './Protected';
 import withEnterAnimation from '../../hoc/withEnterAnimation';
 // #endregion
diff --git a/src/front/routes/MainRoutes.js b/src/front/routes/MainRoutes.js
@@ -2,7 +2,7 @@
 
 // #region imports
 import React from 'react';
-import compose from 'recompose/compose';
+import { compose } from 'redux';
 import withSuspense from '../hoc/withSuspense';
 import { Route, Switch } from 'react-router';
 import PrivateRoute from '../components/privateRoute';
